diff --git a/sources/LICENSE.txt b/sources/LICENSE.txt
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/sources/LICENSE.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/sources/README.md b/sources/README.md
new file mode 100644
index 0000000..673fc96
--- /dev/null
+++ b/sources/README.md
@@ -0,0 +1,52 @@
+[![Piwigo](http://piwigo.org/screenshots/logos/piwigo@280.png)](http://piwigo.org)
+---------
+
+Piwigo is photo gallery software for the web, built by an active community of users and developers.
+
+Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and open source.
+
+![screenshot](http://piwigo.org/screenshots/github-screenshot.jpg)
+
+ * [piwigo.org](http://piwigo.org)
+ * [Demo](http://piwigo.org/demo)
+ * [Downloads](http://piwigo.org/basics/downloads)
+ * [User guide](http://piwigo.org/doc)
+ * [Plugins and themes](http://piwigo.org/ext)
+ * [Forum](http://piwigo.org/forum)
+ * [News](http://piwigo.org/news)
+ 
+## Requirements
+
+ * A webserver (Apache or nginx recommended)
+ * PHP 5.2 or greater
+ * MySQL 5 or greater or MariaDB equivalent
+ * ImageMagick (recommended) or PHP GD
+
+## Quick start install
+
+### NetInstall
+
+ * Download the [NetInstall script](http://piwigo.org/download/dlcounter.php?code=netinstall)
+ * Transfer the script to your web space with any FTP client
+ * Open the script in you web browser (for example http://example.com/piwigo-netinstall.php) and follow the steps
+
+[More information](http://piwigo.org/basics/installation_netinstall)
+
+### Manual
+
+ * Download the [latest stable version](http://piwigo.org/download/dlcounter.php?code=latest) and unzip it
+ * Transfer everything to your web space with any FTP client
+ * Open your website (for example http://example.com/piwigo) and follow the steps
+
+[More information](http://piwigo.org/basics/installation_manual)
+
+If you do not have your own server, consider the [piwigo.com](http://piwigo.com/) hosting solution.
+
+## Contributing
+
+Piwigo is widely driven by its community; if you want to improve the code, fork this repo and submit your changes to the `master` branch.
+
+## License
+
+Piwigo is released under the GPL v2 license.
+
diff --git a/sources/about.php b/sources/about.php
index 9f6318d..6bd853a 100644
--- a/sources/about.php
+++ b/sources/about.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/action.php b/sources/action.php
index 4b92e05..5a7ca42 100644
--- a/sources/action.php
+++ b/sources/action.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -57,11 +57,34 @@ function do_error( $code, $str )
   exit();
 }
 
+if ($conf['enable_formats'] and isset($_GET['format']))
+{
+  check_input_parameter('format', $_GET, false, PATTERN_ID);
+
+  $query = '
+SELECT
+    *
+  FROM '.IMAGE_FORMAT_TABLE.'
+  WHERE format_id = '.$_GET['format'].'
+;';
+  $formats = query2array($query);
+
+  if (count($formats) == 0)
+  {
+    do_error(400, 'Invalid request - format');
+  }
+
+  $format = $formats[0];
+
+  $_GET['id'] = $format['image_id'];
+  $_GET['part'] = 'f'; // "f" for "format"
+}
+
 
 if (!isset($_GET['id'])
     or !is_numeric($_GET['id'])
     or !isset($_GET['part'])
-    or !in_array($_GET['part'], array('e','r') ) )
+    or !in_array($_GET['part'], array('e','r','f') ) )
 {
   do_error(400, 'Invalid request - id/part');
 }
@@ -77,6 +100,8 @@ if ( empty($element_info) )
   do_error(404, 'Requested id not found');
 }
 
+$src_image = new SrcImage($element_info);
+
 // $filter['visible_categories'] and $filter['visible_images']
 // are not used because it's not necessary (filter <> restriction)
 $query='
@@ -103,9 +128,9 @@ $file='';
 switch ($_GET['part'])
 {
   case 'e':
-    if ( !$user['enabled_high'] )
-    {
-      $deriv = new DerivativeImage(IMG_XXLARGE, new SrcImage($element_info));
+    if ( $src_image->is_original() and !$user['enabled_high'] )
+    {// we have a photo and the user has no access to HD
+      $deriv = new DerivativeImage(IMG_XXLARGE, $src_image);
       if ( !$deriv->same_as_source() )
       {
         do_error(401, 'Access denied e');
@@ -116,6 +141,10 @@ switch ($_GET['part'])
   case 'r':
     $file = original_to_representative( get_element_path($element_info), $element_info['representative_ext'] );
     break;
+  case 'f' :
+    $file = original_to_format(get_element_path($element_info), $format['ext']);
+    $element_info['file'] = get_filename_wo_extension($element_info['file']).'.'.$format['ext'];
+    break;
 }
 
 if ( empty($file) )
@@ -130,6 +159,10 @@ else if ($_GET['part'] == 'e')
 {
   pwg_log($_GET['id'], 'other');
 }
+else if ($_GET['part'] == 'f')
+{
+  pwg_log($_GET['id'], 'high', $format['format_id']);
+}
 
 $http_headers = array();
 
@@ -155,7 +188,7 @@ if (!url_is_remote($file))
   // HTTP/1.1 only
   $http_headers[] = 'Cache-Control: private, must-revalidate, max-age='.$max_age;*/
 
-  if ( isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+  if ('f' != $_GET['part'] and isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
   {
     set_status_header(304);
     foreach ($http_headers as $header)
diff --git a/sources/admin.php b/sources/admin.php
index 213f33b..ac89bab 100644
--- a/sources/admin.php
+++ b/sources/admin.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -240,6 +240,19 @@ if ($nb_photos_in_caddie > 0)
     );
 }
 
+// any orphan photo?
+$nb_orphans = count(get_orphans());
+
+if ($nb_orphans > 0)
+{
+  $template->assign(
+    array(
+      'NB_ORPHANS' => $nb_orphans,
+      'U_ORPHANS' => $link_start.'batch_manager&amp;filter=prefilter-no_album',
+      )
+    );
+}
+
 // +-----------------------------------------------------------------------+
 // | Plugin menu                                                           |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/album.php b/sources/admin/album.php
index d1186aa..f5e692a 100644
--- a/sources/admin/album.php
+++ b/sources/admin/album.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/album_notification.php b/sources/admin/album_notification.php
index cafaad1..fb2a1b0 100644
--- a/sources/admin/album_notification.php
+++ b/sources/admin/album_notification.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,7 +46,7 @@ $page['cat'] = $category['id'];
 // +-----------------------------------------------------------------------+
 
 // info by email to an access granted group of category informations
-if (isset($_POST['submitEmail']) and !empty($_POST['group']))
+if (isset($_POST['submitEmail']))
 {
   set_make_full_url();
 
@@ -54,6 +54,8 @@ if (isset($_POST['submitEmail']) and !empty($_POST['group']))
     is empty find child representative_picture_id */
   if (!empty($category['representative_picture_id']))
   {
+    $img = array();
+    
     $query = '
 SELECT id, file, path, representative_ext
   FROM '.IMAGES_TABLE.'
@@ -65,56 +67,124 @@ SELECT id, file, path, representative_ext
     {
       $element = pwg_db_fetch_assoc($result);
 
-      $img_url  = '<a href="'.
-                      make_picture_url(array(
-                          'image_id' => $element['id'],
-                          'image_file' => $element['file'],
-                          'category' => $category
-                        ))
-                      .'" class="thumblnk"><img src="'.DerivativeImage::url(IMG_THUMB, $element).'"></a>';
+      $img = array(
+        'link' => make_picture_url(
+          array(
+            'image_id' => $element['id'],
+            'image_file' => $element['file'],
+            'category' => $category
+            )
+          ),
+        'src' => DerivativeImage::url(IMG_THUMB, $element),
+        );
     }
   }
 
-  if (!isset($img_url))
-  {
-    $img_url = '';
-  }
-
-  pwg_mail_group(
-    $_POST['group'],
-    array(
-      'subject' => l10n('[%s] Visit album %s', $conf['gallery_title'], trigger_change('render_category_name', $category['name'], 'admin_cat_list')),
-      // TODO : change this language variable to 'Visit album %s'
-      // TODO : 'language_selected' => ....
-    ),
-    array(
-      'filename' => 'cat_group_info',
-      'assign' => array(
-        'IMG_URL' => $img_url,
-        'CAT_NAME' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'),
-        'LINK' => make_index_url(array(
-            'category' => array(
-              'id' => $category['id'],
-              'name' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'),
-              'permalink' => $category['permalink']
-              )
-            )),
-        'CPL_CONTENT' => empty($_POST['mail_content']) ? '' : stripslashes($_POST['mail_content']),
-        )
+  $args = array(
+    'subject' => l10n('[%s] Visit album %s', $conf['gallery_title'], trigger_change('render_category_name', $category['name'], 'admin_cat_list')),
+    // TODO : change this language variable to 'Visit album %s'
+    // TODO : 'language_selected' => ....
+    );
+    
+  $tpl = array(
+    'filename' => 'cat_group_info',
+    'assign' => array(
+      'IMG' => $img,
+      'CAT_NAME' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'),
+      'LINK' => make_index_url(
+        array(
+          'category' => array(
+            'id' => $category['id'],
+            'name' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'),
+            'permalink' => $category['permalink']
+            )
+          )
+        ),
+      'CPL_CONTENT' => empty($_POST['mail_content']) ? '' : stripslashes($_POST['mail_content']),
       )
     );
 
-  unset_make_full_url();
+  if ('users' == $_POST['who'] and isset($_POST['users']) and count($_POST['users']) > 0)
+  {
+    check_input_parameter('users', $_POST, true, PATTERN_ID);
 
-  $query = '
+    // TODO code very similar to function pwg_mail_group. We'd better create
+    // a function pwg_mail_users that could be called from here and from
+    // pwg_mail_group
+
+    // TODO to make checks even better, we should check that theses users
+    // have access to this album. No real privacy issue here, even if we
+    // send the email to a user without permission.
+
+    $query = '
+SELECT
+    ui.user_id,
+    ui.status,
+    ui.language,
+    u.'.$conf['user_fields']['email'].' AS email,
+    u.'.$conf['user_fields']['username'].' AS username
+  FROM '.USER_INFOS_TABLE.' AS ui
+    JOIN '.USERS_TABLE.' AS u ON u.'.$conf['user_fields']['id'].' = ui.user_id
+  WHERE ui.user_id IN ('.implode(',', $_POST['users']).')
+;';
+    $users = query2array($query);
+    $usernames = array();
+    
+    foreach ($users as $u)
+    {
+      $usernames[] = $u['username'];
+      
+      $authkey = create_user_auth_key($u['user_id'], $u['status']);
+      
+      $user_tpl = $tpl;
+
+      if ($authkey !== false)
+      {
+        $user_tpl['assign']['LINK'] = add_url_params($tpl['assign']['LINK'], array('auth' => $authkey['auth_key']));
+
+        if (isset($user_tpl['assign']['IMG']['link']))
+        {
+          $user_tpl['assign']['IMG']['link'] = add_url_params(
+            $user_tpl['assign']['IMG']['link'],
+            array('auth' => $authkey['auth_key'])
+            );
+        }
+      }
+
+      $user_args = $args;
+      if (isset($authkey))
+      {
+        $user_args['auth_key'] = $authkey['auth_key'];
+      }
+
+      switch_lang_to($u['language']);
+      pwg_mail($u['email'], $user_args, $user_tpl);
+      switch_lang_back();
+    }
+
+    $message = l10n_dec('%d mail was sent.', '%d mails were sent.', count($users));
+    $message.= ' ('.implode(', ', $usernames).')';
+    
+    $page['infos'][] = $message;
+  }
+  elseif ('group' == $_POST['who'] and !empty($_POST['group']))
+  {
+    check_input_parameter('group', $_POST, false, PATTERN_ID);
+    
+    pwg_mail_group($_POST['group'], $args, $tpl);
+
+    $query = '
 SELECT
     name
   FROM '.GROUPS_TABLE.'
   WHERE id = '.$_POST['group'].'
 ;';
-  list($group_name) = pwg_db_fetch_row(pwg_query($query));
+    list($group_name) = pwg_db_fetch_row(pwg_query($query));
 
-  $page['infos'][] = l10n('An information email was sent to group "%s"', $group_name);
+    $page['infos'][] = l10n('An information email was sent to group "%s"', $group_name);
+  }
+
+  unset_make_full_url();
 }
 
 // +-----------------------------------------------------------------------+
@@ -135,6 +205,19 @@ $template->assign(
     )
   );
 
+if ($conf['auth_key_duration'] > 0)
+{
+  $template->assign(
+    'auth_key_duration',
+    time_since(
+      strtotime('now -'.$conf['auth_key_duration'].' second'),
+      'second',
+      null,
+      false
+      )
+    );
+}
+
 // +-----------------------------------------------------------------------+
 // |                          form construction                            |
 // +-----------------------------------------------------------------------+
@@ -189,6 +272,64 @@ SELECT
   }
 }
 
+// all users with status != guest and permitted to this this album (for a
+// perfect search, we should also check that album is not only filled with
+// private photos)
+$query = '
+SELECT
+    user_id
+  FROM '.USER_INFOS_TABLE.'
+  WHERE status != \'guest\'
+;';
+$all_user_ids = query2array($query, null, 'user_id');
+
+if ('private' == $category['status'])
+{
+  $user_ids_access_indirect = array();
+  
+  if (isset($group_ids) and count($group_ids) > 0)
+  {
+    $query = '
+SELECT
+    user_id
+  FROM '.USER_GROUP_TABLE.'
+  WHERE group_id IN ('.implode(',', $group_ids).') 
+';
+    $user_ids_access_indirect = query2array($query, null, 'user_id');
+  }
+
+  $query = '
+SELECT
+    user_id
+  FROM '.USER_ACCESS_TABLE.'
+  WHERE cat_id = '.$category['id'].'
+;';
+  $user_ids_access_direct = query2array($query, null, 'user_id');
+
+  $user_ids_access = array_unique(array_merge($user_ids_access_direct, $user_ids_access_indirect));
+
+  $user_ids = array_intersect($user_ids_access, $all_user_ids);
+}
+else
+{
+  $user_ids = $all_user_ids;
+}
+
+if (count($user_ids) > 0)
+{
+  $query = '
+SELECT
+    '.$conf['user_fields']['id'].' AS id,
+    '.$conf['user_fields']['username'].' AS username
+  FROM '.USERS_TABLE.'
+  WHERE id IN ('.implode(',', $user_ids).')
+;';
+
+  $users = query2array($query, 'id', 'username');
+
+  $template->assign('user_options', $users);
+}
+
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/batch_manager.php b/sources/admin/batch_manager.php
index 257b11b..e81c59f 100644
--- a/sources/admin/batch_manager.php
+++ b/sources/admin/batch_manager.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -63,6 +63,21 @@ DELETE FROM '.CADDIE_TABLE.'
     
     redirect(get_root_url().'admin.php?page='.$_GET['page']);
   }
+
+  if ('delete_orphans' == $_GET['action'])
+  {
+    $deleted_count = delete_elements(get_orphans(), true);
+    
+    if ($deleted_count > 0)
+    {
+      $_SESSION['page_infos'][] = l10n_dec(
+        '%d photo was deleted', '%d photos were deleted',
+        $deleted_count
+        );
+
+      redirect(get_root_url().'admin.php?page='.$_GET['page']);
+    }
+  }
 }
 
 // +-----------------------------------------------------------------------+
@@ -323,15 +338,7 @@ SELECT id
     break;
 
   case 'no_album':
-    $query = '
-SELECT
-    id
-  FROM '.IMAGES_TABLE.'
-    LEFT JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id
-  WHERE category_id is null
-;';
-    $filter_sets[] = query2array($query, null, 'id');
-
+    $filter_sets[] = get_orphans();
     break;
 
   case 'no_tag':
diff --git a/sources/admin/batch_manager_global.php b/sources/admin/batch_manager_global.php
index 4179ed2..1d5cb74 100644
--- a/sources/admin/batch_manager_global.php
+++ b/sources/admin/batch_manager_global.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -44,7 +44,6 @@ trigger_notify('loc_begin_element_set_global');
 
 check_input_parameter('del_tags', $_POST, true, PATTERN_ID);
 check_input_parameter('associate', $_POST, false, PATTERN_ID);
-check_input_parameter('move', $_POST, false, PATTERN_ID);
 check_input_parameter('dissociate', $_POST, false, PATTERN_ID);
 
 // +-----------------------------------------------------------------------+
@@ -173,7 +172,7 @@ DELETE
 
   else if ('move' == $action)
   {
-    move_images_to_categories($collection, array($_POST['move']));
+    move_images_to_categories($collection, array($_POST['associate']));
 
     $_SESSION['page_infos'] = array(
       l10n('Information data registered in database')
@@ -187,7 +186,7 @@ DELETE
 
     else if ('no_virtual_album' == $page['prefilter'])
     {
-      $category_info = get_cat_info($_POST['move']);
+      $category_info = get_cat_info($_POST['associate']);
       if (empty($category_info['dir']))
       {
         $redirect = true;
@@ -430,7 +429,7 @@ $prefilters = array(
   array('ID' => 'caddie', 'NAME' => l10n('Caddie')),
   array('ID' => 'favorites', 'NAME' => l10n('Your favorites')),
   array('ID' => 'last_import', 'NAME' => l10n('Last import')),
-  array('ID' => 'no_album', 'NAME' => l10n('With no album')),
+  array('ID' => 'no_album', 'NAME' => l10n('With no album').' ('.l10n('Orphans').')'),
   array('ID' => 'no_tag', 'NAME' => l10n('With no tag')),
   array('ID' => 'duplicates', 'NAME' => l10n('Duplicates')),
   array('ID' => 'all_photos', 'NAME' => l10n('All'))
diff --git a/sources/admin/batch_manager_unit.php b/sources/admin/batch_manager_unit.php
index bed0cdc..f4d69d5 100644
--- a/sources/admin/batch_manager_unit.php
+++ b/sources/admin/batch_manager_unit.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/cat_list.php b/sources/admin/cat_list.php
index 54cb445..81e7c18 100644
--- a/sources/admin/cat_list.php
+++ b/sources/admin/cat_list.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -281,7 +281,7 @@ SELECT id, name, id_uppercat
     }
     else
     {
-      $sort[] = $row['name'];
+      $sort[] = remove_accents($row['name']);
     }
     
     $categories[] = array(
diff --git a/sources/admin/cat_modify.php b/sources/admin/cat_modify.php
index 3cf8239..3e50d8f 100644
--- a/sources/admin/cat_modify.php
+++ b/sources/admin/cat_modify.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -172,21 +172,6 @@ UPDATE '.CATEGORIES_TABLE.'
   $_SESSION['page_infos'][] = l10n('Album updated successfully');
   $redirect = true;
 }
-elseif (isset($_POST['set_random_representant']))
-{
-  set_random_representant(array($_GET['cat_id']));
-  $redirect = true;
-}
-elseif (isset($_POST['delete_representant']))
-{
-  $query = '
-UPDATE '.CATEGORIES_TABLE.'
-  SET representative_picture_id = NULL
-  WHERE id = '.$_GET['cat_id'].'
-;';
-  pwg_query($query);
-  $redirect = true;
-}
 
 if (isset($redirect))
 {
@@ -336,8 +321,7 @@ else
 }
 
 // representant management
-if ($category['has_images']
-    or !empty($category['representative_picture_id']))
+if ($category['has_images'] or !empty($category['representative_picture_id']))
 {
   $tpl_representant = array();
 
@@ -345,20 +329,7 @@ if ($category['has_images']
   // representant ?
   if (!empty($category['representative_picture_id']))
   {
-    $query = '
-SELECT id,representative_ext,path
-  FROM '.IMAGES_TABLE.'
-  WHERE id = '.$category['representative_picture_id'].'
-;';
-    $row = pwg_db_fetch_assoc(pwg_query($query));
-    $src = DerivativeImage::thumb_url($row);
-    $url = get_root_url().'admin.php?page=photo-'.$category['representative_picture_id'];
-
-    $tpl_representant['picture'] =
-      array(
-        'SRC' => $src,
-        'URL' => $url
-      );
+    $tpl_representant['picture'] = get_category_representant_properties($category['representative_picture_id']);
   }
 
   // can the admin choose to set a new random representant ?
diff --git a/sources/admin/cat_move.php b/sources/admin/cat_move.php
index d596d4e..9e7e0b8 100644
--- a/sources/admin/cat_move.php
+++ b/sources/admin/cat_move.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/cat_options.php b/sources/admin/cat_options.php
index f191095..41d5cd7 100644
--- a/sources/admin/cat_options.php
+++ b/sources/admin/cat_options.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/cat_perm.php b/sources/admin/cat_perm.php
index c42b3ea..eb55f3e 100644
--- a/sources/admin/cat_perm.php
+++ b/sources/admin/cat_perm.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/comments.php b/sources/admin/comments.php
index 0f09faf..580f03b 100644
--- a/sources/admin/comments.php
+++ b/sources/admin/comments.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/configuration.php b/sources/admin/configuration.php
index e7e6033..4a9c3c3 100644
--- a/sources/admin/configuration.php
+++ b/sources/admin/configuration.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -578,7 +578,7 @@ switch ($page['section'])
         $position = 'bottomright';
       }
 
-      if ($wm->xrepeat != 0)
+      if ($wm->xrepeat != 0 || $wm->yrepeat != 0)
       {
         $position = 'custom';
       }
@@ -592,6 +592,7 @@ switch ($page['section'])
           'xpos' => $wm->xpos,
           'ypos' => $wm->ypos,
           'xrepeat' => $wm->xrepeat,
+          'yrepeat' => $wm->yrepeat,
           'opacity' => $wm->opacity,
           'position' => $position,
           )
diff --git a/sources/admin/element_set_ranks.php b/sources/admin/element_set_ranks.php
index 8b68ce6..7ff57fa 100644
--- a/sources/admin/element_set_ranks.php
+++ b/sources/admin/element_set_ranks.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -45,38 +45,6 @@ if (!isset($_GET['cat_id']) or !is_numeric($_GET['cat_id']))
 
 $page['category_id'] = $_GET['cat_id'];
 
-// +-----------------------------------------------------------------------+
-// |                               functions                               |
-// +-----------------------------------------------------------------------+
-
-/**
- * save the rank depending on given images order
- *
- * The list of ordered images id is supposed to be in the same parent
- * category
- *
- * @param array categories
- * @return void
- */
-function save_images_order($category_id, $images)
-{
-  $current_rank = 0;
-  $datas = array();
-  foreach ($images as $id)
-  {
-    $datas[] = array(
-      'category_id' => $category_id,
-      'image_id' => $id,
-      'rank' => ++$current_rank,
-      );
-  }
-  $fields = array(
-    'primary' => array('image_id', 'category_id'),
-    'update' => array('rank')
-    );
-  mass_updates(IMAGE_CATEGORY_TABLE, $fields, $datas);
-}
-
 // +-----------------------------------------------------------------------+
 // |                       global mode form submission                     |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/extend_for_templates.php b/sources/admin/extend_for_templates.php
index 0bab121..66b8009 100644
--- a/sources/admin/extend_for_templates.php
+++ b/sources/admin/extend_for_templates.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/group_list.php b/sources/admin/group_list.php
index 5c53a8b..9691f49 100644
--- a/sources/admin/group_list.php
+++ b/sources/admin/group_list.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/group_perm.php b/sources/admin/group_perm.php
index 28ea481..d4311e0 100644
--- a/sources/admin/group_perm.php
+++ b/sources/admin/group_perm.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/help.php b/sources/admin/help.php
index 0625ea6..cdc3bdf 100644
--- a/sources/admin/help.php
+++ b/sources/admin/help.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/history.php b/sources/admin/history.php
index 26855bb..40648e4 100644
--- a/sources/admin/history.php
+++ b/sources/admin/history.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -50,7 +50,7 @@ else
   $page['start'] = 0;
 }
 
-$types = array('none', 'picture', 'high', 'other');
+$types = array_merge(array('none'), get_enums(HISTORY_TABLE, 'image_type'));
 
 $display_thumbnails = array('no_display_thumbnail' => l10n('No display'),
                             'display_thumbnail_classic' => l10n('Classic display'),
diff --git a/sources/admin/include/add_core_tabs.inc.php b/sources/admin/include/add_core_tabs.inc.php
index 28cf1ce..9cef0f0 100644
--- a/sources/admin/include/add_core_tabs.inc.php
+++ b/sources/admin/include/add_core_tabs.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/include/albums_tab.inc.php b/sources/admin/include/albums_tab.inc.php
index 399778d..8bccb53 100644
--- a/sources/admin/include/albums_tab.inc.php
+++ b/sources/admin/include/albums_tab.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/include/c13y_internal.class.php b/sources/admin/include/c13y_internal.class.php
index 1037509..acf4a32 100644
--- a/sources/admin/include/c13y_internal.class.php
+++ b/sources/admin/include/c13y_internal.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -23,7 +23,7 @@
 
 class c13y_internal
 {
-  function c13y_internal()
+  function __construct()
   {
     add_event_handler('list_check_integrity', array(&$this, 'c13y_version'));
     add_event_handler('list_check_integrity', array(&$this, 'c13y_exif'));
diff --git a/sources/admin/include/check_integrity.class.php b/sources/admin/include/check_integrity.class.php
index 66ff1db..bf21041 100644
--- a/sources/admin/include/check_integrity.class.php
+++ b/sources/admin/include/check_integrity.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -27,7 +27,7 @@ class check_integrity
   var $retrieve_list;
   var $build_ignore_list;
 
-  function check_integrity()
+  function __construct()
   {
     $this->ignore_list = array();
     $this->retrieve_list = array();
diff --git a/sources/admin/include/configuration_sizes_process.inc.php b/sources/admin/include/configuration_sizes_process.inc.php
index a731aa5..92d746d 100644
--- a/sources/admin/include/configuration_sizes_process.inc.php
+++ b/sources/admin/include/configuration_sizes_process.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/include/configuration_watermark_process.inc.php b/sources/admin/include/configuration_watermark_process.inc.php
index ad23d92..bc14517 100644
--- a/sources/admin/include/configuration_watermark_process.inc.php
+++ b/sources/admin/include/configuration_watermark_process.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -126,6 +126,7 @@ if (count($errors) == 0)
   $watermark->xpos = intval($pwatermark['xpos']);
   $watermark->ypos = intval($pwatermark['ypos']);
   $watermark->xrepeat = intval($pwatermark['xrepeat']);
+  $watermark->yrepeat = intval($pwatermark['yrepeat']);
   $watermark->opacity = intval($pwatermark['opacity']);
   $watermark->min_size = array(intval($pwatermark['minw']),intval($pwatermark['minh']));
 
@@ -135,6 +136,7 @@ if (count($errors) == 0)
     || $watermark->xpos != $old_watermark->xpos
     || $watermark->ypos != $old_watermark->ypos
     || $watermark->xrepeat != $old_watermark->xrepeat
+    || $watermark->yrepeat != $old_watermark->yrepeat
     || $watermark->opacity != $old_watermark->opacity;
 
   // save the new watermark configuration
diff --git a/sources/admin/include/functions.php b/sources/admin/include/functions.php
index 7d29f57..9a827d1 100644
--- a/sources/admin/include/functions.php
+++ b/sources/admin/include/functions.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -180,6 +180,25 @@ function delete_element_files($ids)
   }
 
   $new_ids = array();
+  $formats_of = array();
+
+  $query = '
+SELECT
+    image_id,
+    ext
+  FROM '.IMAGE_FORMAT_TABLE.'
+  WHERE image_id IN ('.implode(',', $ids).')
+;';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    if (!isset($formats_of[ $row['image_id'] ]))
+    {
+      $formats_of[ $row['image_id'] ] = array();
+    }
+
+    $formats_of[ $row['image_id'] ][] = $row['ext'];
+  }
 
   $query = '
 SELECT
@@ -205,6 +224,14 @@ SELECT
       $files[] = original_to_representative( $files[0], $row['representative_ext']);
     }
 
+    if (isset($formats_of[ $row['id'] ]))
+    {
+      foreach ($formats_of[ $row['id'] ] as $format_ext)
+      {
+        $files[] = original_to_format($files[0], $format_ext);
+      }
+    }
+
     $ok = true;
     if (!isset($conf['never_delete_originals']))
     {
@@ -277,6 +304,13 @@ DELETE FROM '.IMAGE_CATEGORY_TABLE.'
 ;';
   pwg_query($query);
 
+  // destruction of the formats
+  $query = '
+DELETE FROM '.IMAGE_FORMAT_TABLE.'
+  WHERE image_id IN ('. $ids_str .')
+;';
+  pwg_query($query);
+
   // destruction of the links between images and tags
   $query = '
 DELETE FROM '.IMAGE_TAG_TABLE.'
@@ -358,6 +392,7 @@ function delete_user($user_id)
     CADDIE_TABLE,
     // deletion of piwigo specific informations
     USER_INFOS_TABLE,
+    USER_AUTH_KEYS_TABLE
     );
 
   foreach ($tables as $table)
@@ -370,11 +405,7 @@ DELETE FROM '.$table.'
   }
 
   // purge of sessions
-  $query = '
-DELETE FROM '.SESSIONS_TABLE.'
-  WHERE data LIKE \'pwg_uid|i:'.(int)$user_id.';%\'
-;';
-  pwg_query($query);
+  delete_user_sessions($user_id);
 
   // destruction of the user
   $query = '
@@ -540,6 +571,7 @@ function get_fs_directories($path, $recursive = true)
       '.', '..', '.svn',
       'thumbnail', 'pwg_high',
       'pwg_representative',
+      'pwg_format',
       )
     );
   $exclude_folders = array_flip($exclude_folders);
@@ -886,6 +918,25 @@ SELECT uppercats
   return $uppercats;
 }
 
+/**
+ */
+function get_category_representant_properties($image_id)
+{
+  $query = '
+SELECT id,representative_ext,path
+  FROM '.IMAGES_TABLE.'
+  WHERE id = '.$image_id.'
+;';
+  $row = pwg_db_fetch_assoc(pwg_query($query));
+  $src = DerivativeImage::thumb_url($row);
+  $url = get_root_url().'admin.php?page=photo-'.$image_id;
+
+  return array(
+    'src' => $src,
+    'url' => $url
+    );
+}
+
 /**
  * Set a new random representant to the categories.
  *
@@ -2025,6 +2076,8 @@ function cat_admin_access($category_id)
  */
 function fetchRemote($src, &$dest, $get_data=array(), $post_data=array(), $user_agent='Piwigo', $step=0)
 {
+  global $conf;
+
   // Try to retrieve data from local file?
   if (!url_is_remote($src))
   {
@@ -2060,6 +2113,17 @@ function fetchRemote($src, &$dest, $get_data=array(), $post_data=array(), $user_
   if (function_exists('curl_init') && function_exists('curl_exec'))
   {
     $ch = @curl_init();
+
+    if (isset($conf['use_proxy']) && $conf['use_proxy'])
+    {
+      @curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 0);
+      @curl_setopt($ch, CURLOPT_PROXY, $conf['proxy_server']);
+      if (isset($conf['proxy_auth']) && !empty($conf['proxy_auth']))
+      {
+        @curl_setopt($ch, CURLOPT_PROXYUSERPWD, $conf['proxy_auth']);
+      }
+    }
+
     @curl_setopt($ch, CURLOPT_URL, $src);
     @curl_setopt($ch, CURLOPT_HEADER, 1);
     @curl_setopt($ch, CURLOPT_USERAGENT, $user_agent);
@@ -2775,4 +2839,51 @@ SELECT CONCAT(
   }
 
   return $keys;
-}
\ No newline at end of file
+}
+
+/**
+ * Return the list of image ids associated to no album
+ *
+ * @return int[] $image_ids
+ */
+function get_orphans()
+{
+  $query = '
+SELECT
+    id
+  FROM '.IMAGES_TABLE.'
+    LEFT JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id
+  WHERE category_id is null
+;';
+  
+  return query2array($query, null, 'id');
+}
+
+/**
+ * save the rank depending on given images order
+ *
+ * The list of ordered images id is supposed to be in the same parent
+ * category
+ *
+ * @param int category_id
+ * @param int[] images
+ * @return void
+ */
+function save_images_order($category_id, $images)
+{
+  $current_rank = 0;
+  $datas = array();
+  foreach ($images as $id)
+  {
+    $datas[] = array(
+      'category_id' => $category_id,
+      'image_id' => $id,
+      'rank' => ++$current_rank,
+      );
+  }
+  $fields = array(
+    'primary' => array('image_id', 'category_id'),
+    'update' => array('rank')
+    );
+  mass_updates(IMAGE_CATEGORY_TABLE, $fields, $datas);
+}
diff --git a/sources/admin/include/functions_history.inc.php b/sources/admin/include/functions_history.inc.php
index e2bcc4d..55783fd 100644
--- a/sources/admin/include/functions_history.inc.php
+++ b/sources/admin/include/functions_history.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/include/functions_install.inc.php b/sources/admin/include/functions_install.inc.php
index a978355..5a68964 100644
--- a/sources/admin/include/functions_install.inc.php
+++ b/sources/admin/include/functions_install.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/include/functions_metadata.php b/sources/admin/include/functions_metadata.php
index d969d06..01b4538 100644
--- a/sources/admin/include/functions_metadata.php
+++ b/sources/admin/include/functions_metadata.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -68,20 +68,7 @@ function get_sync_iptc_data($file)
 
   if (isset($iptc['keywords']))
   {
-    // official keywords separator is the comma
-    $iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']);
-    $iptc['keywords'] = preg_replace('/,+/', ',', $iptc['keywords']);
-    $iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']);
-
-    $iptc['keywords'] = implode(
-      ',',
-      array_unique(
-        explode(
-          ',',
-          $iptc['keywords']
-          )
-        )
-      );
+    $iptc['keywords'] = metadata_normalize_keywords_string($iptc['keywords']);
   }
 
   foreach ($iptc as $pwg_key => $value)
@@ -122,6 +109,12 @@ function get_sync_exif_data($file)
         continue;
       }
     }
+
+    if (in_array($pwg_key, array('keywords', 'tags')))
+    {
+      $exif[$pwg_key] = metadata_normalize_keywords_string($exif[$pwg_key]);
+    }
+    
     $exif[$pwg_key] = addslashes($exif[$pwg_key]);
   }
 
@@ -180,8 +173,24 @@ function get_sync_metadata($infos)
 
   $infos['filesize'] = floor($fs/1024);
 
+  $is_tiff = false;
+
   if (isset($infos['representative_ext']))
   {
+    if ($image_size = @getimagesize($file))
+    {
+      $type = $image_size[2];
+
+      if (IMAGETYPE_TIFF_MM == $type or IMAGETYPE_TIFF_II == $type)
+      {
+        // in case of TIFF files, we want to use the original file and not
+        // the representative for EXIF/IPTC, but we need the representative
+        // for width/height (to compute the multiple size dimensions)
+        $is_tiff = true;
+      }
+
+    }
+
     $file = original_to_representative($file, $infos['representative_ext']);
   }
 
@@ -191,6 +200,12 @@ function get_sync_metadata($infos)
     $infos['height'] = $image_size[1];
   }
 
+  if ($is_tiff)
+  {
+    // back to original file
+    $file = PHPWG_ROOT_PATH.$infos['path'];
+  }
+
   if ($conf['use_exif'])
   {
     $exif = get_sync_exif_data($file);
@@ -351,4 +366,31 @@ SELECT id, path, representative_ext
   return hash_from_query($query, 'id');
 }
 
+/**
+ * Returns the list of keywords (future tags) correctly separated with
+ * commas. Other separators are converted into commas.
+ *
+ * @param string $keywords_string
+ * @return string
+ */
+function metadata_normalize_keywords_string($keywords_string)
+{
+  global $conf;
+  
+  $keywords_string = preg_replace($conf['metadata_keyword_separator_regex'], ',', $keywords_string);
+  $keywords_string = preg_replace('/,+/', ',', $keywords_string);
+  $keywords_string = preg_replace('/^,+|,+$/', '', $keywords_string);
+      
+  $keywords_string = implode(
+    ',',
+    array_unique(
+      explode(
+        ',',
+        $keywords_string
+        )
+      )
+    );
+
+  return $keywords_string;
+}
 ?>
\ No newline at end of file
diff --git a/sources/admin/include/functions_notification_by_mail.inc.php b/sources/admin/include/functions_notification_by_mail.inc.php
index 8d0fe26..204be5c 100644
--- a/sources/admin/include/functions_notification_by_mail.inc.php
+++ b/sources/admin/include/functions_notification_by_mail.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -125,12 +125,12 @@ select
   U.'.$conf['user_fields']['username'].' as username,
   U.'.$conf['user_fields']['email'].' as mail_address,
   N.enabled,
-  N.last_send
-from
-  '.USER_MAIL_NOTIFICATION_TABLE.' as N,
-  '.USERS_TABLE.' as U
-where
-  N.user_id =  U.'.$conf['user_fields']['id'];
+  N.last_send,
+  UI.status
+from '.USER_MAIL_NOTIFICATION_TABLE.' as N
+  JOIN '.USERS_TABLE.' as U on N.user_id =  U.'.$conf['user_fields']['id'].'
+  JOIN '.USER_INFOS_TABLE.' as UI on UI.user_id = N.user_id
+where 1=1';
 
     if ($action == 'send')
     {
@@ -159,7 +159,7 @@ order by';
     else
     {
       $query .= '
-  username;';
+  username';
     }
 
     $query .= ';';
diff --git a/sources/admin/include/functions_permalinks.php b/sources/admin/include/functions_permalinks.php
index 6c8ae4a..db06796 100644
--- a/sources/admin/include/functions_permalinks.php
+++ b/sources/admin/include/functions_permalinks.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/include/functions_plugins.inc.php b/sources/admin/include/functions_plugins.inc.php
index fb98c79..8605f1f 100644
--- a/sources/admin/include/functions_plugins.inc.php
+++ b/sources/admin/include/functions_plugins.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/include/functions_upgrade.php b/sources/admin/include/functions_upgrade.php
index b7a8763..bf6ef2b 100644
--- a/sources/admin/include/functions_upgrade.php
+++ b/sources/admin/include/functions_upgrade.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -174,10 +174,7 @@ UPDATE '.PREFIX_TABLE.'user_infos
 // Deactivate all templates
 function deactivate_templates()
 {
-  $query = '
-  UPDATE '.PREFIX_TABLE.'config
-    SET value = \''. array() .'\'
-  WHERE param = \'extents_for_templates\';';
+  conf_update_param('extents_for_templates', array());
 }
 
 // Check access rights
@@ -322,4 +319,4 @@ function upgrade_db_connect()
     my_error(l10n($e->getMessage()), true); 
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/sources/admin/include/functions_upload.inc.php b/sources/admin/include/functions_upload.inc.php
index d0ef6e6..900612f 100644
--- a/sources/admin/include/functions_upload.inc.php
+++ b/sources/admin/include/functions_upload.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -268,104 +268,19 @@ SELECT
   }
   @chmod($file_path, 0644);
 
-  if ($is_tiff and pwg_image::get_library() == 'ext_imagick')
-  {
-    // move the uploaded file to pwg_representative sub-directory
-    $representative_file_path = dirname($file_path).'/pwg_representative/';
-    $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.';
+  // handle the uploaded file type by potentially making a
+  // pwg_representative file.
+  $representative_ext = trigger_change('upload_file', null, $file_path);
 
-    $representative_ext = $conf['tiff_representative_ext'];
-    $representative_file_path.= $representative_ext;
-
-    prepare_directory(dirname($representative_file_path));
-
-    $exec = $conf['ext_imagick_dir'].'convert';
-
-    if ('jpg' == $conf['tiff_representative_ext'])
-    {
-      $exec .= ' -quality 98';
-    }
-
-    $exec .= ' "'.realpath($file_path).'"';
-
-    $dest = pathinfo($representative_file_path);
-    $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
-
-    $exec .= ' 2>&1';
-    @exec($exec, $returnarray);
-
-    // sometimes ImageMagick creates file-0.jpg (full size) + file-1.jpg
-    // (thumbnail). I don't know how to avoid it.
-    $representative_file_abspath = realpath($dest['dirname']).'/'.$dest['basename'];
-    if (!file_exists($representative_file_abspath))
-    {
-      $first_file_abspath = preg_replace(
-        '/\.'.$representative_ext.'$/',
-        '-0.'.$representative_ext,
-        $representative_file_abspath
-        );
-
-      if (file_exists($first_file_abspath))
-      {
-        rename($first_file_abspath, $representative_file_abspath);
-      }
-    }
-  }
-
-  //
-  // generate pwg_representative in case of video
-  //
-  $ffmpeg_video_exts = array( // extensions tested with FFmpeg
-    'wmv','mov','mkv','mp4','mpg','flv','asf','xvid','divx','mpeg',
-    'avi','rm',
-    );
+  global $logger;
+  $logger->info("Handling " . (string)$file_path . " got " . (string)$representative_ext);
   
-  if (isset($original_extension) and in_array($original_extension, $ffmpeg_video_exts))
-  {
-    $representative_file_path = dirname($file_path).'/pwg_representative/';
-    $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.';
-    
-    $representative_ext = 'jpg';
-    $representative_file_path.= $representative_ext;
-    
-    prepare_directory(dirname($representative_file_path));
-    
-    $second = 1;
-    
-    $ffmpeg = $conf['ffmpeg_dir'].'ffmpeg';
-    $ffmpeg.= ' -i "'.$file_path.'"';
-    $ffmpeg.= ' -an -ss '.$second;
-    $ffmpeg.= ' -t 1 -r 1 -y -vcodec mjpeg -f mjpeg';
-    $ffmpeg.= ' "'.$representative_file_path.'"';
-    
-    // file_put_contents('/tmp/ffmpeg.log', "\n==== ".date('c')."\n".__FUNCTION__.' : '.$ffmpeg."\n", FILE_APPEND);
-    
-    @exec($ffmpeg);
-
-    if (!file_exists($representative_file_path))
-    {
-      $representative_ext = null;
-    }
-  }
-
-  if (isset($original_extension) and 'pdf' == $original_extension and pwg_image::get_library() == 'ext_imagick')
-  {
-    $representative_file_path = dirname($file_path).'/pwg_representative/';
-    $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.';
-    
-    $representative_ext = 'jpg';
-    $representative_file_path.= $representative_ext;
-
-    prepare_directory(dirname($representative_file_path));
-    
-    $exec = $conf['ext_imagick_dir'].'convert';
-    $exec.= ' -quality 98';
-    $exec.= ' "'.realpath($file_path).'"[0]';
-
-    $dest = pathinfo($representative_file_path);
-    $exec.= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
-    $exec.= ' 2>&1';
-    @exec($exec, $returnarray);
+  // If it is set to either true (the file didn't need a
+  // representative generated) or false (the generation of the
+  // representative failed), set it to null because we have no
+  // representative file.
+  if (is_bool($representative_ext)) {
+    $representative_ext = null;
   }
   
   if (pwg_image::get_library() != 'gd')
@@ -492,6 +407,168 @@ SELECT
   return $image_id;
 }
 
+add_event_handler('upload_file', 'upload_file_pdf');
+function upload_file_pdf($representative_ext, $file_path)
+{
+  global $logger, $conf;
+
+  $logger->info(__FUNCTION__.', $file_path = '.$file_path.', $representative_ext = '.$representative_ext);
+
+  if (isset($representative_ext))
+  {
+    return $representative_ext;
+  }
+
+  if (pwg_image::get_library() != 'ext_imagick')
+  {
+    return $representative_ext;
+  }
+
+  if (!in_array(strtolower(get_extension($file_path)), array('pdf')))
+  {
+    return $representative_ext;
+  }
+
+  $ext = conf_get_param('pdf_representative_ext', 'jpg');
+  $jpg_quality = conf_get_param('pdf_jpg_quality', 90);
+
+  // move the uploaded file to pwg_representative sub-directory
+  $representative_file_path = original_to_representative($file_path, $ext);
+  prepare_directory(dirname($representative_file_path));
+
+  $exec = $conf['ext_imagick_dir'].'convert';
+  if ('jpg' == $ext)
+  {
+    $exec.= ' -quality '.$jpg_quality;
+  }
+  $exec.= ' "'.realpath($file_path).'"[0]';
+  $exec.= ' "'.$representative_file_path.'"';
+  $exec.= ' 2>&1';
+  @exec($exec, $returnarray);
+
+  // Return the extension (if successful) or false (if failed)
+  if (file_exists($representative_file_path))
+  {
+    $representative_ext = $ext;
+  }
+
+  return $representative_ext;
+}
+
+add_event_handler('upload_file', 'upload_file_tiff');
+function upload_file_tiff($representative_ext, $file_path)
+{
+  global $logger, $conf;
+
+  $logger->info(__FUNCTION__.', $file_path = '.$file_path.', $representative_ext = '.$representative_ext);
+
+  if (isset($representative_ext))
+  {
+    return $representative_ext;
+  }
+
+  if (pwg_image::get_library() != 'ext_imagick')
+  {
+    return $representative_ext;
+  }
+
+  if (!in_array(strtolower(get_extension($file_path)), array('tif', 'tiff')))
+  {
+    return $representative_ext;
+  }
+
+  // move the uploaded file to pwg_representative sub-directory
+  $representative_file_path = dirname($file_path).'/pwg_representative/';
+  $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.';
+
+  $representative_ext = $conf['tiff_representative_ext'];
+  $representative_file_path.= $representative_ext;
+
+  prepare_directory(dirname($representative_file_path));
+
+  $exec = $conf['ext_imagick_dir'].'convert';
+
+  if ('jpg' == $conf['tiff_representative_ext'])
+  {
+    $exec .= ' -quality 98';
+  }
+
+  $exec .= ' "'.realpath($file_path).'"';
+
+  $dest = pathinfo($representative_file_path);
+  $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
+
+  $exec .= ' 2>&1';
+  @exec($exec, $returnarray);
+
+  // sometimes ImageMagick creates file-0.jpg (full size) + file-1.jpg
+  // (thumbnail). I don't know how to avoid it.
+  $representative_file_abspath = realpath($dest['dirname']).'/'.$dest['basename'];
+  if (!file_exists($representative_file_abspath))
+  {
+    $first_file_abspath = preg_replace(
+      '/\.'.$representative_ext.'$/',
+      '-0.'.$representative_ext,
+      $representative_file_abspath
+      );
+
+    if (file_exists($first_file_abspath))
+    {
+      rename($first_file_abspath, $representative_file_abspath);
+    }
+  }
+
+  return get_extension($representative_file_abspath);
+}
+
+add_event_handler('upload_file', 'upload_file_video');
+function upload_file_video($representative_ext, $file_path)
+{
+  global $logger, $conf;
+
+  $logger->info(__FUNCTION__.', $file_path = '.$file_path.', $representative_ext = '.$representative_ext);
+
+  if (isset($representative_ext))
+  {
+    return $representative_ext;
+  }
+
+  $ffmpeg_video_exts = array( // extensions tested with FFmpeg
+    'wmv','mov','mkv','mp4','mpg','flv','asf','xvid','divx','mpeg',
+    'avi','rm', 'm4v', 'ogg', 'ogv', 'webm', 'webmv',
+    );
+
+  if (!in_array(strtolower(get_extension($file_path)), $ffmpeg_video_exts))
+  {
+    return $representative_ext;
+  }
+
+  $representative_file_path = dirname($file_path).'/pwg_representative/';
+  $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.';
+
+  $representative_ext = 'jpg';
+  $representative_file_path.= $representative_ext;
+
+  prepare_directory(dirname($representative_file_path));
+
+  $second = 1;
+
+  $ffmpeg = $conf['ffmpeg_dir'].'ffmpeg';
+  $ffmpeg.= ' -i "'.$file_path.'"';
+  $ffmpeg.= ' -an -ss '.$second;
+  $ffmpeg.= ' -t 1 -r 1 -y -vcodec mjpeg -f mjpeg';
+  $ffmpeg.= ' "'.$representative_file_path.'"';
+
+  @exec($ffmpeg);
+
+  if (!file_exists($representative_file_path))
+  {
+    return null;
+  }
+
+  return $representative_ext;
+}
+
 function prepare_directory($directory)
 {
   if (!is_dir($directory)) {
diff --git a/sources/admin/include/image.class.php b/sources/admin/include/image.class.php
index e776997..e713a84 100644
--- a/sources/admin/include/image.class.php
+++ b/sources/admin/include/image.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -621,6 +621,8 @@ class image_ext_imagick implements imageInterface
 
   function write($destination_filepath)
   {
+    global $logger;
+
     $this->add_command('interlace', 'line'); // progressive rendering
     // use 4:2:2 chroma subsampling (reduce file size by 20-30% with "almost" no human perception)
     //
@@ -648,13 +650,13 @@ class image_ext_imagick implements imageInterface
 
     $dest = pathinfo($destination_filepath);
     $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'" 2>&1';
+    $logger->debug($exec, 'i.php');
     @exec($exec, $returnarray);
 
-    if (function_exists('ilog')) ilog($exec);
     if (is_array($returnarray) && (count($returnarray)>0) )
     {
-      if (function_exists('ilog')) ilog('ERROR', $returnarray);
-      foreach($returnarray as $line)
+      $logger->error('', 'i.php', $returnarray);
+      foreach ($returnarray as $line)
         trigger_error($line, E_USER_WARNING);
     }
     return is_array($returnarray);
diff --git a/sources/admin/include/index.php b/sources/admin/include/index.php
index c8de97f..0b96c3e 100644
--- a/sources/admin/include/index.php
+++ b/sources/admin/include/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/include/languages.class.php b/sources/admin/include/languages.class.php
index 351e36d..6f67805 100644
--- a/sources/admin/include/languages.class.php
+++ b/sources/admin/include/languages.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -30,7 +30,7 @@ class languages
   /**
    * Initialize $fs_languages and $db_languages
   */
-  function languages($target_charset = null)
+  function __construct($target_charset = null)
   {
     $this->get_fs_languages($target_charset);
   }
@@ -408,4 +408,4 @@ UPDATE '.USER_INFOS_TABLE.'
     return strcmp(strtolower($a['extension_name']), strtolower($b['extension_name']));
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/sources/admin/include/mysqldump.php b/sources/admin/include/mysqldump.php
index 515d86a..1432675 100644
--- a/sources/admin/include/mysqldump.php
+++ b/sources/admin/include/mysqldump.php
@@ -59,7 +59,7 @@ class MySQLDump {
 	* @param boolean $compress It defines if the output file is compress (gzip) or not
 	* @param boolean $hexValue It defines if the outup values are base-16 or not
 	*/
-	function MYSQLDump($db = null, $filepath = 'dump.sql', $compress = false, $hexValue = false){
+	function __construct($db = null, $filepath = 'dump.sql', $compress = false, $hexValue = false){
 		$this->compress = $compress;
 		if ( !$this->setOutputFile($filepath) )
 			return false;
@@ -418,4 +418,4 @@ class MySQLDump {
 			@fclose($file);
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/sources/admin/include/pclzip.lib.php b/sources/admin/include/pclzip.lib.php
index e7facc1..c2d09a5 100644
--- a/sources/admin/include/pclzip.lib.php
+++ b/sources/admin/include/pclzip.lib.php
@@ -212,7 +212,7 @@
   //   Note that no real action is taken, if the archive does not exist it is not
   //   created. Use create() for that.
   // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
+  function __construct($p_zipname)
   {
 
     // ----- Tests the zlib
diff --git a/sources/admin/include/photos_add_direct_prepare.inc.php b/sources/admin/include/photos_add_direct_prepare.inc.php
index 34b025f..a795247 100644
--- a/sources/admin/include/photos_add_direct_prepare.inc.php
+++ b/sources/admin/include/photos_add_direct_prepare.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -25,25 +25,10 @@
 // | Photo selection                                                       |
 // +-----------------------------------------------------------------------+
 
-$upload_max_filesize = min(
-  get_ini_size('upload_max_filesize'),
-  get_ini_size('post_max_size')
-  );
-
-if ($upload_max_filesize == get_ini_size('upload_max_filesize'))
-{
-  $upload_max_filesize_shorthand = get_ini_size('upload_max_filesize', false);
-}
-else
-{
-  $upload_max_filesize_shorthand = get_ini_size('post_max_filesize', false);
-}
-
 $template->assign(
     array(
       'F_ADD_ACTION'=> PHOTOS_ADD_BASE_URL,
-      'upload_max_filesize' => $upload_max_filesize,
-      'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand,
+      'chunk_size' => $conf['upload_form_chunk_size'],
     )
   );
 
@@ -221,6 +206,16 @@ if (!isset($_SESSION['upload_hide_warnings']))
       get_ini_size('post_max_size', false)
       );
   }
+
+  if (get_ini_size('upload_max_filesize') < $conf['upload_form_chunk_size']*1024)
+  {
+    $setup_warnings[] = sprintf(
+      'Piwigo setting upload_form_chunk_size (%ukB) should be smaller than PHP configuration setting upload_max_filesize (%ukB)',
+      $conf['upload_form_chunk_size'],
+      ceil(get_ini_size('upload_max_filesize') / 1024)
+      );
+  }
+
   $template->assign(
     array(
       'setup_warnings' => $setup_warnings,
@@ -229,4 +224,4 @@ if (!isset($_SESSION['upload_hide_warnings']))
     );
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/sources/admin/include/plugins.class.php b/sources/admin/include/plugins.class.php
index 71093a6..8b4b82b 100644
--- a/sources/admin/include/plugins.class.php
+++ b/sources/admin/include/plugins.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -69,7 +69,7 @@ class plugins
   /**
    * Initialize $fs_plugins and $db_plugins_by_id
    */
-  function plugins()
+  function __construct()
   {
     $this->get_fs_plugins();
 
@@ -716,4 +716,4 @@ DELETE FROM '. PLUGINS_TABLE .'
     $this->fs_plugins = $active_plugins + $inactive_plugins + $not_installed;
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/sources/admin/include/tabsheet.class.php b/sources/admin/include/tabsheet.class.php
index c7681b6..cb89886 100644
--- a/sources/admin/include/tabsheet.class.php
+++ b/sources/admin/include/tabsheet.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -33,7 +33,7 @@ class tabsheet
     $name is the tabsheet's name inside the template .tpl file
     $titlename in the template is affected by $titlename value
   */
-  function tabsheet($name = 'TABSHEET', $titlename = 'TABSHEET_TITLE')
+  function __construct($name = 'TABSHEET', $titlename = 'TABSHEET_TITLE')
   {
     $this->sheets = array();
     $this->uniqid = null;
diff --git a/sources/admin/include/themes.class.php b/sources/admin/include/themes.class.php
index df0e29e..6d55e11 100644
--- a/sources/admin/include/themes.class.php
+++ b/sources/admin/include/themes.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -60,7 +60,7 @@ class themes
   /**
    * Initialize $fs_themes and $db_themes_by_id
   */
-  function themes()
+  function __construct()
   {
     $this->get_fs_themes();
 
@@ -736,4 +736,4 @@ SELECT
   }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/sources/admin/include/updates.class.php b/sources/admin/include/updates.class.php
index 17a3b25..d4e178f 100644
--- a/sources/admin/include/updates.class.php
+++ b/sources/admin/include/updates.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -135,15 +135,33 @@ class updates
       {
         return false;
       }
+
+      $servers = array();
+      
       foreach ($pem_exts as $ext)
       {
         if (isset($ext_to_check[$ext['extension_id']]))
         {
-          $server = 'server_'.$ext_to_check[$ext['extension_id']];
-          $this->$ext_to_check[$ext['extension_id']]->$server += array($ext['extension_id'] => $ext);
+          $type = $ext_to_check[$ext['extension_id']];
+          
+          if (!isset($servers[$type]))
+          {
+            $servers[$type] = array();
+          }
+
+          $servers[$type][ $ext['extension_id'] ] = $ext;
+          
           unset($ext_to_check[$ext['extension_id']]);
         }
       }
+
+      foreach ($servers as $server_type => $extension_list)
+      {
+        $server_string = 'server_'.$server_type;
+
+        $this->$server_type->$server_string = $extension_list;
+      }
+      
       $this->check_missing_extensions($ext_to_check);
       return true;
     }
diff --git a/sources/admin/index.php b/sources/admin/index.php
index c8de97f..0b96c3e 100644
--- a/sources/admin/index.php
+++ b/sources/admin/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/intro.php b/sources/admin/intro.php
index ee01498..96b07d2 100644
--- a/sources/admin/intro.php
+++ b/sources/admin/intro.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/languages.php b/sources/admin/languages.php
index c901d92..0ea4c17 100644
--- a/sources/admin/languages.php
+++ b/sources/admin/languages.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/languages_installed.php b/sources/admin/languages_installed.php
index eb0a895..16d9df6 100644
--- a/sources/admin/languages_installed.php
+++ b/sources/admin/languages_installed.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/languages_new.php b/sources/admin/languages_new.php
index bf46cbb..afa756c 100644
--- a/sources/admin/languages_new.php
+++ b/sources/admin/languages_new.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/maintenance.php b/sources/admin/maintenance.php
index 5c93346..3728d60 100644
--- a/sources/admin/maintenance.php
+++ b/sources/admin/maintenance.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -109,6 +109,46 @@ DELETE
   case 'sessions' :
   {
     pwg_session_gc();
+
+    // delete all sessions associated to invalid user ids (it should never happen)
+    $query = '
+SELECT
+    id,
+    data
+  FROM '.SESSIONS_TABLE.'
+;';
+    $sessions = query2array($query);
+
+    $query = '
+SELECT
+    '.$conf['user_fields']['id'].' AS id
+  FROM '.USERS_TABLE.'
+;';
+    $all_user_ids = query2array($query, 'id', null);
+
+    $sessions_to_delete = array();
+
+    foreach ($sessions as $session)
+    {
+      if (preg_match('/pwg_uid\|i:(\d+);/', $session['data'], $matches))
+      {
+        if (!isset($all_user_ids[ $matches[1] ]))
+        {
+          $sessions_to_delete[] = $session['id'];
+        }
+      }
+    }
+
+    if (count($sessions_to_delete) > 0)
+    {
+      $query = '
+DELETE
+  FROM '.SESSIONS_TABLE.'
+  WHERE id IN (\''.implode("','", $sessions_to_delete).'\')
+;';
+      pwg_query($query);
+    }
+
     break;
   }
   case 'feeds' :
diff --git a/sources/admin/menubar.php b/sources/admin/menubar.php
index 69e363c..e884fab 100644
--- a/sources/admin/menubar.php
+++ b/sources/admin/menubar.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/notification_by_mail.php b/sources/admin/notification_by_mail.php
index 38cadff..ca3d412 100644
--- a/sources/admin/notification_by_mail.php
+++ b/sources/admin/notification_by_mail.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -289,13 +289,24 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
 
           if ($is_action_send)
           {
+            $auth = null;
+            $add_url_params = array();
+            
+            $auth_key = create_user_auth_key($nbm_user['user_id'], $nbm_user['status']);
+            
+            if ($auth_key !== false)
+            {
+              $auth = $auth_key['auth_key'];
+              $add_url_params['auth'] = $auth;
+            }
+            
             set_make_full_url();
             // Fill return list of "treated" check_key for 'send'
             $return_list[] = $nbm_user['check_key'];
 
             if ($conf['nbm_send_detailed_content'])
             {
-               $news = news($nbm_user['last_send'], $dbnow, false, $conf['nbm_send_html_mail']);
+              $news = news($nbm_user['last_send'], $dbnow, false, $conf['nbm_send_html_mail'], $auth);
                $exist_data = count($news) > 0;
             }
             else
@@ -362,7 +373,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
                     array
                     (
                       'TITLE' => get_title_recent_post_date($date_detail),
-                      'HTML_DATA' => get_html_description_recent_post_date($date_detail)
+                      'HTML_DATA' => get_html_description_recent_post_date($date_detail, $auth)
                     )
                   );
                 }
@@ -373,7 +384,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
                 array
                 (
                   'GOTO_GALLERY_TITLE' => $conf['gallery_title'],
-                  'GOTO_GALLERY_URL' => get_gallery_home_url(),
+                  'GOTO_GALLERY_URL' => add_url_params(get_gallery_home_url(), $add_url_params),
                   'SEND_AS_NAME'      => $env_nbm['send_as_name'],
                 )
               );
@@ -389,6 +400,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
                   'email_format' => $env_nbm['email_format'],
                   'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
                   'content_format' => $env_nbm['email_format'],
+                  'auth_key' => $auth,
                   )
                 );
 
@@ -707,6 +719,20 @@ switch ($page['mode'])
       }
     }
     $template->assign($page['mode'], $tpl_var);
+
+    if ($conf['auth_key_duration'] > 0)
+    {
+      $template->assign(
+        'auth_key_duration',
+        time_since(
+          strtotime('now -'.$conf['auth_key_duration'].' second'),
+          'second',
+          null,
+          false
+          )
+        );
+    }
+
     break;
   }
 }
diff --git a/sources/admin/permalinks.php b/sources/admin/permalinks.php
index 72f9513..e09a213 100644
--- a/sources/admin/permalinks.php
+++ b/sources/admin/permalinks.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/photo.php b/sources/admin/photo.php
index b99a76c..c1d0687 100644
--- a/sources/admin/photo.php
+++ b/sources/admin/photo.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/photos_add.php b/sources/admin/photos_add.php
index 72bf991..457e281 100644
--- a/sources/admin/photos_add.php
+++ b/sources/admin/photos_add.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/photos_add_applications.php b/sources/admin/photos_add_applications.php
index 82c95fd..1cb35e9 100644
--- a/sources/admin/photos_add_applications.php
+++ b/sources/admin/photos_add_applications.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/photos_add_direct.php b/sources/admin/photos_add_direct.php
index 9f3e888..fd4efe5 100644
--- a/sources/admin/photos_add_direct.php
+++ b/sources/admin/photos_add_direct.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/photos_add_ftp.php b/sources/admin/photos_add_ftp.php
index 5655d0f..e48a237 100644
--- a/sources/admin/photos_add_ftp.php
+++ b/sources/admin/photos_add_ftp.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/picture_coi.php b/sources/admin/picture_coi.php
index 6ad8fa9..26540d6 100644
--- a/sources/admin/picture_coi.php
+++ b/sources/admin/picture_coi.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/picture_modify.php b/sources/admin/picture_modify.php
index bf0e458..ab62c56 100644
--- a/sources/admin/picture_modify.php
+++ b/sources/admin/picture_modify.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -306,6 +306,25 @@ SELECT
   $intro_vars['stats'].= ', '.sprintf(l10n('Rated %d times, score : %.2f'), $row['nb_rates'], $row['rating_score']);
 }
 
+$query = '
+SELECT *
+  FROM '.IMAGE_FORMAT_TABLE.'
+  WHERE image_id = '.$row['id'].'
+;';
+$formats = query2array($query);
+
+if (!empty($formats))
+{
+  $format_strings = array();
+  
+  foreach ($formats as $format)
+  {
+    $format_strings[] = sprintf('%s (%.2fMB)', $format['ext'], $format['filesize']/1024);
+  }
+
+  $intro_vars['formats'] = l10n('Formats: %s', implode(', ', $format_strings));
+}
+
 $template->assign('INTRO', $intro_vars);
 
 
diff --git a/sources/admin/plugin.php b/sources/admin/plugin.php
index 2acc2b7..68e0c50 100644
--- a/sources/admin/plugin.php
+++ b/sources/admin/plugin.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -65,4 +65,4 @@ else
 {
   die('Missing file '.$filename);
 }
-?>
+?>
\ No newline at end of file
diff --git a/sources/admin/plugins.php b/sources/admin/plugins.php
index efe3bd8..9377aff 100644
--- a/sources/admin/plugins.php
+++ b/sources/admin/plugins.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/plugins_installed.php b/sources/admin/plugins_installed.php
index a804e21..b87921c 100644
--- a/sources/admin/plugins_installed.php
+++ b/sources/admin/plugins_installed.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/plugins_new.php b/sources/admin/plugins_new.php
index a8df935..2ef02f1 100644
--- a/sources/admin/plugins_new.php
+++ b/sources/admin/plugins_new.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/popuphelp.php b/sources/admin/popuphelp.php
index 7d0a0cf..51820fe 100644
--- a/sources/admin/popuphelp.php
+++ b/sources/admin/popuphelp.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/profile.php b/sources/admin/profile.php
index 5554fe1..71a9299 100644
--- a/sources/admin/profile.php
+++ b/sources/admin/profile.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/rating.php b/sources/admin/rating.php
index 1592125..3525cbd 100644
--- a/sources/admin/rating.php
+++ b/sources/admin/rating.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/rating_user.php b/sources/admin/rating_user.php
index e6eea9e..e778993 100644
--- a/sources/admin/rating_user.php
+++ b/sources/admin/rating_user.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/site_manager.php b/sources/admin/site_manager.php
index 21fdebd..0712da3 100644
--- a/sources/admin/site_manager.php
+++ b/sources/admin/site_manager.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/site_reader_local.php b/sources/admin/site_reader_local.php
index 7e618ca..661825f 100644
--- a/sources/admin/site_reader_local.php
+++ b/sources/admin/site_reader_local.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -27,7 +27,7 @@ class LocalSiteReader
 
 var $site_url;
 
-function LocalSiteReader($url)
+function __construct($url)
 {
   $this->site_url = $url;
   global $conf;
@@ -100,14 +100,19 @@ function get_elements($path)
           {
             $representative_ext = $this->get_representative_ext($path, $filename_wo_ext);
           }
-          $fs[ $path.'/'.$node ] = array(
-            'representative_ext' => $representative_ext,
-            );
+
+          $fs[ $path.'/'.$node ] = array('representative_ext' => $representative_ext);
+
+          if ($conf['enable_formats'])
+          {
+            $fs[ $path.'/'.$node ]['formats'] = $this->get_formats($path, $filename_wo_ext);
+          }
         }
       }
       else if (is_dir($path.'/'.$node)
                and $node != 'pwg_high'
                and $node != 'pwg_representative'
+               and $node != 'pwg_format'
                and $node != 'thumbnail' )
       {
         $subdirs[] = $node;
@@ -182,6 +187,26 @@ function get_representative_ext($path, $filename_wo_ext)
   return null;
 }
 
+function get_formats($path, $filename_wo_ext)
+{
+  global $conf;
+
+  $formats = array();
+  
+  $base_test = $path.'/pwg_format/'.$filename_wo_ext.'.';
+  
+  foreach ($conf['format_ext'] as $ext)
+  {
+    $test = $base_test.$ext;
+    
+    if (is_file($test))
+    {
+      $formats[$ext] = floor(filesize($test) / 1024);
+    }
+  }
+  
+  return $formats;
+}
 
 }
 ?>
\ No newline at end of file
diff --git a/sources/admin/site_update.php b/sources/admin/site_update.php
index 5bcaea1..ad3ccba 100644
--- a/sources/admin/site_update.php
+++ b/sources/admin/site_update.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -457,6 +457,7 @@ if (isset($_POST['submit']) and $_POST['sync'] == 'files'
   $start= $start_files;
 
   $fs = $site_reader->get_elements($basedir);
+
   $template->append('footer_elements', '<!-- get_elements: '
     . get_elapsed_time($start, get_moment())
     . ' -->' );
@@ -486,6 +487,8 @@ SELECT id, path
 
   $inserts = array();
   $insert_links = array();
+  $insert_formats = array();
+  $formats_to_delete = array();
 
   foreach (array_diff(array_keys($fs), $db_elements) as $path)
   {
@@ -535,20 +538,119 @@ SELECT id, path
       'info' => l10n('added')
       );
 
+    if ($conf['enable_formats'])
+    {
+      foreach ($fs[$path]['formats'] as $ext => $filesize)
+      {
+        $insert_formats[] = array(
+          'image_id' => $insert['id'],
+          'ext' => $ext,
+          'filesize' => $filesize,
+          );
+
+        $infos[] = array(
+          'path' => $insert['path'],
+          'info' => l10n('format %s added', $ext)
+          );
+      }
+    }
+
     $caddiables[] = $insert['id'];
   }
 
-  if (count($inserts) > 0)
+  // search new/removed formats on photos already registered in database
+  if ($conf['enable_formats'])
   {
-    if (!$simulate)
+    $db_elements_flip = array_flip($db_elements);
+
+    $existing_ids = array();
+  
+    foreach (array_intersect_key($fs, $db_elements_flip) as $path => $existing)
+    {
+      $existing_ids[] = $db_elements_flip[$path];
+    }
+
+    $logger->debug('existing_ids', 'sync', $existing_ids);
+
+    if (count($existing_ids) > 0)
+    {
+      $db_formats = array();
+    
+      // find formats for existing photos (already in database)
+      $query = '
+SELECT *
+  FROM '.IMAGE_FORMAT_TABLE.'
+  WHERE image_id IN ('.implode(',', $existing_ids).')
+;';
+      $result = pwg_query($query);
+      while ($row = pwg_db_fetch_assoc($result))
+      {
+        if (!isset($db_formats[$row['image_id']]))
+        {
+          $db_formats[$row['image_id']] = array();
+        }
+        
+        $db_formats[$row['image_id']][$row['ext']] = $row['format_id'];
+      }
+
+      // first we search the formats that were removed
+      foreach ($db_formats as $image_id => $formats)
+      {
+        $image_formats_to_delete = array_diff_key($formats, $fs[ $db_elements[$image_id] ]['formats']);
+        $logger->debug('image_formats_to_delete', 'sync', $image_formats_to_delete);
+        foreach ($image_formats_to_delete as $ext => $format_id)
+        {
+          $formats_to_delete[] = $format_id;
+          
+          $infos[] = array(
+            'path' => $db_elements[$image_id],
+            'info' => l10n('format %s removed', $ext)
+            );
+        }
+      }
+
+      // then we search for new formats on existing photos
+      foreach ($existing_ids as $image_id)
+      {
+        $path = $db_elements[$image_id];
+        
+        $formats = array();
+        if (isset($db_formats[$image_id]))
+        {
+          $formats = $db_formats[$image_id];
+        }
+        
+        $image_formats_to_insert = array_diff_key($fs[$path]['formats'], $formats);
+        $logger->debug('image_formats_to_insert', 'sync', $image_formats_to_insert);
+        foreach ($image_formats_to_insert as $ext => $filesize)
+        {
+          $insert_formats[] = array(
+            'image_id' => $image_id,
+            'ext' => $ext,
+            'filesize' => $filesize,
+            );
+
+          $infos[] = array(
+            'path' => $db_elements[$image_id],
+            'info' => l10n('format %s added', $ext)
+            );
+        }
+      }
+    }
+  }
+
+  
+  if (!$simulate)
+  {
+    // inserts all new elements
+    if (count($inserts) > 0)
     {
-      // inserts all new elements
       mass_inserts(
         IMAGES_TABLE,
         array_keys($inserts[0]),
         $inserts
         );
-
+      
       // inserts all links between new elements and their storage category
       mass_inserts(
         IMAGE_CATEGORY_TABLE,
@@ -562,9 +664,30 @@ SELECT id, path
         fill_caddie($caddiables);
       }
     }
-    $counts['new_elements'] = count($inserts);
+      
+    // inserts all formats
+    if (count($insert_formats) > 0)
+    {
+      mass_inserts(
+        IMAGE_FORMAT_TABLE,
+        array_keys($insert_formats[0]),
+        $insert_formats
+        );
+    }
+
+    if (count($formats_to_delete) > 0)
+    {
+      $query = '
+DELETE
+  FROM '.IMAGE_FORMAT_TABLE.'
+  WHERE format_id IN ('.implode(',', $formats_to_delete).')
+;';
+      pwg_query($query);
+    }
   }
 
+  $counts['new_elements'] = count($inserts);
+
   // delete elements that are in database but not in the filesystem
   $to_delete_elements = array();
   foreach (array_diff($db_elements, array_keys($fs)) as $path)
diff --git a/sources/admin/stats.php b/sources/admin/stats.php
index e103c2e..5398d0b 100644
--- a/sources/admin/stats.php
+++ b/sources/admin/stats.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/tags.php b/sources/admin/tags.php
index c643391..ce503ba 100644
--- a/sources/admin/tags.php
+++ b/sources/admin/tags.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/theme.php b/sources/admin/theme.php
index 984ac45..eef3fb1 100644
--- a/sources/admin/theme.php
+++ b/sources/admin/theme.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/themes.php b/sources/admin/themes.php
index 5359974..a903ddb 100644
--- a/sources/admin/themes.php
+++ b/sources/admin/themes.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/themes/clear/icon/index.php b/sources/admin/themes/clear/icon/index.php
index e336595..6a7aa65 100644
--- a/sources/admin/themes/clear/icon/index.php
+++ b/sources/admin/themes/clear/icon/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/themes/clear/index.php b/sources/admin/themes/clear/index.php
index d959f2c..f08fc44 100644
--- a/sources/admin/themes/clear/index.php
+++ b/sources/admin/themes/clear/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/themes/default/fontello/README.txt b/sources/admin/themes/default/fontello/README.txt
index 43e23f2..a91438a 100644
--- a/sources/admin/themes/default/fontello/README.txt
+++ b/sources/admin/themes/default/fontello/README.txt
@@ -11,7 +11,7 @@ webfont pack. Details available in LICENSE.txt file.
 - If your project is open-source, usually, it will be ok to make LICENSE.txt
   file publically available in your repository.
 
-- Fonts, used in Fontello, don't require to make clickable links on your site.
+- Fonts, used in Fontello, don't require a clickable link on your site.
   But any kind of additional authors crediting is welcome.
 ================================================================================
 
@@ -29,8 +29,8 @@ Comments on archive content
 
 - LICENSE.txt - license info about source fonts, used to build your one.
 
-- config.json - keeps your settings. You can import it back to fontello anytime,
-  to continue your work
+- config.json - keeps your settings. You can import it back into fontello
+  anytime, to continue your work
 
 
 Why so many CSS files ?
@@ -38,17 +38,17 @@ Why so many CSS files ?
 
 Because we like to fit all your needs :)
 
-- basic file, <your_font_name>.css - is usually enougth, in contains @font-face
-  and character codes definition
+- basic file, <your_font_name>.css - is usually enough, it contains @font-face
+  and character code definitions
 
 - *-ie7.css - if you need IE7 support, but still don't wish to put char codes
   directly into html
 
 - *-codes.css and *-ie7-codes.css - if you like to use your own @font-face
-  rules, but still wish to benefit of css generation. That can be very
-  convenient for automated assets build systems. When you need to update font -
-  no needs to manually edit files, just override old version with archive
-  content. See fontello source codes for example.
+  rules, but still wish to benefit from css generation. That can be very
+  convenient for automated asset build systems. When you need to update font -
+  no need to manually edit files, just override old version with archive
+  content. See fontello source code for examples.
 
 - *-embedded.css - basic css file, but with embedded WOFF font, to avoid
   CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain.
@@ -63,11 +63,11 @@ Because we like to fit all your needs :)
 Attention for server setup
 --------------------------
 
-You MUST setup server to reply with proper `mime-types` for font files. In other
-case, some browsers will fail to show fonts.
+You MUST setup server to reply with proper `mime-types` for font files -
+otherwise some browsers will fail to show fonts.
 
 Usually, `apache` already has necessary settings, but `nginx` and other
-webservers should be tuned. Here is list of mime types for our file extentions:
+webservers should be tuned. Here is list of mime types for our file extensions:
 
 - `application/vnd.ms-fontobject` - eot
 - `application/x-font-woff` - woff
diff --git a/sources/admin/themes/default/fontello/config.json b/sources/admin/themes/default/fontello/config.json
index 16b7c60..20c3fe7 100644
--- a/sources/admin/themes/default/fontello/config.json
+++ b/sources/admin/themes/default/fontello/config.json
@@ -384,6 +384,12 @@
       "code": 59407,
       "src": "iconic"
     },
+    {
+      "uid": "862129f833b09f3d34ae39acf8484a7b",
+      "css": "heart-broken",
+      "code": 59429,
+      "src": "mfglabs"
+    },
     {
       "uid": "05ef9b5e8742971aa85b23cfcbe71594",
       "css": "users",
diff --git a/sources/admin/themes/default/fontello/css/fontello-codes.css b/sources/admin/themes/default/fontello/css/fontello-codes.css
index b569e79..d31cf34 100644
--- a/sources/admin/themes/default/fontello/css/fontello-codes.css
+++ b/sources/admin/themes/default/fontello/css/fontello-codes.css
@@ -52,6 +52,7 @@
 .icon-cancel:before { content: '\e822'; } /* '' */
 .icon-plus:before { content: '\e823'; } /* '' */
 .icon-ok-circled:before { content: '\e824'; } /* '' */
+.icon-heart-broken:before { content: '\e825'; } /* '' */
 .icon-zoom-in:before { content: '\e827'; } /* '' */
 .icon-zoom-out:before { content: '\e828'; } /* '' */
 .icon-tasks:before { content: '\f0ae'; } /* '' */
diff --git a/sources/admin/themes/default/fontello/css/fontello-embedded.css b/sources/admin/themes/default/fontello/css/fontello-embedded.css
index c30c9f7..e17d676 100644
--- a/sources/admin/themes/default/fontello/css/fontello-embedded.css
+++ b/sources/admin/themes/default/fontello/css/fontello-embedded.css
@@ -2,16 +2,16 @@
 
  @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?76878460');
-  src: url('../font/fontello.eot?76878460#iefix') format('embedded-opentype'),
-       url('../font/fontello.svg?76878460#fontello') format('svg');
+  src: url('../font/fontello.eot?37675340');
+  src: url('../font/fontello.eot?37675340#iefix') format('embedded-opentype'),
+       url('../font/fontello.svg?37675340#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'fontello';
-  src: url('data:application/octet-stream;base64,d09GRgABAAAAAC9EAA4AAAAASawAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAEQAAABWfC1hKmNtYXAAAAGIAAABRwAAA1ads+uKY3Z0IAAAAtAAAAAKAAAACgAAAABmcGdtAAAC3AAABZQAAAtwiJCQWWdhc3AAAAhwAAAACAAAAAgAAAAQZ2x5ZgAACHgAACG5AAAxnDpVppxoZWFkAAAqNAAAADYAAAA2BEQWa2hoZWEAACpsAAAAHgAAACQIYARFaG10eAAAKowAAABmAAABDPAzAABsb2NhAAAq9AAAAIgAAACIuQfFQm1heHAAACt8AAAAIAAAACAA+gx1bmFtZQAAK5wAAAF3AAACzcydGhxwb3N0AAAtFAAAAcYAAAKSmuQ80nByZXAAAC7cAAAAZQAAAHvdawOFeJxjYGSexjiBgZWBg6mKaQ8DA0MPhGZ8wGDIyMTAwMTAysyAFQSkuaYwOKix/v/PHPQ/iyGKOYJhGlCYESQHAPboDCp4nN3Su0oDQRQG4H/IRROTDAjBacQUm50ELMX7ensDwSJgayVWvoS+QIo8gySkSu0jWGa7BYUZtMgGL1hE4pk5aVII2jrwzT+HPbM7sAMgCyBDAgi48USV8HUGRUA8U8c91euo0aoEhPmwE450QVd0O+maoimbmmmayAxsYBtpL+2nSWrH9enUvS7M/dgNq+e740l8GVeHk+Hn8HrtXE3Vl3pRj+pBtZRUZXkrb2RLnsrq7KS/HiL/t/5/OUpuElezanX+YZhz/9U1UHaYuxXhiLlbogsM1KsrDLRHtxkWgKTLsAiYIgPtMWXmbpSpMSxRNpk7nYkYXO+Agb5hKWxAk6TUpEHrDSDtMWxS9hm2KBOGbUrLsAOM6wy7EK9ZD9iDeLvwgH2Id3hARLnsAQeUKx5wSKk94IjyzAOOIT7uPODkGz4IhX8AAAAAAAAAAAAAAAAAeJytVmlzE0cQndVhyzY+gg8SNoFZxnKMdlaYywgQxuxKFuAc8pXsQo5dS3bui0/8Bv2aXpFUkW/8tLweHdhgJ1VUKEr9pvftTPfrnl6T0JLEXliPpNx8Kaa2Nmlk50lIN2xajuJD2dkLKVNM/i6Igmi11L7tOCQiEoGqdYUlgtj3yNIk40OPMlq2Jb1qUm7pSXfZGg/qrfr209BRjt0JJTWboUPrkS2pwqgSRTLtkZI2LcPVX0la4ecrzHzVDCWC6CSSxpthDI/kZ+OMVhmtxnYcRZFNlhtFikQzPIgij7JaYp9cMUFA+aAZUl75NKJ8hB+RFXuU0wpxyXaa3/clP+kdzr8k4nqLsiUH/kB2ZAd7pyv5ItLaCuOmnWxHoYrwdH0nxCObk+qf7FFe02jgdkWmJ80IlspXkFj5CWX2D8lq4XzKlzwa1ZKDnAhaL3NiX/IOtB5HTIlrJsiC7o5OiKDul5yh2GP6uPjjvV0sFyEEyDiW9Y5KuBBGKWGzmiRtBDmIkrJFldR6R0yc8jot4i1hv07t6EtntEmoOzGerYeOrZyo5Hg0qdNMpk7tpObRlAZRSjoTPObXAZQf0SSvtrGaxMqjaWwzYySRUKCFc2kqiGUnljQF0Tya0Zu7YZpr16JFmjxQzz16T29uhZs7PaftwD9r/Gd1KqaDvTCdng7ISnyadrlJ0bp+eoZ/JvFD1gIqkS02w5TFQ7Z+B+XlY0uOwmsDbPee8yvoffZEyKSB+BvwHi/VKQVMhZhVUAvdtNa1LMvUalaLVGTquyFNK1/WaQJNOQ59Y1/GOP6vmRlLTAnf78Tp2RGXnrn2Jcg0h9xmXY/mdWqxXYDObM/pNMv2fZ3m2H6g0zzb8zodYWvrdJTthzotsP1Ip2NsL2hBk+47BHIRgVzABhKBsHUQCNtLCIStQiBsFxEI2yICYbuEQNh+jEDYLiMQtpe1rJp+KmkcOxPLAEWIA6M57shlbipXU8mlEq6LRqc25Clyq6SieFb9KwP94pE3rIG1QLpE1vyKSa58VJXjj65oedPEuQKOVX97c1yfEw9lv1j4U/C/2pqqpFeseWRyFXkj0JPjRNcmFY+u6fK5qkfX/4uKDmuBfgOlEAtFWZYNvpmQ8FGn01ANXOUQMxszD9f1umXNz+H8mxghC+h+/DcUGgvcg05ZSVntYK/V149lubcH5bAnWJJivszrW+GLjMxK+0VmKXs+8nnAFTAqlWGrDVyt4M17EvOQ6U3yTBC3FWWDpI3HmSCxgWMeMG++kyAkTF21gdopnLCBvGDMKdjvhENUb5TlcHuhfR6NlH9rV+zIGRVNEPht9kbY67NQ8lusgYQnv9TXQFUhTcW4qYBLI+WGavBhXK3bRjJOoK+o2A3LsooPH0fcd0qOZSD5SBGrR0c/rb1CndS5/coobt87/QiCQWli/va+meKglHe1kmVWbQNTtxqVU9eaw8WrDt3No+57x9knctY03XRP3PS+plW3g4O5WRDt2xyUpUwuqOvDDhuoy82l0OplXJLedg8wLDCg36EVG/9X93H4PFeqCqPjSL2dqB+jz2IM8g84f0f1BejnMUy5hpTne5cTn27cw9kyXcVdrJ/i38CsteZm6RpwQ9MNmIesWh26yg18pwY6PdLcjvQQ8LHuCvEAYBPAYvCJ7lrG8ymA8XzGHB/gc+YwaDKHwRZzGGwzZw1ghzkMdpnDYI85DL5gzjrAl8xhEDKHQcQcBk+YEwA8ZQ6Dr5jD4GvmMPiGOfcBvmUOg5g5DBLmMNjXdGsoc4sXdBeobVAV6MD0Exb3sDjUVBmyv+OFYX9vELN/MIipP2q6PaT+xAtD/dkgpv5iEFN/1XRnSP2NF4b6u0FM/cMgpj7TL8ZymcFfRr5LhQPKLjaf8/fE+wfCGkC2AAEAAf//AA94nI16DXQc1ZVmvVfVVdXVperq7uqqVqu71L/V7Xar1e5f0ZbbQmpkRZaFEEIYYYTXEUaRNcYxisZLbI9jc8CwjOXxMB7icACzhvESYMGGkGRYkyVkzh6HM8chE5IdMnvYJJsx+SHZbE7WYa3y3lfVsmUDZyJ1v6r33q3qV+/d+93v3lcUoqhLZ+njdA8VodjTigN1rPSUqslqpdCOHKpfcSMflBLqRBwbM8qlqi9ltKPAXldE3IMCEfd380j0i//voxa/iPLfldAHfkfa1DQz7fCL7u+YHzC8S0bc/fdzXoHhkfYdN0VReNlvZij+1RVxrwN/4u/GY1f/LlfVUlVoumYEmnBlBF/86orvf3/FV38587lPGEto+UjUZ355zz2/fCb+gx80x/QyPUEL1J3UNIxp65Z+jYypXKqsRZWqkTJK1ToqwugqVfhfjQpqO1I1GK+maioMF6o64vwK60YsR5o4CaVg+CwH/ysRPEPKSMGzpJq3qhqdKIeSilqo5FCMFRzTvKQlWYd7pIXjNwSCTp727OZE5A6pIw43N6AwzGrJuZUTEM9NCy5f2hblNrQGnRwj7+ZFuU27kZXZfpVx8GnBzW/leBQemx/DI/eNoCi5l9wajHRwIqeMOLpb+KGQm+fvdordDkdfyCGxG0JtbiRylqDuD61iZcY/gmxJWeDudrpWO9i17SApFtyWbGP1GNx/DKaPYmH+djKd9Ges+TtBvU99QP2O8vRIv/3Vv/70H1/6q7mtW9Zp7J84oWT5YRLJjIbRVTMa/8QZLV+Z0CqZ0JIRYxE0ws+US/BrxQLcWIPfte5N7gW3hbuQCmvdMpaSEGffCUbmueZaGNOnXmykrIsvX+uzV1RCvqWl5R3jnMvXzjBiQ2DZHl+A5eiWaVZALT6119HiuIkJePgW9hYHD5KsSCRbel2so8evshxDJFt8Wi/Two4wjgTfwoHgu2Ta58fQCzdzQpguyYjJ8B5PSGNwHw45uZtvZoUQbiCHP+wSXVyWRg06LEDzFWlRED8unuEtccaWXsjUsijblUVLx5V3w6Aln9aWZEWH3MsUBL472MKzt7CuVQyz3u1w6P6WNp+IeW6ZJOMBSRfb3WZJigVbks+KAbUF8TVbhcx9w06n3LJWwlh3lkSE0hpKYSytbZGdzmEn75ZIV7otiZCrhNKkR3Lz+AbounIVCFy+ioernPZVKXI/sZSyL3Iu/j6cgSfCaRzWM5nVmQxFX7oEtn8ef5tyUyuoz1DCa/3FgFek6Y6VZU+pUowWVL9HYblozAD1gmql6iFKKGGihZ0IVj1VVgAHdKZaLNRp0J06WgOQabCpaIwtJelKslRKXjybqAyILF0BG/b6/+a2UKK7DQfrntzGo37v6OwcE/FGAiJ2BXVFd8zN6iVM0wx78SwnuPCd5AaLx5MlVEnwgsCj5xXPzsFAKBiUjMGdHuX05PVjm+iQpIhIUEUdbxoLjEYkyeHAtEgxFrZtwJfgzEW1UnGqpUeIh5QWgcMU07HSX0Ywb0V/sZriqkqxUEWVcike4xCLLDwm8IbOnTfzxwe6CweKd7Y4GNRJiw7G/B6Dhu9QVqsHFOWOGz8gMp0L64oHijeLDMoxsPbmOwz6xia//4Ba899BXcbZTbSLEqk84GzK76Qt7K+jgo4kHLNMuFr0K6pWhIkuQ7EGlQwuXi4ZqXiM5fxQaHNvfvitXezs2z/5x+kXFPeCKq1zK2hBUlXpyjlCk194a27urV+Q4iaoL0A7CCjugeUVimIuLV56k/4BjagOqkpdT60n8/OZxtpaOb8Cw/z4jApgEUsWGFULVbVShWMdATikyiqcaGCnEg1gEDVStqzKwlmd+ASleaYBeBkpxBglZxnwTOcK6c622JbWto1hUaYdGAXjq3YZUSa6ZjzfyPo7zKfH/L1spcb7mUxB3IW7exi+q4YeY3priHXUCgx+PRlR274ejusvlrpRMsWkkny7HPFHxZAhxDp6WwP9SuvO7bvbvewOdKwjHUh8b0VWMlD7Cj0SvbA6llmBqJUBI2p2GulOiqJhXf4INrCHkqkYVQAb6EwGfKKDtvxyJYsYAsAsE0mkDHj8CEFwQEDbN7MawTpA9iLBXi7GuoYRjwzED7tcw+YF85/NC8OudevfR8z762/ZFzty7khs34uyKjfyLll29U+hmk/Zdww/sVcxfF86duxLPt/Ogwd33n99rW/6yJHpvtr13UQu34BL0JQ91v/CJECHfFTIGmsqHNQkhrbdS5VANigtR2Ddcgk6qiNDQskrHQS3UaVEujPhD8IDfrSgKOaH6mrF/Lxf35bpTuNsVw5F9lhdfj90hZWgjFg4/bx/AL13PpxBOjlfDX1+IjNwTLcuYmN/daVD9sAlq0m3buv+SxbOJABl+Fev75SX6b5C+EKK4AoMrmyUKuW1uJKq1nE1h5BKbKGOUqUUCLKcjkDH2mmLYxD0geeZeeXdV2ZmXtmWL/Tf4m/DrIgwYmgagWeXmBuG0a0Rz8SJ3huGUMvA2EjDIfJtTsbB0AgLfJv/lv5C/m/RM8P3Dw3d//j+YeQsqA5GYDHDIJrFGOmOgFdOz5n/ky50lh4YXJlJ7XpwPiWpQtRFOwDqMS8gxqGtclo84GXaC2sTpzqptdQ66lbqbsIDPnv7zesbPauLuVTQ2eQBq4kVkdVqBx5AvCp4dcDZOOBsygOT4IOFA7Sto7In6vOULI5AgJigrq8Ijx1nuWvbq9fUBf75lDOrnlKzfOoFgpyVUtLMA46WeWGB5zE6h3neFNcJvIWrUFQ+amMcL7NM/UrTApScIHBwivuhuMMfQrpyh9W3+JtcozeHfcLi/xIVQVBE7DF70fXkSvMNKLF0vQMhx+I3lrXxy84pW59foo/jt4ANF6lu0OdaZVVHGFu2VwEY1Ol2tOSEHMQOoQJcKEqMD2aHJnNVqoAOscAol04A3JwSD6tH4yck1SstfoNFLRi5Vez1LH5HUkV1y0638oMlVf9D8wQ/6VYRK8qSU1Il8yctKmoEHZ6gGgJs5UMGRm8ri59retD25hGeAYEPPYufxf+buhHiiHoY4gigPoDkhWpF1fzNxQGMAGrGga9kU8QEQQk01QKNVIxjjaqlFIUK4VKVgsoB4KjVpmqkDDyYrFSSqj+oonz7AgzQ39jSQC0eQVmIZpFXDbQZlYrh9wcDKBdZ8IkeqX9zP/ILsnuhPa8oAXSksXkAt3hE7+H2nFdtDRqlkqGqcLtc+2FZEpTGVA8mt7s9mlPalADpDrb6FZSL3k66KQes00/oj/A/U9dZXuKz1FbK3SNundo8sq53zeo07YCHBl8AhNIgxirRqZxNQ4Egpkpg1JVitZQqgYcthIFZVgA2/aob+eERHWqV2L4C9p4ywMPFk6pXVWDSykTLrZOKj0wOXaTpH+sjkwKOYGa8npFzA1NdpZ7uQg9+RGQEzDKPYz7HCk+wPOYZ/iVxfLf5bCjGxILZk6FunU90Yx6bdWF8hBlnCy/lMTvOCM9ifrOw//AAKoy+3osNlun+epcxNJbj2f7aWE9BngpgFlcYzIS2M3DbaRV+KANffevA+6z4rhjK7lcDG/tZLz4VMj+8wDLPngDs8GKVN19HPPH7DgsXzgMuuKl2CxluJHO3vm91cWW8zecic+e3l7+JBLEldbhS/zds/eO2v42YGRTvXjn9ocDNEluG4t1PFFizdCLwpy8XqNcy2DOkxAFSLp4nJV0h5cWzliETfH+IeZkuUKuouwDfb7ourwK+l62AB5CuRLDajhKgVtDxUhTBsYTu6Bj4hV+LoqbEsn4Ja7aAH2hQDoNapcCUbOZpKOkbwv5kGrX7pA7JwTjqM9etHKvHaIaROtyeSNoI752SvQq6eAT/V9GBmcLGTeMlBjxEQnQ7AbhjuqfQ7zZZXhW17lVtDp52Si3JVZw76HL5BlNtSX/KW1vpTa2szoAbrY9mqm2+TM27wpdsSw363Lm019MNHvD7MTkS79jYhUubVsYjciwvRT0CQGKkW3YqAe5BF2fEMmKr4Y1lBUFmBXdMpgj3+ujSMfr/0EFqJXCvcWqScK/bNw6sra4K8oR7SUiJkxmybQr4KJk6clItaAXSQeJvYFQwJ+DbyQkyYL6TKgeQ4UbgQOFCCDBVIgui1k1UVNWsW34FANLjZmSx39WCIwyb0aFBMtQHSvcFRWVXZCQbY3hhSGIytQvomFfJq7K5hecHRFyQI4XpruxooxGQYC73iSIjxiTGqBlsGjPeiyfNoT8o3pyKPuJDqruFkbxDoogDDBvKs5IuT7CYLwW6ajkMNsYz+UDBTKhyRvKiH/Finf/WdH1jUMwOD/cHagNqVxfrZSF6LITSdbEGdrfYuDD+O0XOeZt8+nbL3/aDzhVTbYRTLJkSxM7gQwuXQ+wwIjG0FTYbvjKJv62QW+WaCA2qStBnKcJWpY8kFTs3pKeqg/tTrOYQwS4SP/vyTY91D7hCqpD4+ZdvOkZOA1iRbdHRHettyXs4kYMmNeTakEwP1oWuFpFljn6zft2AS0VvL51JTZENtgSFwY98m/4Avwxxyip4nkzMzxAbIqE4GX7UHisXJQUBWkIkilHiL+xABR5sDQLP6DjtcAs0xUFAxC9SAs9ypxxgr5QgwYnVuQidB3kHad4GH4jKyJc95UBVeEr4QJcMkiK7zR7XH5lWmGcVYkT+1WRIIfNc9ixBVNQqYqwb8FuD0dYJdSEDsh31YPF0cRB1FgfNfHln/HWMUMbzemA8ie/06d6/D4wbi8d9oXkcKA4OFr2DxYnSin+hOccmj/IvobQU95ESxnDx0l76R/Qg1QIYyr/arvAIxlCtWEjBVkkWBKkUObdYoaX31LwxOSomxg+NMWwpQM8GzRPzxjjPe/VITOZ70vPorediwshkYswrBhm2+zl8Mmg25oxeVorpEbDTMWMOjVsx5DfxPhpTWapM1YHXgZ32ra1Vip1BGewUKSQEgs/loMBjO3HAL3+FsFi76ljKz/jsg6KipRO8b5DNDtdymUwpwPT3T/UPDJAivaVWKlj1xVfSXZlMV7oRImUaPW8f8cMjem28FJAkOZJP6COF/v7CcAzdFxsiZ0Oxt3Xdq3bnIlY1lE7X0unFflLW0nijfbQ52AV6AjiY7Z+E17LELZGYAsLPSrWpdxDPGzRhLZ9SJzkCVaI9wKEU+eJvrBjzU2vhdVbLOtKAOkhQaoemULHaZKvfHts3GBV/k/JTSWo1jK3aGW31kLH5ShCsNzVfs9Uf8A9BxGmlI2mSuCWccC3ECZYJLQVGYDmtLHB2mQmx7HvvsSzJAJoXWTR3jha5OMfT57DExngW9Tvee8/hCLESEXeAiASyqMY7EEOukpkfv2c1kbr5n/A5uARIL7vYCfdw0uJejn3vx3Bv+BnzItgTFHAzC7ceBz4QodJUieBWR4DYU5IYUZl4SxLug5sj2ULQZNAcN1L9RMUQ+Mpk0R8HVxgvF8tFPPvKxfcTucn+HE84CcPwDLvpZ5sAcLEkSVjIDaDG0aNT8NnXU5s5K4mx/m61lBeDeVkBZ2hU5uYqG/lYSGdEMVdRu/s/JLJHLU5rArbeBja/CjhtB2PlxuvYxszLrMRCTAnrtB2iWfNOkok53Jh7/LbRx9YMyB0AjprPA9hYmxnKM+mxLfXe+RWMhx1yYLb7xTtvfWrHAJq89Ym5BmCi1xcATOyQN2zIDc3MzQzlamUWOTYwEjs4ghpzT1j6AMV5/DXAojxYovDa9eWOqCLYukrmq2S5R1azUqf+eEwD/MQQCTcNEvQlDB1RCCwrKSJJGu28ZtyiFd6v9uJ4stweWTUgtuzMMztb31Afuy6ZQ5v2TQyvORLA8cWfSgr6741ce3zVivj1J71t84Xt7pkHguxIalNX5wrs27PDxVe1NQutJ9uE/pA2XhyanR2aKen9QtvJJIMD6LaZPT68ckV9dNWIoD4QwQvXtZV5mPOLl96mD+LfUUGY8wCPLEpN4kIJQRkncWGZFETvNXqXLKhjWJLffvvNkDSmCjI6LGdlNCKr5llJElHFPKsoqKLK6IgsU81Y60l6gdYpBTSPxFrX5ZJBmeQ5kqBTiuU+QK8A16tg0h7kj3ssQPMQZYNoC8zc0WxLeSxBaPN7cE81lo11dcX8gRhCD1Qj+UhXVySXwItfrkY6Iwgq+chvdvydFotpf7cD/d+AjiKa6UQ37jAF0ob+sONkQMcx9eSOe8x/b7U8eA8KWE3meYtbwuAX8AuAxE6wFyeHKbAXlCxH/SjpiXrQ98219B6zgV6/eABtf+fP/sw8/Y65Hn2tmXN7k47hX1AemFX+1YAiMpatgXZ0WrkQuRIhKpBcAmea0QO5ROTM4Oi+M68g6ls5M3Dwpb3wGY6FcpHImcwZRH3tzL6Ng89tPLj31AN7wVbgN2bAnkepBqxb0WPZStNnF8vwE1aFABUspr94jb+OkxDIqoDyEY9atpYCKq4FQVd+CKjoWnCF4KtKAz9UdNchF3yWOgRdWNaBJt3CnyK3rMMFc3TpwqWv0b+ieYoFJsW/qrbQ1vw64kTnwKaXHHknoZdFjmxcRAmnShXR7xFz4syz+EdeLxtiEurFc2qCCQmZJ7Y8d4pn0iib5plTz22h+d9fgmkyTwlZ7zElGFSO5QOz+/nt2/n9lDV/lk2foMJE7wnWAK0gk1UupjiAO5jBSrGgGVaWTdUq+MLUI49MnZl56cXpC4OzM0MSix/fPvFIIIQ+PPjWwTM///mZ6SPTWAzOPjY9ypDn++jSDjpIjwOv6iC8KhwQsR2usik3JkBBHq1qgS1hy5UcIIRkwRl8MVBumlU2b+3tme+fliJDooJlXkE4IHkP7Zw5Nat7x6Z0nqcdWOX6ZCkgKTKemvsHryi8KT4bYiRGlrboQbS/0D/ztKLsfz07U1eyouqUOcWxSuRlLFEUBIqXjtCP0RnwwW1UCuKBXmqYuoP6HOXv8d41ecuNG26od+fTRjSgAHsG5xfjDIAvVYPwSWM5g7NKoB7Qgqw+mDBo8RkkWiKSEHlDn0boMMuRZATE3MZSB7JjLcKcKmtQhVa15hZPqvK+quSzlcFN3SxTr8jblW6lt2DkeDQSUmtdY8O7tg+NB2ee2s9IRndQlwKTaXnekGuF3C4WHz2zc6IhNoDzq4fQ5qNMT2+gJz8lTAWJfxqfrVW2owtCaWgwa2RlmZXzXcyWWHDn/Mz+7ZvrhQDKS5mQXpcSQbMU2KgIgVA2p/Cz90tHpRwjHRnPF4TE0OaXEoOH92NpC3rn4Ntq1st2MUfmFVXILP5K4L2xkZ6M+JSlXoCth+ljdBZm2gcsVnhNVySnAwH2oQrlBWTBlBZj/SxJyZRLNPgzklkEwyUhgQazCVqC/uEMklnzD+b95ocsEn+XyeFYxMi9os+WvPmAJGSCeX2+Sy6popgI0hlsXrAlBbQbeY/mg6FINlJbfLFUCiSMpzbXcsFY7LFpClac4Mdx+mawvhTEgiRD0Ae+bT11I3WzlUPcRt1D3UvFeyI7d2yfnZn+7MT42OjI8NDgQH+jt2d1IZfNpI1EO++G4Mci5WUrdWbBj32mEZDRmgnGatFiD9bX2nAgew3NHQbfsj7fx+XIdgSR8y/vy4QHSslEsvRuJRFPltC6cAZlQxc/DGfWHbf+FkQ2AdGFXVZOWX/vnrb+jgt8nGQRoCjbwjfi74YzlUQFlZKV5iETXiyHM5nw8cSpxPFtVlRz3Lrfxa9bTYtvfVrPEracwI8Bf2RPe5yI8EYbjpuYbKfKjYZ7CLznCbQdyiG324zA0fyFGw2p8pAsP4PukWUiYEbcQMbkq/RJhfUCXtp2rT4BzS9XDJIL5BRV8xGbi8fAyogLaO71cgR83Na2rt0KQ7tGy17XDWzoOARl6GRwZrQn3WC2y/KwKMu8qAqC38VKzCzDqqHctSq3qBsh3UjAF6OBWHZ4KJiZZphgKKAoAa8q8m6O9zh5pcYzoqzI3ljTX/6R3oa/DZq4FrCyK59YHuv5Sb5BQpaqeKxtKh0320jqvmptQUBxeROCOLiYMdl3ihcQQhjx/ClrI+8VFrN4qaVv8l0IhiEURp0ul/k9iK6BBR5DB/smBd7lZFs4Hq4wd8GFDOYZl9MhORk0+fi7ECIcJ4G3eQ7cGxSK+7hq+xPwZwdpL6wMrLlI/AmguoRzGBQ8TgNT1ekKPSPJ/OaDY/VaY35kYurrmyZ2D3Q1Jk7iaVYSHz6qB/ORdK/5FD4X603HGoMFAfjZHy99kb5Ab4RIhD0NCgQ8gk2kDGznVTQgv7CQWFMTJANqJLhyhdFUiE/pW//WnHl0QfoS7xFCPa0qL7HC59i770NdsyMd+T7zZ0++htYNl1bcLDv/Unrkb9D9Twhe1sNpge6QKMyb/2P28+H5yd/MH72vgFY//MJfmBdn1CU+N4PzwDvagM9tAR3cUDAiAcKFyY6KYr9BQJYAeFoph0gwB0voIHkjAP0KSbb6gNSDzpWrYASa0k6rhhpXJAxe0WDLbBjVcblU8MOtgEZ3Yus1A5zfvGXL5ud/9Dw5vPhPL5q6l+E37b5/o6Rvntl1mA+JreFNeOr3U8xEh8/jEXURCywvut04NsHPNUq997GbVnpbHCLH4O3Z6cnuTVtz87Hh4dh8buum7snp7HxkeDjCSjxbKghKxRz06gkpENqkFyqVQmRipc/vx3nB65UEtyzjGJqI9DJGPqbrsbzB9OqbVvgkXhHVJV1+CmKYHDAz/tWergzT1GWIaTXCa4iHMwATbW2OWgBnvfhgRQQWWn4CXABZmOxD5+K6k+baWA7TLaK1r1JJoHPJkiPBcjTjmuwz832TC9IaKSH9NfpcS0Kqt7SY18Hxt9IxdK53EkmMj4STdHNXppL4S94RZzEjvtw3OYmGfS1wAbmyhdzCrEnSb1uaz+Rr5pL5V4MQp195JiDtTYi3nwaa7acjw+3djOwxrbPH2fxZeyybryc9k32Xn6KUvGq/muSj4p6P7VeDyiC1sBbibygqED5VSWHE3KD/ULDQzbHLNqzfcRUE3XXXXWCvRUGAIxx0OLp0oeCCdtfyfWun22U3wiFMjuFr6k1b/w3+J/wAlQCbbCP4Xr0S8bdf2cTXljg2Z63fGvnECRvR4Wgh/okTbveVurxDczfPbEl3jkjk3Jcl7d++0NzvY08HSbzmWQJAApaW07VDZZIusfARioh6Xte2gfqdVyNwHlG3qRF0HupD1zTCKdK185Fr3x2IwVq0fnwtqtZaVNHVK7Bs8h8UzsJkE4wtuELiT/dCURCWT/iMGyRAQGgnqwECsFoWd7pk8RORClBR6gbAme5MpE2298frtI41EkFbL8qBPeUwKF8dIm5WKze5yFWTkYovn4z6zOGnD22v4Rve8Ge6lTemvjhyZLrn8JFzh5nH/tux9SK7x9p+RHvItsUewiBEco72jxye7cY9048Of3HqDX93GvnfuKE+/eiNdz+KD79ziD32BbhoDyEWewTOvoZwgz3CNc+yCp6lI/mnPksx2nyC6L89btRLRmye+RPHao9SsN8lu7Bsr6gIkcBqsodc66qUCvlsvE1x0aydmCOJN21ZIq56Tb3YrJPEnCNajvrIF/iaKtFPWdm3i5vttNyn1qZw9+Jb76Kt5rGFH/4wfMhKzB2yU3bNd0jslJ399glp+dU68ysD6PfrKCuH9EfQ2QBwCQXsw0X8pc8aFIc8zZfPjLIHGbQzgM9qPo/5a5XjIIAVzF978Qtqh2z+2tyiCTREr27Aah9JYuDL7yu1UhUSy4VUZOGfSl5RweQdJLI/Uqk2X1ryNacBasCzJAyKl0PgyFI51Np+dihiNNpwqDfdfudrkYD9mhLKraQrCYDBFe+UymIs4sKinnCV/3qzN97tQn8f8j9UDQRDKBjSGrvVNvMGgpj4z1fWSsnsSPhIPOX0wkIqfOquXkkbtTDC3vu7BeZghRfZ+xOaRcyj5eZGsG0glm1YydRi4fK+sbXQxXJ0eVuqfKVtKRUXUcsZcPhlgJCIesoqyygczqJmC4GVsvnTq/qhSpqh1noasGYbSG/TtdOkzapn9Kuqn1S5zEPApkiusAT6Cly4XCzEPfTSqw6X9zKjZL8FcNizHBjtp4w2c1tOBHrqIbZK9iHRew85ZMHxcNOWSZOp88S0ITYfMl9pRUPoEjTa+PCwwyWxD5lJS27pEvQTwXwOZL+Chqw9N9AfprNpXwZYWEuP0JFJRIJekWGuONJrXnpLLTlSX7mqIc1PGJWqsDkIT+g91gtuB+wX3GyguXgA7H7g1AQKf3Dxw/pEHT4u/KzlWxcnLr/Ihp+1NlMXtp2+DYXPf4S+l63j3rEG030Z74mfbwdux7+airVx1l5Q3aEVSEoCA/V2cEsUhbz3ICGDEb26UYs6jOzQ4GA+xsW60iFFYNFonxnoGz29+5X7mP3P39+rd/VWumJBHNAD8FGNUq3eHeobHsbl2/buPbUb77PX9Nugtz1UF8Sh98Cabh7u7S4FmnsCsJx1TKKVuqP6sYRWTMLWvm3T3gxbCUg6IpWjSQOqVMnrgh+7jgV66YBFa8skFNkTDImJRK7Sk164sm+10JaNBEVvqxxIeFdolV7DXuX/MBFbqfB6MKcSzXgyulKU9WA2sOzCvK4HUy25QDqYGAXl8EYSrfE19WBPPhuR0VX7XXIs0Rpbkyw0/J3BgAqB1EWiTKW7VshGEJisua801apnFAVfdRXGNBIEVTWWYih8ANZOszgaxFt8k6NZdr9k4UsQFYXAUEJaRPU8+vZR7LVsc/EDTT9lvcIMjLsXDG5266OPbp3VNfOMCv3okdnVY3hkjbVO36Qfoz9DRag11ASs02DvdUnF3h9ZSjty2pWJJknGaso6NglDKocJnhRIsmuJO7CoSezsBk4jnWTXMUcco7NztPOBzp2dq1blH+yc68yP5h7M3Ztr1rbJc+6cR6MFRteckkRrXve9wKNGZXRQvtfdIY+63XNyTlZpEeEIhEISo/rwxr7caK5zLncwv2oV3OOB3E2d+Xs7H7RrfSrcEu4oSU6YCEagNU9Ovld2j7rNf6e559zum+Qs3NOr0jLrhpEyAqN6mrg0b/F/EaJ/y9e3Km6evNuqlaoAIBpqzoPt45GV97aIop+89Gy/hmNtGpdFP9qtjlXNA/6autp/QIl4sRoKoMiR6Uh/q9P5H2dxZn3ULSCxbf+N00e4sIp2V8dU84CirFF6yXtHMZkJoH+9+wh4UNbLTe7pxq0diuBUjcHJR7faY13id60QrwivZWKa7KTpazmeDiFZjpaQdjWy2jC6jOz9+ejDJw+Cijxy4tDwkzYPIqZC4vBljO8LNz8MMoeePjSCxx5+CCTeIkIfcfa7WZfMS/+ZnqBbKNl6c1Z4Ld7m94mMPSZc0GkIqemqolm7QMgHQWUdp0qpxs6nXnxirhf373j6uRPbB/6igJ5Zv+nmR0YeGpqo7xgpoDzafOtTOxtE7OkdA0zPrmO33z6EnimMHDZfKhRGdtYnBv8//BM8YwAAAAABAAAAAQAAUr3Oyl8PPPUACwPoAAAAANA+BYIAAAAA0D3NQv/4/2oEsQNYAAAACAACAAAAAAAAeJxjYGRgYA76n8UQxbKRgeH/MyAJFEEBzgCGNwWtAAB4nGN+wcDAvACKIxkYWPSB9AsIG4wvQ/hwcUGIWqZlQPolVG4jkh6Y2kNANQ1YzATRLUh2ikLFYJgHiGdA8QKoGIzdAuEzGUD5glAzBZHYC5D0CSKZuwDqDqgYUxOqv0EYAORBJf8AAAAAAAAAOgCEASQCggLyAzgDggQEBFoEtgUoBcIGJAaWBzQHpghACOAJSAmUCdYKFAqECtILPAuOC9oMSAx4DNQM8g0kDYQNxA30DkYO9g9ED/IQHhCKEOwRGBFgEfASWhKQEuITIBNWE5QT+hRKFLAU2hUyFaQV+hZOFo4XLBdiF/AYRhiQGM4AAQAAAEMA8wAPAAAAAAACAAAAEABzAAAANAtwAAAAAHicdZDLasJAFIb/8dKLQlta6LazKkppvGA3giBYdNNupLgtMcYkEjMyGQVfo+/Qh+lL9Fn6m4ylKE2YzHe+OXPmZABc4xsC+fPEkbPAGaOcCzhFz3KR/tlyifxiuYwq3iyf0L9bruABgeUqbvDBCqJ0zmiBT8sCV+LScgEX4s5ykf7Rconcs1zGrXi1fELvWa5gIlLLVdyLr4FabXUUhEbWBnXZbrY6crqViipK3Fi6axMqncq+nKvE+HGsHE8t9zz2g3Xs6n24nye+TiOVyJbT3KuRn/jaNf5sVz3dBG1j5nKu1VIObYZcabXwPeOExqy6jcbf8zCAwgpbaES8qhAGEjXaOuc2mmihQ5oyQzIzz4qQwEVM42LNHWG2kjLuc8wZJbQ+M2KyA4/f5ZEfkwLuj1lFH60exhPS7owo85J9OezuMGtESrJMN7Oz395TbHham9Zw165LnXUlMTyoIXkfu7UFjUfvZLdiaLto8P3n/34A3V+ESwB4nG1R587bMAz0JfLIaLr33tNt0/F1z+9JFJkeMG25Gk2Tp6+dIP1VAjxCJHgij8Eo2Ns0+L8dBwFGGEMgRIQYCSaYYoY5TmCBkziF0ziDsziH87iAi7iEy7iCq7iG67iBm7iF27iDu7iH+3iAh3iEx3iCp3iGFM/xAi+xxCu8xhu8xRHe4T0+4CM+4TO+4Cu+4Tt+4CeOhXXSTAdIqencZqx0EfeeSnaikRVHHbWq4nnH3qaqMoopG0vLY9qQcLKwQpXShc5IW0YraWtyUee3W6aEZVt4WVBkq6KVHHpLxoZOa7YTaYxe94TrhP70BG1Bs1xzRibV/YfhynhbznLW63RlZKtK0VDrhdIZJQNNKrNspNZhYbTvRKkbmtAvL7nakomGsdNlZEmaoVH/psh3rGU234dUsfbZuKZN3JJba1MvqjbXh+3SZaIkU5tJM9L1vCTuDqWIdaG9EznLIrRd1R5NSu1NwdLaUJWk6tkO91ouVD858b/m/VMMSk51fUjHW62btGqTXezZQ9eraKO8Ykcm2S3THyO2laNGdkIZ3cVdpZw3JAYtYlv6PGcSrFUtuGrraG36o5WhGjLhasAg+AuKkLcEAAB4nGPw3sFwIihiIyNjX+QGxp0cDBwMyQUbGVidNjIwaEFoDhR6JwMDAycyi5nBZaMKY0dgxAaHjoiNzCkuG9VAvF0cDQyMLA4dySERICWRQLCRgUdrB+P/1g0svRuZGFwAB9MiuAAAAA==') format('woff'),
-       url('data:application/octet-stream;base64,AAEAAAAOAIAAAwBgT1MvMnwtYSoAAADsAAAAVmNtYXCds+uKAAABRAAAA1ZjdnQgAAAAAAAAPbQAAAAKZnBnbYiQkFkAAD3AAAALcGdhc3AAAAAQAAA9rAAAAAhnbHlmOlWmnAAABJwAADGcaGVhZAREFmsAADY4AAAANmhoZWEIYARFAAA2cAAAACRobXR48DMAAAAANpQAAAEMbG9jYbkHxUIAADegAAAAiG1heHAA+gx1AAA4KAAAACBuYW1lzJ0aHAAAOEgAAALNcG9zdJrkPNIAADsYAAACknByZXDdawOFAABJMAAAAHsAAQOWAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABAJgX//wNS/2oAWgNYAJYAAAABAAAAAAAAAAAABAAAAAMAAAAkAAEAAAAAAOQAAwABAAAAJAADAAoAAAHqAAQAwAAAACwAIAAEAAwAACYGJpkm7ycJJw4nleCt5wrnDecg5ynnPee26CToKPCu8LDw4PDo8SX//wAAAAAmBSaZJu8nCScOJ5XgrecK5w3nIOcp5z3ntugA6CfwrvCw8ODw6PEl//8AANn82WrZFdj82PjYch9bGP8Y/RjrGOMY0BhYGA8YDQ+ID4cPWA9RDxUAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAFsAAAAAAAAAB0AAAAAAAAAAAAAAAAAACYFAAAmBgAAAAEAACaZAAAmmQAAAAMAACbvAAAm7wAAAAQAACcJAAAnCQAAAAUAACcOAAAnDgAAAAYAACeVAAAnlQAAAAcAAOCtAADgrQAAAAgAAOcKAADnCgAAAAkAAOcNAADnDQAAAAoAAOcgAADnIAAAAAsAAOcpAADnKQAAAAwAAOc9AADnPQAAAA0AAOe2AADntgAAAA4AAOgAAADoJAAAAA8AAOgnAADoKAAAADQAAPCuAADwrgAAADYAAPCwAADwsAAAADcAAPDgAADw4AAAADgAAPDoAADw6AAAADkAAPElAADxJQAAADoAAfMEAAHzBAAAADsAAfRkAAH0ZAAAADwAAfUAAAH1AAAAAD0AAfUSAAH1EgAAAD4AAfUXAAH1FwAAAD8AAfUnAAH1JwAAAEAAAfVUAAH1VAAAAEEAAfarAAH2qwAAAEIAAAABAAD/ygOhA0AAIAAGsxQFAS0rETQ3JTc2Mh8BBRYVFA8BExYVFA4BLwEHBiImNTQ3EycmHwEYfgsgDH0BGCAPyzABDBUM+/oNFQwBMMsOAekVBSj+Fxf+KAUVDA/F/ukECAsQAQeEhAcSCgQIARfFDwAAAAIAAP/KA6EDQAAgACoACLUpIxIFAi0rETQ3JTc2Mh8BBRYVFA8BExYVFCMiLwEHBiImNTQ3EycmHwEHNxcnNy8BBx8BGH4LIAx9ARggD8swARcKDPv6DRUMATDLDnurKdPTKavramkB6RUFKP4XF/4oBRUMD8X+6QQIHAeEhAcSCgQIARfFDxal629v66Uj1dUAAAACAAD/sQNaAwoAXwBoAAi1ZmJGFwItKxE1NDY/ATY3JicmNDc+ATMyHwE2NzY3NjsBMhYfARYXNzYyFxYXFhQPARYfAR4BBxUUBg8BBgcWFxYUBw4BJyIvAQYHBgcGKwEiJjUnJicHBiInJicmNDc+ATcmLwEuASUUFjI2LgEiBgoFaAgOFyUGBQ9QDQcITRgaCQgDEXwHDAEPHBZQBQ8HSBQEBDsOCWYHCgEIB2gKCxMoBgUPUA0HB00ZGgkHBBB8CAwQGxdPBhAGRhYEBQgoCg8IZgcIAR1UdlQCUHpQASF8BwwBEBkaIC0HDAcUUAU8DQhMHA8ICGcJDDwFBUMcBQ4GTRwbDwEMB3wHDAEQHhUcMQYQBBVQAQU8DQhMHBAKB2cJCzsFBj8fBQ4GDDIPHBsPAQxEO1RUdlRUAAAAAAYAAP9yBC8DSQBfAGgApADgAOkA8gARQA7w7OfjzrCRdGZiRxcGLSsRNTQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFRQPAQYHFh8BHgEdARQGDwEGBxYXFhQHDgEjIi8BBgcGBwYrASImNScmJwcGIicmNTQ3PgE3Ji8BLgE3FBYyNjQmIgYBNTQ3NjcmNTQ/ATYzMhYXNxc2PwEyFxYVFAcWFxYdARQHBgcWFRQHBiMiLwEGIicOAQciJyY1NDcmJyYRNTQ3NjcmNTQ/ATYzMhYXNjIXNj8BMhcWFRQHFhcWHQEUBwYHFhUUBwYjIiYnBiInDgEiJyY1NDcmJyYTFBYyNi4BDgETFBYyNi4BIgYIBVYHCxMfBAQMRAoGBkATGAYHAw1oBgoBDRMWQgUNBVEEGBEIDQZVBQgIBVYGDBMfBAQNQgsGBUAVFgYHBA1oBgoNExdCBA0GUAQFJAgNB1UFCNZUdlRUdlQBrVMHCh0DNBABBCoIEREcFwQCQwIcCQdTUwYKHAJEAQUVHQsMCwcsAwFEAx0KB1NTBwodAzQQAQQqCAwKDBwXBAJDAhwJB1NTBgocAkQBBSoICwwLBywERAMdCgdTjyo6LAEsOCwBKjosASw4LAErZwYKAQ4TFxslBgwFEEIEMgoIPBoNCAZVBgsxBARLDwUFHhUNGxMMAggHZwYKAQ4TFxslBgwEEUIEMgsGPBsNCAZVBgwyBARLDwUFCCwMGBYNAQg6O1RUdlRU/oBOCQkQDT8OAgIeCTQMAQEoFwEnAgIOPw0QCQlOCQgPDj8OAgIoGyUBAQs0ASgCAg4/Dg8IAkVOCQgQDT8OAgIeCTQMAgIoFwEnAgIOPw0QCAlOCQkPDj8OAgInNAwBAQw0JwICDj8ODwn99B0qKjosAigCHR4qKjsqKgAD////sQPoAsMADwApAEkACrdGMxgSDAMDLSs1ETQ2MyEyFhURFAYHISImNxQWMyEyNjcRBgcGBw4CKwEiJi8BJicmJzUUFxYXHgQ3MzI+Azc2Nz4BPQEvASYGJyEiBjQlAzYlNDQl/MokNkgMBgM2BwoBEhWVWRwkPBsCGj4RLliWFRJSbHQEIBIgGAwCCxoeFB4FdGweNAIDAwQG/MoHCgsCXyU0NCX9oSU0ATYkCAoKCAGsFBFyShgcGhoOJkpyERSzXkFUXAMcDhQMAQoWDB4CXFQYUiAODgUFAgMMAAQAAP+xA00C/wAEAAsAGQAjAA1ACiMcFA0KBwIABC0rFTUBFwEnMxUzNycHNxQzMjcBNjU0IyIHAQYBNzYyHwEWFA8BAdDo/jChSDwygzNfDQUEAS8DDAUE/tEEAU5dFDsWgxQUXU/pAdDo/i+PRzODM1MMBAEuBAYMBP7SBAG5XBUVgxY6FV0AAAAAAgAA/7EDXAMLAAwAMAAItScVCQMCLSsRND4BMh4BDgIiLgE3FBY3MxUUFhczMjY3NTMyNj0BNCYHIzU0JicjIgYHFSMiBhd0wu7AeAZszOLOaK0UD48WDkcPFAGPDhYWDo8WDkcPFAGPDhYBAV51xHR0xOrEdHTEUQ4WAY8PFAEWDo8UD0gOFgGPDxQBFg6PFA8AAAT//f/CA9UDAQAtADcAQQBLAA1ACklEPzo1MCkCBC0rEyY2Fh8BBhcWFx4BNzI3FjY3HgE3PgE/ATYnNRY3PgEXFgYHDgMHBiMhJicTJjYWHwEWBiYnEz4BFh8BFAYmJxM+ARYXBw4BJicBBCY0CTUPAQYeBzIoLxsiYhkbWB0MEAMFAgEaIzF4JiEEIT1WMEQsFS3+olQVQgY2OggVBCoyDHgCPEAECDg6AZgEQjoBBgU6MgQCvCUgFhu4HSMerjQ8ASUnBCclCB8QIBUhDBwmCiItQhkYRhQZcm58HxIGcAGaLSgYJNEpLA4mAR8pHiAh+DsiKikBACsYJiH+LyYoLwAAAwAA//kD6AJ9ABAAIgAyAAq3LyUYEwwFAy0rETQ3NiwBBBcWFAcGBCAkJyY3HgEgNjcmJxYVFAYiJjU0NwYXFBYyNjU0NjMyNjQmByIGC04BCAEmAQhOCwtO/vj+2v74TgtHS+ABBOBLVYAiktCSIoCuEBYQRDALEBALRmQBOhMUgJoCnn4UJhOBmpqBExNyiIhyhEE6Q2iSkmhDOkE8CxAQCzBEEBYQAWQAAAMAAP+9BCQDCwATABwAMgAKtycdGhcOBAMtKxE1NDY3MzIWFwEWFAcBBiInAS4BNxQeAT4BJg4BJTMyFhcBFhQHAQYjIiYnATY0JwEuASod6R1IFQGPFBT+7hY7FP5xFR5rKjwoAiw4LgEgfR1IFQGPFRX+7hYdFBoQAQYVFf5xFUgB2+gdKgEeFf5xFTsV/u4VFQGPFUiaHigCLDguBiKRHhX+cRU7Ff7uFRARAQYVOxUBjxUeAAACAAD/sAPoAsMAJABJAAi1QS8QAwItKxE0PgEyHgEUDgEnIicGBwYHIyImNSY0NjU/AjYnNz4CNy4BARYzMjY3PgEnNCceARQGBx4BHwEWHwMUBw4BJyYnJicGIyJqtNa0amq0azAyRlUVGwIGDAECAQQDAwEcBQ4OBEVOAVcgEVqkQkVMAQ1IVFBEBQwIGwkEBQQDAQIKCBsVVUYyMJcBpU6ETEyEnIJOAQkyFgUECgYCBAQBAwYCAgEeBRgSECh0/uEDMi80hkorKid4h3YnDhYKIQsDBQYKAQIICgEEBRcxCQAGAAD/sQMSAwsAIwAvAD8ARwBXAGcAEUAOY1tTS0RAOzMuJxoJBi0rETU0NjsBNz4BNzMyFh8BMzIWHQEUBisBERQGIyEiJicRIyImExQeATMhMj4BNREhExE0NjsBMhYVERQGKwEiJhMzJyYnIwYHExE0NjsBMhYVERQGKwEiJjcRNDY7ATIWFREUBisBIiYKCKwnCSwWshYsCCetCAoKCDY0Jf4wJTQBNQgKjwgIAgHQAggI/gxHCggkCAoKCCQICjb6GwQFsQYEPgoIJAgKCggkCAqPCggkBwoKByQICgJGJAgKXRUcAR4UXQoIJAgK/e8uREIuAhMK/eUMFAoKFAwCEf5CAUEICgoI/r8ICgoCDkEFAQEF/bkBQQgKCgj+vwgKCggBQQgKCgj+vwgKCgAAAAMAAP+wA6ECxAAqADMAPAAKtzo2MS0dAgMtKxE0NhczMh4DHwEhMhYVERQGBwUXFhQHITIWDgEjISImNTQ+ATUDIyImEzQ2Mh4BBi4BJTQ2Mh4BBi4BFg6PCQ4IBgICAwKeDhYSDv25BgENAgEPFgISEf3FDhYMFmJyDxTVKjwoAiw4LgH2KjwoAiw4LgKfDxYBBgwQDgkOFg7+4g0WAUQaBREaFhwWFg4IHCYCAcwU/WkdKio6LAIoHx0qKjosAigAAAAB////ygKmAvEATwAGsz4dAS0rASIGFBY3Mjc2FhcVFAYrASImNzY1NCYiBgcUFxYGJyMiJic1NDYXFjMyNjQmJyIHBiY3NTQ2OwEyNicmNTQ2MhYHFAcGFjczMhYdARQGJyYCSiU2NiUWFRoWATAfjxAOCRVEYkQBDREKFI8hLAESFhgbJjY2JhUVGhgBLiCPEwwRDkZgRgEVChAPjx8wFBQYAZJEYEgCDREMEpAfLhIWGRomNDQmFhYaFgEuH5AQDgoURGRAAg0RChRbIS4UGxQYJjQ0JhoZFRQBLiFbEA4KFAAFAAD/4gP6AtoAOQBBAEsAYwBmAA9ADGZkYFBHQj07KAMFLSsBFgYHIi8BJjc+AScOAycuATU0NzY3Jw4BJzQmNSY2Mzc0JzQzMjcyHQE2MzYXFBYVFg8BFTMyFgUWNycGBwYUNz4CJyYjIgYjJRYSFhQrASI1JyMGBxQrASI1NhM2OwEyAzMDA9weUF4KAiACBFY+KhAuSGQ4NEA8MkACjAwECgIGBJwCCC4GCp4GCAIIBAiwDFZ8/qYcIgQiGiyoHDweCCQ8AggC/j4KVlAEVgYysDACBlYECqYCCGAKgpBIATJSvEICJgYEPLg4JkxULggGRjpUQDIQZBgCBgI2BAIEHG4ECAIIaBYECgIqBAoCHmZI4AYM1gwcLIIWGFhGBhICshz+7vgGBKakAgQEEgIWCP68AQgAAAAABQAA/7ED6AMLAA8AHwAvAD8ATwAPQAxLQzszKyMbEwsDBS0rFTU0NjsBMhYdARQGKwEiJjc1NDY7ATIWHQEUBisBIiY3ETQ2OwEyFhURFAYrASImNxE0NjsBMhYVERQGKwEiJjcRNDY7ATIWFREUBisBIiYKCGsICgoIawgK1goIawgKCghrCArXCgdsBwoKB2wHCtYKCGsICgoIawgK1goIawgKCghrCAo9awgKCghrCAoKCLMICgoIswgKCggBQggKCgj+vggKCggCGAgKCgj96AgKCggDNggKCgj8yggKCgAAAgAA/4kEsQMyADEAZQAItVE5MBYCLSs1Nj8BNjc+ATc0JyYnJjU0NyYnJj4BNzIeAgcGBxYVFAcGBwYVFBYXHgIXHgEVFyEBNDcmJyY+AR4CBwYHFhUUBwYHDgIXFBYXHgIXFSM1NC4CJy4BJzY1NC8BJicmJyYUKEUdFSUoAR8TDi0OBQQFPmo5K1Q+IgMEBA4tDxEgKCYdfmQQEhQB/JICwQwFAgQyWFxWNAQCBgwkDA8JCAoBIh4RMkYP/gYIFgwXPDEbBQgDCQ4NJTEHDxoLCxNKJxslFScSOisSJys3aj4BJj5SKjcbEyo6EikTJRsnShMPLigSETwVFQHTIhAgIy1YOAI0XCsjIBAiMA4hEQoMFAogPBAJFBgHhwsHJiIqDBkmEiIsCgoQBgoPIhAAAAAE//r/mgPzAxoAKwA3AFYAXgANQApbWEg/NzEaCAQtKxMOARQjBwYHBi8BJjc+ATc2Mj4BNzI+ATc2NzIXMgcGBwYXFhcWDwEGJy4BFwEWDwEGJwEmPwE2JRYHBicmDwEnNz4BJjc2NzYWBwYHBhYXFjc+ATc2FgE3FwcGLwEmmwgGAhEPBBAMRgsNAiAEBioeCAYCDiYWhjR6GgwUeCBQLCIECApMDgQqOvgBmhIUMBYQ/mIICEgMAjIQIDJoOCxSREQYDgIGDIAMDAQMIg4EJjomBigCBBL8qP5M9hQSLhYB+ggcFg8NBA4STAwMAhgEBhwwBg4eEFoGAgg0GDg6LgIIBkYIBDAYMv4kFhAqDhIB2AgMPgjAaD5YGgwsTk5GGDpIFjg4BhIGDEQKMhwoPgw6BAoC/UT4VvIUEC4SAAIAAP+xA1sDCwAjAEYACLUzJxsDAi0rFTU0NjsBMhYGDwEeATMyNjc2NzY7ATIWHQEOASMiJicHBiImEzU+ATMyFhc3NjIWBxUUBisBIiY2PwEmIyIGBwYHBisBIiYWDvoOFgIJTShkN0qCJwYXBQxrCAok5JlRmDxICxwWCiTmmVGaPEgLHBgCFBD6DhYCCU1ScEuCJwYXBQxvBwwH+g4WFhwLTSUoSj4KOA0MBgSWuj45SAsWAcwElro+OUgLFg76DhYWHAtNTUo+CjgNDAAC////wwPpArEAGQAxAAi1KiIVBAItKzU0PwE2MhYdASEyFgcVFAYHIRUUBgciLwEmETU0NjMhNTQ2Mh8BFhQPAQYiJj0BISImBbMFDwoDAAcMAQoI/QAKCAYHsgUKCAMACg4HsgUFswUPCv0ABwyICAWyBQoIawoIawcKAWsHCgEGsgUBN2sICmsICgWyBRAFswUMBmsMAAL////5BBkDCwAWACkACLUlHBQDAi0rNRE0NjsBMhYdASEyFh0BISIGDwInJhc0PwE+ATMhMhYUDwEOASMhIiZKM7MzSgEvM0r+MDVyI7wCAQEqEbwYViUCXxMeErsYVib9oRMcdgIYM0pKMxJKM1o0Kd0DBwVcERTdHCgOIxPdHCgOAAL//P9+A9gDSgANAB8ACLUfFAgBAi0rNzYeAgcGBwY3NDc+AQEWAAcGBwYnJicmJyY3Njc2AHYmXlIMJFaOVAQGNBgDbBr+pHYmVggIEh4gIhAIQCh2AcSqIgpQXiRUEgwaBAY8qgKoGv5EdCZCBg4iHiAQBgpUJnQBVgAEAAD/ugKAAwIALAA1AD4ARwANQApDPzo2My8aEAQtKwEUBw4DBw4DBxYVFAYiJjU0NxEmNTQ2MhYVFAcVNjc+AjcmNTQ2MhYFFBYyNjQmIgYTMjY0JiIGFBYBMjY0JiIGFBYCgEoGLE46LioqNBgERkZkRkhIRmRGSChiOjQyBEZGZEb9tCg4Kio4KEQcKio4KCgBrBwqKjgoKAKKUB46VjQYDg4QIDAkHlAyRkYyTiIBeiJMMkZGMkwizB4eEhY8LiBMMkZGMhwoKDooKP1GKDooKDooAlgoOigoOigAAAMAAP/4A1oCxAAPAB8ALwAKtywjGxMLBAMtKz0BNDY3ITIWBxUUBichIiYDNTQ2FyEyFgcVFAYnISImAzU0NhchMhYHFRQGByEiJhYOAxEPFgEUEPzvDxQBFg4DEQ8WARQQ/O8PFAEWDgMRDxYBFBD87w8UHUcPFAEWDkcPFgEUAS1IDhYBFA9IDhYBFAEtRw8WARQQRw8UARYAAAMAAP+5BBYCugAVACUAOwAKtzcvIRkRBAMtKxM0NwE2Mh8BFhQPARcWFA8BBiInASYBEz4BHwEeAQcDDgEvAS4BJTQ/AScmND8BNjIXARYUBwEGIi8BJhkGAQQFEAQcBgbb2wYGHAUOBv78BgF00AMMByMHCAPQAg4GIggGAUYF29sFBRwGDgYBBAUF/vwGDgYcBQE6CAUBBAYGHAUQBNzbBg4GHAUFAQQG/qkC0AgGAQoCDgb9LwcIAwkDDH4HBtvcBQ4GHAYG/vwFEAX+/AUFHAYAAgAA/5wD6AMgACgANAAItTMtGAMCLSslFh0BITU2Nz4BNTQmJy4BJzQ2PwEmJyY2MhYPARYVDgMHDgEVFBYlMxUjFSM1IzUzNTMCbLT84CQuXkYuCAIqBAoEBAgEBlzkXAQOEgIODg4CCi5IAUSWlmSWlmSAQDpqyg4MIkY8FjQwDBowEBQCBDImNnR0NlgIIhweBAwMLjYWPEbuZJaWZJYAAAAB//7/sQNZAwsAMQAGsy0EAS0rETQ+AjMyFhc3NhYdARQGKwEiJj8BJiMiDgIeAzMyNjc+AR8BHgEHDgEHIi4CRHScWVKYPUgQLRQQ+hcTEU1ScDpqTDAEKFRiPkJ2KQQRBkwFAgY8rl9XoHBIAV5XnnREPjlIEhMY+g4WLRBNTS5ManRqTC46NQYBBU0EDgZKUAFEdJ4AAAMAAAAAA+gCtgAWADAARwAKt0E1LSEUCgMtKz0BND8BJic0NzY3MhcGFwYPAQYHFSMiFzU0PwIuATc0NjIWFRQHHwEWHQEGByEuAQE2JzY3MhcWFRQHFxYdARQHIzU0LwEmEqtCAiMlNR8gMUgMDXIwBHIZvxaYOSUuAVyAWk49khgCI/3jDhQB2UQuHyMxKSNBqBIbdjJuD2qGGgZQJ1w4LykCE31wCwg3Fz2PGagbCkYcF1YzTGxsTGo0HkYKG6glBAIYAVlqfRMCKyk+UjFQChaGIAKPORs1CAAB//z/zAOIAvIAGgAGsxgIAS0rARYGKwERFA4BKwERIxEjIiY1ESMiJjcBNjIXA3gQChZUAg4QzMzCHA5UFgoQAZAQLBABUBAW/soODgwBNv7KFBQBNhYQAZIQEAAAAAADAAD/nwOPAx4AFAAoADwACrc5LiUaEAUDLSslFSMVFAYiJj0BIzUzETQ2NzIWBxEBFSMRFAYiJjURIzUzNTQ+ARYHFQUVIxEUBiImJxEjNTMRND4BFhURAkA3IiwiODgiFRgiAQGGNyAwIDg4IC4kAv2ZNyAvIAE4OCAwIO9wpxciIhencAH3GB4BIBf+CQFPcP4KFyIiFwH2cKgYHgIiFqhwb/55FyIiFwGHbwEYGB4CIhb+6AAAAgAAAAADjwKtAAQACQAItQkHAgACLSsBJTUhFQElESERAdP+PwN9/kQBvPyDAW7SbW3+s9L+SwG2AAAAAgAA/8IDIgLqABEAGgAItRgUDAQCLSslFg8BBi8BBiMiJhA2IBYVFAclFBYyNjQmIgYDBB4YLiQgvkpSgL60AQDALv4YiLB+iLB+TiIcLiAgviq+AQC2voBYSqpYiH6yhn4AAAEAAP9qA+gDUgBEAAazMxEBLSsRND8BNjIWHQEzNSMiJjQ/ATYyHwEWFAYrARUzNTQ2Mh8BFhQPAQYiJj0BIxUzMhYUDwEGIi8BJjQ2OwE1IxUUBiIvASYLjwoeFNdIDhYLjwscC48LFg5I1xQeC44LC44LHhTXSA4WC48KHgqPCxYOSNcUHguOCwFeDwqPCxYOSNcUHguOCwuOCx4U10gOFguPCh4KjwsWDkjXFB4LjgsLjgseFNdIDhYLjwsAAAL/+P+2A+wDCAAGACMACLUWDQMAAi0rAQUjESMRIwEeAQ8BDgEjISImLwEmPwEzBzMyHwEhNzY7ASczAfQBBKS+pgLYEhIGHAQkFvzQFiQEHAoqnmKqsggEKAEsKAgEsqpiAwj0/wABAP6yCiwSmhQaGhSaMBhsgghubgiCAAAAAQAAAAAD6AKkAB0ABrMYBAEtKwEyFhQGKwE1MycHMxUjIiY0NjMyFyY1NDYzMhYXNgL4ZIyMZL5qsK5o+EpsakwOBgKcblqMGBwB7ojEiL7m5r5okmgCDBpsmGhSBAAAAv/6/3ADGgNWABkALQAItSodGAwCLSsBFgYHBicPAgYPAQYmLwEmNwEmJyY2NzYWBzYuAQYHDgEfAR4BHwEeAjI+AQMGFGBmQkB2RmgOIEwMFAIQCBQBAhgOEo5yarJsHhJUZB4ICAMFAhYHQxAOGA4UEAJkdMYSDArCDKYcBA4EEA5iHhoBgjJGaqIUFIK8LGo+FCwMFgkQBxQFMQwIEAIOAAAIAAD/kgOYAyoADwAbACcANwBCAE4AXQBpABVAEmVeVU9NRT48MCgmIRgUBgIILSsTIgcmJzY3FhcGFRQXBgcmBxQXBgcmNTQ3FhcGASIHJic2MzIXBgcmEyYnNjU0JzY3FjMyNxYXBhc2NzY3Bgc2NTQmJwYHJic2NxYzMjcWARYVFAcGByYnJic2PQE2AxYXFhUUBwYjIic24BYUMCw2Slw8BgQ+NhBuFDwUQjImLggBUBwWOjhUTnhuTFYaaqCCBA4mPBoeDhheKBB2JhA6Mi54BgKWvnJaRAxEBg4eFo4BYJYEQEIYQDBkCmQaDhICDlZsOjZuAfgKNExKLCYsEBAGEDA4BGIiGnJ2aoJuYD4yGAEwDiocHj4OJBr+NBhYFAoYHCwuFAhshA6WDi4EDpJWMDIKJExgsCRKkIICDmIB0ojMFiwSBjgEknYUFgoq/ewKCBIiUEAqDKAAAAAAA//8/5ADmgMsAAgAEwApAAq3HhQOCQUBAy0rATYAEgAEAAIAFyIGFQYWMzI2NTQDMjY3JwYjIj8BNiMiBgcXNjMyDwEGAca+ARAG/vb+hP7uBgEM8iouAiIgJi60Hmw0EjAYDgoqGjAedjgQNBYMDCQaAyoC/vj+hP7uBgEKAXwBEpYwGhwgLCA6/a40NBgkJqBgOi4aIiKYaAAADwAA/2oDoQNTACMAJwArAC8APwBDAEcASwBPAFMAVwBnAGsAbwBzACNAIHJwbmxqaGNaVlRSUE5MSkhGREJAOzIuLCooJiQfCA8tKxURNDY7ATU0NhczMhYdATM1NDYXMzIWFxUzMhYXERQGIyEiJjczNSM1MzUjNTM1IzcUFjczMjY3NTQmJyMiBgcTMzUjNTM1IzUzNSMTMzUjNTM1IzUzNSM3FBY3MzI2PQE0JicjIgYVEzM1IzUzNSM1MzUjKh1INCUkJTTWNiQjJTQBRx0qASwc/O4dKkehoaGhoaGPDAYkBwoBDAYkBwoBNrKysrKystazs7Ozs7OhCggjCAoKCCMICjWhoaGhoaFPAssdKjYkNgE0JTY2JDYBNCU2Kh39NR0qKh2hJLIkoWsHDAEKCKEHCgEMBvy4oSSyJKH9xKEksiShawcMAQoIoQcKAQwG/LihJLIkoQAAAQAAAAADpAKYABUABrMRCQEtKxM0PwE2Mh8BATYyHwEWFAcBBiInASZED0wQLBCkAW4QLBBMDw/+IBAsEP7qDwFMFhBMEBClAW8QEEwQLBD+IA8PARYQAAP//P+QA5oDLAAIABYAPwAKtzcbDgkFAQMtKwE2ABIABAACABMyNjU2JisBIgYHFBYXEzY1NCYjIgcGBxUzNTQ3NjIXFhUUBwYPAQYPAQYHBgcVMzU0NzY/ATYBxr4BEAb+9v6E/u4GAQy8HiYCJh4CHCYCJhyoGmpSQChEBG4QEE4MEBAIDBYKChULBg4EbAQGFhwuAyoC/vj+hP7uBgEKAXwBEv0eJhweJiQcHiYCAUgiLE5MGipoBAQaHBgUFBgSFgwIDwcIEQkIFDoIBAwQFBASIgAAAAIAAP/5A2sCwwAnAD8ACLU4MCQDAi0rNRE0NjsBMhYVFxYPAQ4BJyMiBgcRFBYXMzIeAhUXFg8BDgEHIyImNzU0NjczNTQ2FhcBFhQHAQYiJj0BIyImXkOyCAoBAQECAQgIsiU0ATYktAYCBgIBAQECAQgIskNe1hYO+hYcCwEvCwv+0QscFvoOFpoBiENeCggLCQYNBwgBNiT+eCU0AQQCCAQLCQUOCQQBXpzWDxQBoQ4WAgn+0AoeCv7QChQPoRYAAAABAAD/tgOIAxIAFgAGsxEMAS0rATYWBw4CLgIGBxMjAzc+AR4DNgNqDhAIYIhUPjpEdlBaZLhcWnxIOERaqAJoBg4MipYeGjAgKEL+oALQIkIoIkRKMgoAAf/5/3sD+ANYACUABrMfAQEtKyUGJCcmAjc+ATc2FhceAQcGBwYCFxYkNz4BJyYkBzU2BBcWAgcGA1eX/mqUjw6BCBEKHEAZFggOBgppBmd6AThsUC0wQ/7kn7cBR040KVMQCY0OjJUBhJ4KEgYRBxcYPBwMCnb+3mxxHXZe73aWejIBO4qtf/78ahYAAAAAAwAA/2oCMANSABsAKABiAAq3TTImIBgKAy0rARQOARQeAR0BFAYiJj0BND4BNC4BPQE0NjIWFQUHBhcWMzI3NicmIyITND4CPwE2NTcGIicXFB8DFiYWIxQOAg8CBiYGNQYdAT4CNTQyFRQeARc1NC8CJi8BLgECMGBiYmCs2KxgYmJgrtSu/h4SBAhcfIRYDh5ganiQCBwMGR1cAmT0ZARaLRMREQweDAIKBggMDw8CIloIdEQ0QnoGXCsSDQUMBwQCbixoXjxcZi52Ik5OInYuZlw8XmgsdiBOTiAGDggGNDIKFDb+ShIeJA4YHFweMjY2MiBaKxMVFQIwChISDgoPEBACIgFaIEIEJjAiHh4iMCYEQh5cKRMOCBQMFgAAAgAA//kDoAMLAC4ARAAItUA4KgQCLSs1ETQ2NyEyFx4BDwEGIyInJiMhIgYHERQWFyEyNj0BND8BNjMyFxYdARQGIyEiJhM0PwE2Mh8BATYyHwEWFAcBBiIvASZeQwHQIx4JAwcbBgcCAw0M/jAlNAE2JAHQJTQFJAYHAwQLXkP+MENejw49DiQOkwFpDSQOPg0N/jkNJA7wDpoB0EJeAQ4EEwYcBQEDNCX+MCU0ATYkjQgFIwYCBAyxQ15eAU4TDT4NDZMBaQ0NPQ4kDv46Dg7wDQACAAD/+QMTAwsADwAfAAi1GhMLBAItKzURNDY3ITIWBxEUBiMhIiY3FBYXITI2NRE0JiMhIgYHXkMB0EJgAV5D/jBDXkc2JAHQJTQ0Jf4wJTQBmgHQQl4BYEH+MENeXkMlNAE2JAHQJTQ0JQACAAD/sQNcAwsADAAxAAi1IxEJAwItKxE0PgEyHgEOAiIuARcUHwEWMj8BFxYyPwE2NC8BNzY0LwEmIg8BJyYiDwEGFB8BBwZ0wu7AeAZszOLOaNILMgoeC2VlCh4KMwoKZWUKCjMKHgplZQseCjILC2VlCwFedcR0dMTqxHR0xAkPCzILC2VlCwsyCx0LZWULHQsyCwtlZQsLMgsdC2VlCwAAAAEAAP/vAtQChgAkAAazGwkBLSs3ND8BJyY0PwE2Mh8BNzYyHwEWFA8BFxYUDwEGIi8BBwYiLwEmPRCkpBAQTBAsEKSkECwQTA8PpKQPD0wQLBCkpBAsEEwQcBcPpKQQLBBMEBCkpBAQTA8uD6SkDy4PTA8PpKQPD0wQAAABAAD/+AMSAwsAIwAGsxoIAS0rETU0NjczNTQ2OwEyFhcVMzIWHQEUBisBFRQGJyMiJjc1IyImIBboHhdrFx4B6BYgIBboIBZrFiAB6BceAUxrFx4B6BYgIBboIBZrFiDoFiABHhfoIAAAAAACAAD/sQNcAwsADAAiAAi1GREJAwItKxE0PgEyHgEOAiIuATcUHwEWMjcBNjQvASYiDwEnJiIPAQZ0wu7AeAZszOLOaIcKygoeCgEvCwsyCxwM434LHAwyCgFedcR0dMTqxHR0xGoPCsoKCgEvCh8KMgsL434LCzIKAAAAA////2oDoQMMABgAIQBFAAq3PCogGxAFAy0rETQ+Ax4CFxQHFxYUDgEvAQYjIi4CNxQWPgIuAQYXNTQ2OwE1NDY7ATIWFxUzMhYdARQGJyMVFAYnIyImNzUjIiY+apCijm46AkW/FSo8FL9ke1CSaECQktCQBJjImksMBn0KCCQHCgF9BwoKB30MBiQHDAF9BwoBglCQbDwCQGiUTntkvxU8KAEVv0U+aJRPZ5QCkNKOBpp1JAcKfQgKCgh9CgckBwwBfQcMAQoIfQoAA////2oDoQMMABgAIQAxAAq3LSUgGxAFAy0rETQ+Ax4CFxQHFxYUDgEvAQYjIi4CNxQWPgIuAQYXNTQ2MyEyFh0BFAYnISImPmqQoo5uOgJFvxUqPBS/ZHtQkmhAkJLQkASYyJpLDAYBQgcKCgf+vgcKAYJQkGw8AkBolE57ZL8VPCgBFb9FPmiUT2eUApDSjgaadSQHCgoHJAcMAQoAAAYAAP/4A+gDCwAPAB8ALwAzADcAOwARQA46ODY0MjAsIxsUCwMGLSs9ATQ2FyEyFhcVFAYnISImAzU0NjchMhYXFRQGJyEiJgM1NDYzITIWFxUUBgchIiYFITUhEyE1IRMzNSMWDgOgDxQBFg78YA8UARYOA6APFAEWDvxgDxQBFg4DoA8UARYO/GAPFAFkAjz9xNYBZv6aj9fXHY4PFgEUEI4PFgEUAS2PDxQBFg6PDhYBFAEtjw4WFg6PDxQBFuxH/ptIAfRHAAAAAAH/+f+xAxgCwwAUAAazCwEBLSsTNjMhMhYHAREUBwYjIi8BJjURASYDCRgCyhcTEf7tFgcHDwqPCv7tEgKtFi0Q/u3+YhcKAwuPCg8BDwETEAAAAAL///+xA+gCwwAZADYACLUqHBYBAi0rNREWFxYXHgI3MzI+ATc2NzY3ERQGByEiJhM0NjMhMhYXFAYHBg8BDgInIyIuAS8CJicuARkfykwgJkQbAhxCKB9ftyAYNCX8yiQ2AS4rAzYkNAE2KdI0NQwiIAsCDB4kCzWTYBIjPAsBuxwViTcYGhwBGhwXRHwWG/5FJTQBNgJ3Kzo0JSxQHZIjJwkSDAEKFAgnZUIOF1IAAQAA/7ED6AMLAFUABrMpEgEtKxU1NDYXMzU0NhchNSMiJic1NDY7ATIWFxUUBicjFSEyFgcVMzIWFxUUBisBIiY9ATQ2FzM1IRUzMhYXFRQGKwEiJic1NDYXMzUhFTMyFh0BFAYrASImIBY1Kh4BHTUXHgEgFrIXHgEgFjUBHR0sATUXHgEgFrIWICAWNf7jNRceASAWshceASAWNf7jNRYgIBayFx4ZsxYgAWsdLAFrHhezFiAgFrMWIAFrKh5rHhezFiAgFrMWIAFrax4XsxYgIBazFiABa2seF7MWICAAAAAAAwAA/2oDoQMLADEANAA3AAq3NzUzMiMRAy0rETU0NjsBNTQ2OwEyFh0BITc2MhYUDwERMzIWHQEUBisBFRQGKwEiJj0BISImNREjIiYJASETIREKCH0KCGsICgHbiQUQCgWKfQgKCgh9CghrCAr+HggKfQgKAR4BTP60GQFMAf9rCAp9BwoKB32KBQsOBon+JQoIawgKfQgKCgh9CggB4gr+qgFM/psBTAAAAAT///+xBC8DCwAPAB8AJgAvAA1ACi0qJCAaEgwEBC0rNRE0NjchMhYVERQGByEiJjcUFjMhMjYnETQmIyEiBgcTNTcXARcVATQ+ARYUBi4BNCUDfSU0NCX8gyQ2SAwGA30HDAEKCPyDBwoBSLJaAR3p/O4+Wj4+Wj4LAqYlNAE2JP1aJTQBNiQICgoIAqYICgoI/Y9rs1kBHej6AdEsPgJCVEQEPAAAAAIAAP+xAxMDCwAfACgACLUnIhsHAi0rNTQ+BRcyHgIyPgIzMh4FBxQGIyEiJhM0NjIeAQ4BJgQMEh4mOiEFJixMSkowIgciOCgcFAoGAVJD/hhDUrN8tHoEgqyEQh44QjY4IhoCGB4YGB4YFiY0Oj48HENOTgI1WX5+snwCgAAAAwAA/8MD6ANAADgASwBvAAq3YE5CPDQYAy0rPQE0NjsBMj4CNzY/AT4FNzM1NDYyHwEWFA8BBiImPQEjIg4CBwYHDgIPAQ4CJyMiJhE1NDY7ATIXBgcnLgMnIyImATY3HgQ3MzU0NjIfARYUDwEGIiY9ASMiBi8BLgUKCH0bKiQUEBEaHAwkJC42QCiPCg4HsgUFswUPCo8bLCAaDBIZEBgkEikXNkImfQgKCgh9i1oiKxQIHhouFn0ICgGfISsMEB4aLBiPCg4HsgUFswUPCjAeHhonDS4YKBokUmsIChIgJBkjPT4aQDAsIBABawgKBbIFEAWzBQwGaxAiJBkiPSUyRBUvGhgWAQoB/GsICn00ZSkQJhoMAgr+gDRkGR4qFBQCawgKBbIFEAWzBQwGawICAwEKChYWJgAAAAIAAP/5AoMDCwAXAB8ACLUcGBQIAi0rNRE0NhczNTQ2MhYHFTMyFhcRFAYHISImEyE1NCYOARcgFhGUzJYCEhceASAW/ekXHrIBHVR2VAEuAUIWIAFsZpSUZmweF/6+Fh4BIAGMbDtUAlA9AAMAAP+6A5gDSQAgAD0AWgAKt0pCOSUUBAMtKxM0PwE2Mh8BFhQHFzYyHwEWFA8BBiIvASY0NycGIi8BJjcUHwEWMjcnLgI1NDYXMh4BHwE2NC8BJiIPAQYBFB8BFjI/ATY0LwEmIgcXHgEfARQGByIuAS8BBgkvUi+GL3IvMTEwhy90LzBSLocucy4xMTCHL3QvaxB0Dy4RFwMKBB4XCQ4OAxcSD3MQLBBSEAGIEHMPLRBSDw90EC4QFgMMAQIgFggODgQWEwJYQy5SLi90LogwMTEvdC+GLlEvMHMvhzAxMS90L0MWEHQPERcDDg4JFiABBAoDFxEuEHMQD1IP/mEXD3QPD1EQLA90EBIWAxAGDxceAQQKBBYRAAAAAwAA/3YDoAMLAAwAFQAxAAq3LRkUDwgDAy0rFzQ3AR4BFwEGIi8BJjcUFj4CLgEGATQ2NzIWFxYUDwEVFzY/ATYyFgcUBw4BIyImNQwVAXwWVDf+gxU6FjsVgxQgEgIWHBgBIJJoIEYZCQmjbAIqSyEPCgEMG4JPaJIHHRYBfDdUFv6DFBQ9FEIPFgISIhAEGAHnZ5IBFBAGEgdefTwCGS0UCgkWJkpelGYAAAMAAP+xA1wDCwAMABkALgAKtyoiFxAJAwMtKxE0PgEyHgEOAiIuATcUHgE+Ai4DDgEXNTQ2OwE1NDY7ATIWHQEUBisBIiZ0wu7AeAZszOLOaHdSiqiIVAJQjKSOTp8KCH0KByQICgoIsggKAV51xHR0xOrEdHTEdVOKVAJQjqKOUAJUiokkCArECAoKCPoHCgoAAAAD//7/rwNaAw0AEAAZACMACrcjGxUTDAQDLSsRND4CMh4DDgIuAzcUFwEmIyIOARMWMzI+Aic0J0RyoK6edEICRnCiqqRuSH8yAaVLXFOMUIlMWj5wUDIBMAFgV6ByRERyoK6icEgEQHiaW1tMAaUyUJD+sDIyUHI+WkoAAQAAAAEAAFK9zspfDzz1AAsD6AAAAADQPgWCAAAAANA9zUL/+P9qBLEDWAAAAAgAAgAAAAAAAAABAAADUv9qAFoEsQAA/+YEsQABAAAAAAAAAAAAAAAAAAAAQwPoAAADoAAAA6AAAANZAAAELwAAA+gAAANZAAADWQAAA9MAAAPoAAAELwAAA+gAAAMRAAADoAAAAqYAAAPpAAAD6AAABLEAAAPoAAADWQAAA+gAAAQvAAADwgAAAoAAAANZAAAELwAAA+gAAANZAAAD6AAAA4QAAAOgAAADoAAAAxUAAAPoAAAD6AAAA+gAAAMMAAADmAAAA5gAAAOgAAAD6AAAA5gAAAOgAAADhAAAA+gAAAIwAAADoAAAAxEAAANZAAADEQAAAxEAAANZAAADoAAAA6AAAAPoAAADEQAAA+gAAAPoAAADoAAABC8AAAMRAAAD6AAAAoIAAAOgAAADoAAAA1kAAANZAAAAAAAAADoAhAEkAoIC8gM4A4IEBARaBLYFKAXCBiQGlgc0B6YIQAjgCUgJlAnWChQKhArSCzwLjgvaDEgMeAzUDPINJA2EDcQN9A5GDvYPRA/yEB4QihDsERgRYBHwEloSkBLiEyATVhOUE/oUShSwFNoVMhWkFfoWThaOFywXYhfwGEYYkBjOAAEAAABDAPMADwAAAAAAAgAAABAAcwAAADQLcAAAAAAAAAASAN4AAQAAAAAAAAA1AAAAAQAAAAAAAQAIADUAAQAAAAAAAgAHAD0AAQAAAAAAAwAIAEQAAQAAAAAABAAIAEwAAQAAAAAABQALAFQAAQAAAAAABgAIAF8AAQAAAAAACgArAGcAAQAAAAAACwATAJIAAwABBAkAAABqAKUAAwABBAkAAQAQAQ8AAwABBAkAAgAOAR8AAwABBAkAAwAQAS0AAwABBAkABAAQAT0AAwABBAkABQAWAU0AAwABBAkABgAQAWMAAwABBAkACgBWAXMAAwABBAkACwAmAclDb3B5cmlnaHQgKEMpIDIwMTQgYnkgb3JpZ2luYWwgYXV0aG9ycyBAIGZvbnRlbGxvLmNvbWZvbnRlbGxvUmVndWxhcmZvbnRlbGxvZm9udGVsbG9WZXJzaW9uIDEuMGZvbnRlbGxvR2VuZXJhdGVkIGJ5IHN2ZzJ0dGYgZnJvbSBGb250ZWxsbyBwcm9qZWN0Lmh0dHA6Ly9mb250ZWxsby5jb20AQwBvAHAAeQByAGkAZwBoAHQAIAAoAEMAKQAgADIAMAAxADQAIABiAHkAIABvAHIAaQBnAGkAbgBhAGwAIABhAHUAdABoAG8AcgBzACAAQAAgAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAGYAbwBuAHQAZQBsAGwAbwBSAGUAZwB1AGwAYQByAGYAbwBuAHQAZQBsAGwAbwBmAG8AbgB0AGUAbABsAG8AVgBlAHIAcwBpAG8AbgAgADEALgAwAGYAbwBuAHQAZQBsAGwAbwBHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDAAABAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhASIBIwEkASUBJgEnASgBKQEqASsBLAEtAS4BLwEwATEBMgEzATQBNQE2ATcBOAE5AToBOwE8AT0BPgE/AUABQQFCAUMEc3RhcgpzdGFyLWVtcHR5A2NvZwdjb2ctYWx0BG1haWwGcGVuY2lsDHBsdXMtY2lyY2xlZANhc2wDZXllBHRhZ3MEY2hhdAV0cmFzaAZiYXNrZXQGcHV6emxlCGxhbmd1YWdlBnNpZ25hbAV1c2VycwV0b29scwlhcnJvd3MtY3cIZXhjaGFuZ2ULZm9sZGVyLW9wZW4FYnJ1c2gLZmxvdy1icmFuY2gEbWVudQRjb2RlCHVzZXItYWRkAmN3BWdyb3VwBGhvbWUJZXF1YWxpemVyBm1haWwtMQZzZWFyY2gEbW92ZQZ1cGxvYWQMdXBsb2FkLWNsb3VkA2tleQduZXR3b3JrDmluZm8tY2lyY2xlZC0xCGNhbGVuZGFyAm9rDGhlbHAtY2lyY2xlZAZsb2dvdXQEZmxhZwVzcGluNglob3VyZ2xhc3MFY2hlY2sLY2hlY2stZW1wdHkOY2FuY2VsLWNpcmNsZWQGY2FuY2VsBHBsdXMKb2stY2lyY2xlZAd6b29tLWluCHpvb20tb3V0BXRhc2tzBmZpbHRlcghtYWlsLWFsdAdzaXRlbWFwBGNyb3AHcGljdHVyZQR1c2VyB3NodWZmbGUEbG9jawRsaW5rBndyZW5jaAVjbG9jawVibG9jawAAAAAAAQAB//8ADwAAAAAAAAAAAAAAALAALCCwAFVYRVkgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbkIAAgAY2MjYhshIbAAWbAAQyNEsgABAENgQi2wASywIGBmLbACLCBkILDAULAEJlqyKAEKQ0VjRVJbWCEjIRuKWCCwUFBYIbBAWRsgsDhQWCGwOFlZILEBCkNFY0VhZLAoUFghsQEKQ0VjRSCwMFBYIbAwWRsgsMBQWCBmIIqKYSCwClBYYBsgsCBQWCGwCmAbILA2UFghsDZgG2BZWVkbsAErWVkjsABQWGVZWS2wAywgRSCwBCVhZCCwBUNQWLAFI0KwBiNCGyEhWbABYC2wBCwjISMhIGSxBWJCILAGI0KxAQpDRWOxAQpDsABgRWOwAyohILAGQyCKIIqwASuxMAUlsAQmUVhgUBthUllYI1khILBAU1iwASsbIbBAWSOwAFBYZVktsAUssAdDK7IAAgBDYEItsAYssAcjQiMgsAAjQmGwAmJmsAFjsAFgsAUqLbAHLCAgRSCwC0NjuAQAYiCwAFBYsEBgWWawAWNgRLABYC2wCCyyBwsAQ0VCKiGyAAEAQ2BCLbAJLLAAQyNEsgABAENgQi2wCiwgIEUgsAErI7AAQ7AEJWAgRYojYSBkILAgUFghsAAbsDBQWLAgG7BAWVkjsABQWGVZsAMlI2FERLABYC2wCywgIEUgsAErI7AAQ7AEJWAgRYojYSBksCRQWLAAG7BAWSOwAFBYZVmwAyUjYUREsAFgLbAMLCCwACNCsgsKA0VYIRsjIVkqIS2wDSyxAgJFsGRhRC2wDiywAWAgILAMQ0qwAFBYILAMI0JZsA1DSrAAUlggsA0jQlktsA8sILAQYmawAWMguAQAY4ojYbAOQ2AgimAgsA4jQiMtsBAsS1RYsQRkRFkksA1lI3gtsBEsS1FYS1NYsQRkRFkbIVkksBNlI3gtsBIssQAPQ1VYsQ8PQ7ABYUKwDytZsABDsAIlQrEMAiVCsQ0CJUKwARYjILADJVBYsQEAQ2CwBCVCioogiiNhsA4qISOwAWEgiiNhsA4qIRuxAQBDYLACJUKwAiVhsA4qIVmwDENHsA1DR2CwAmIgsABQWLBAYFlmsAFjILALQ2O4BABiILAAUFiwQGBZZrABY2CxAAATI0SwAUOwAD6yAQEBQ2BCLbATLACxAAJFVFiwDyNCIEWwCyNCsAojsABgQiBgsAFhtRAQAQAOAEJCimCxEgYrsHIrGyJZLbAULLEAEystsBUssQETKy2wFiyxAhMrLbAXLLEDEystsBgssQQTKy2wGSyxBRMrLbAaLLEGEystsBsssQcTKy2wHCyxCBMrLbAdLLEJEystsB4sALANK7EAAkVUWLAPI0IgRbALI0KwCiOwAGBCIGCwAWG1EBABAA4AQkKKYLESBiuwcisbIlktsB8ssQAeKy2wICyxAR4rLbAhLLECHistsCIssQMeKy2wIyyxBB4rLbAkLLEFHistsCUssQYeKy2wJiyxBx4rLbAnLLEIHistsCgssQkeKy2wKSwgPLABYC2wKiwgYLAQYCBDI7ABYEOwAiVhsAFgsCkqIS2wKyywKiuwKiotsCwsICBHICCwC0NjuAQAYiCwAFBYsEBgWWawAWNgI2E4IyCKVVggRyAgsAtDY7gEAGIgsABQWLBAYFlmsAFjYCNhOBshWS2wLSwAsQACRVRYsAEWsCwqsAEVMBsiWS2wLiwAsA0rsQACRVRYsAEWsCwqsAEVMBsiWS2wLywgNbABYC2wMCwAsAFFY7gEAGIgsABQWLBAYFlmsAFjsAErsAtDY7gEAGIgsABQWLBAYFlmsAFjsAErsAAWtAAAAAAARD4jOLEvARUqLbAxLCA8IEcgsAtDY7gEAGIgsABQWLBAYFlmsAFjYLAAQ2E4LbAyLC4XPC2wMywgPCBHILALQ2O4BABiILAAUFiwQGBZZrABY2CwAENhsAFDYzgtsDQssQIAFiUgLiBHsAAjQrACJUmKikcjRyNhIFhiGyFZsAEjQrIzAQEVFCotsDUssAAWsAQlsAQlRyNHI2GwCUMrZYouIyAgPIo4LbA2LLAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjILAIQyCKI0cjRyNhI0ZgsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhIyAgsAQmI0ZhOBsjsAhDRrACJbAIQ0cjRyNhYCCwBEOwAmIgsABQWLBAYFlmsAFjYCMgsAErI7AEQ2CwASuwBSVhsAUlsAJiILAAUFiwQGBZZrABY7AEJmEgsAQlYGQjsAMlYGRQWCEbIyFZIyAgsAQmI0ZhOFktsDcssAAWICAgsAUmIC5HI0cjYSM8OC2wOCywABYgsAgjQiAgIEYjR7ABKyNhOC2wOSywABawAyWwAiVHI0cjYbAAVFguIDwjIRuwAiWwAiVHI0cjYSCwBSWwBCVHI0cjYbAGJbAFJUmwAiVhuQgACABjYyMgWGIbIVljuAQAYiCwAFBYsEBgWWawAWNgIy4jICA8ijgjIVktsDossAAWILAIQyAuRyNHI2EgYLAgYGawAmIgsABQWLBAYFlmsAFjIyAgPIo4LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKxAAAqsQAFQrEACCqxAAVCsQAIKrEABUK5AAAACSqxAAVCuQAAAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbEADCq4Af+FsASNsQIARAA=') format('truetype');
+  src: url('data:application/octet-stream;base64,d09GRgABAAAAADBIAA4AAAAASsAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAEQAAABWfC1hKmNtYXAAAAGIAAABRwAAA1adxeuOY3Z0IAAAAtAAAAAKAAAACgAAAABmcGdtAAAC3AAABZQAAAtwiJCQWWdhc3AAAAhwAAAACAAAAAgAAAAQZ2x5ZgAACHgAACKtAAAylm/WaOloZWFkAAArKAAAADUAAAA2CEOoA2hoZWEAACtgAAAAHgAAACQIYARGaG10eAAAK4AAAABnAAABEPPcAABsb2NhAAAr6AAAAIoAAACK1WLI4m1heHAAACx0AAAAIAAAACAA+wx2bmFtZQAALJQAAAF3AAACzcydGx1wb3N0AAAuDAAAAdIAAAKhWz5+kHByZXAAAC/gAAAAZQAAAHvdawOFeJxjYGSexjiBgZWBg6mKaQ8DA0MPhGZ8wGDIyMTAwMTAysyAFQSkuaYwOKix/v/PHPQ/iyGKOYJhGlCYESQHAPboDCp4nN3Su0oDQRQG4H/IRbMmGRDUacQU7k4CtuJ1vb6BWCi2VmLlU+gDpMgzSEKq1D5CyqRbUJhBi2zwgkUknpmTJoWgrQPf/HPYM7sDOwCyADJkFQJuPFElfJ1BAIhn6nigeg0VWhWBKB81ooEu6LKuJ00TmJKpmJqJTceGtpq20naapHYYjsfudVHux25YPd3dH/Wv+gu9Ue+zd7NyocbqS72oR9VVZ0qqsryTt/JcnsjFyUl/PUT+b/3/chTdJK4n1fL0wyjn/qtroGwwdyuiAXO3RBcYqFeXGWiPrjPMAEmTYRYwAQPtMSXmbpSpMMxR1pg7nYkZXG+Hgb5hKWxIk6TUpErrdSBtMWxQthk2KROGLUrLsA0MQ4YdiNesB+xCvF16QAzxDg/Yo5z3gH3KJQ84oNQecEh56gFHEB/3HnD8DVXyhZUAAAAAAAAAAAAAAAAAeJytVmlzE0cQndVhyzY+gg8SNoFZxnKMdlaYywgQxuxKFuAc8pXsQo5dS3bui0/8Bv2aXpFUkW/8tLweHdhgJ1VUKEr9pvftTPfrnl6T0JLEXliPpNx8Kaa2Nmlk50lIN2xajuJD2dkLKVNM/i6Igmi11L7tOCQiEoGqdYUlgtj3yNIk40OPMlq2Jb1qUm7pSXfZGg/qrfr209BRjt0JJTWboUPrkS2pwqgSRTLtkZI2LcPVX0la4ecrzHzVDCWC6CSSxpthDI/kZ+OMVhmtxnYcRZFNlhtFikQzPIgij7JaYp9cMUFA+aAZUl75NKJ8hB+RFXuU0wpxyXaa3/clP+kdzr8k4nqLsiUH/kB2ZAd7pyv5ItLaCuOmnWxHoYrwdH0nxCObk+qf7FFe02jgdkWmJ80IlspXkFj5CWX2D8lq4XzKlzwa1ZKDnAhaL3NiX/IOtB5HTIlrJsiC7o5OiKDul5yh2GP6uPjjvV0sFyEEyDiW9Y5KuBBGKWGzmiRtBDmIkrJFldR6R0yc8jot4i1hv07t6EtntEmoOzGerYeOrZyo5Hg0qdNMpk7tpObRlAZRSjoTPObXAZQf0SSvtrGaxMqjaWwzYySRUKCFc2kqiGUnljQF0Tya0Zu7YZpr16JFmjxQzz16T29uhZs7PaftwD9r/Gd1KqaDvTCdng7ISnyadrlJ0bp+eoZ/JvFD1gIqkS02w5TFQ7Z+B+XlY0uOwmsDbPee8yvoffZEyKSB+BvwHi/VKQVMhZhVUAvdtNa1LMvUalaLVGTquyFNK1/WaQJNOQ59Y1/GOP6vmRlLTAnf78Tp2RGXnrn2Jcg0h9xmXY/mdWqxXYDObM/pNMv2fZ3m2H6g0zzb8zodYWvrdJTthzotsP1Ip2NsL2hBk+47BHIRgVzABhKBsHUQCNtLCIStQiBsFxEI2yICYbuEQNh+jEDYLiMQtpe1rJp+KmkcOxPLAEWIA6M57shlbipXU8mlEq6LRqc25Clyq6SieFb9KwP94pE3rIG1QLpE1vyKSa58VJXjj65oedPEuQKOVX97c1yfEw9lv1j4U/C/2pqqpFeseWRyFXkj0JPjRNcmFY+u6fK5qkfX/4uKDmuBfgOlEAtFWZYNvpmQ8FGn01ANXOUQMxszD9f1umXNz+H8mxghC+h+/DcUGgvcg05ZSVntYK/V149lubcH5bAnWJJivszrW+GLjMxK+0VmKXs+8nnAFTAqlWGrDVyt4M17EvOQ6U3yTBC3FWWDpI3HmSCxgWMeMG++kyAkTF21gdopnLCBvGDMKdjvhENUb5TlcHuhfR6NlH9rV+zIGRVNEPht9kbY67NQ8lusgYQnv9TXQFUhTcW4qYBLI+WGavBhXK3bRjJOoK+o2A3LsooPH0fcd0qOZSD5SBGrR0c/rb1CndS5/coobt87/QiCQWli/va+meKglHe1kmVWbQNTtxqVU9eaw8WrDt3No+57x9knctY03XRP3PS+plW3g4O5WRDt2xyUpUwuqOvDDhuoy82l0OplXJLedg8wLDCg36EVG/9X93H4PFeqCqPjSL2dqB+jz2IM8g84f0f1BejnMUy5hpTne5cTn27cw9kyXcVdrJ/i38CsteZm6RpwQ9MNmIesWh26yg18pwY6PdLcjvQQ8LHuCvEAYBPAYvCJ7lrG8ymA8XzGHB/gc+YwaDKHwRZzGGwzZw1ghzkMdpnDYI85DL5gzjrAl8xhEDKHQcQcBk+YEwA8ZQ6Dr5jD4GvmMPiGOfcBvmUOg5g5DBLmMNjXdGsoc4sXdBeobVAV6MD0Exb3sDjUVBmyv+OFYX9vELN/MIipP2q6PaT+xAtD/dkgpv5iEFN/1XRnSP2NF4b6u0FM/cMgpj7TL8ZymcFfRr5LhQPKLjaf8/fE+wfCGkC2AAEAAf//AA94nI16C3AU17lmn9PP6enp6Znp6R6NRq3RPHqG0Wg0jOYhhBhkSRaKELIsy7pYxjLFFZgIBRPMqlgHWAIUxr4EXMSXS0jKsbLY8TqO1xY4OIkvzvqR2iLOXeIk2Ll2tlxJKoXzsO/muu4SFjX7n+4RKCSuBDSnz+Pv7tP/+f/vf5xDIYq6dp6epbuoKMWdrnehlmakelFAC6oyakU8FzNLxUogRcpkpVxoRKxGz3p/kEdSUPp/VzxBCeV/IDei0B53VNqNQlH0geR9w/qAEdwK4g8c4P0iIyD9Da8UZNOWrltplsLX3+miMpTwYtLH0xjeW2lFXqTzFT1Qm0E89gkzwA9+47dTn/7dN5b8+McWmYsu/uW5xJ6M//Sn8Sd/e//9aK42rcgnTAr+kXm9QI/TIiVQm2Fet0c5TOZVNGMy0grlZFDlvIjjNV1TeRmlYHYcD/+bEUwxZaZgqlCaxUoVVcxWlEOpUrG8EpUrtc42mHu5Av+Xo4LWiDQdvkYnD/MiaBoILx/ZOYLHdoyhiMBvFt2BNMd6hz08v6Yu7OIZZZcgKfX6bZzC9WkMK6RFr7CJF5DIbhZkPenQCmtCYZdA+3bxEvJGtGHWy/erDLNcdm3iRTSxfHR0ZnR0JxlVjGB9gZO54DBiOz3CYEQR+ftcUifLdRmszEkFb6TeiyTepq0LR1t4iVeHHVKvINikbE8ESNfYhBTFAf+2M630p4B/fqqe+hx1lvp3ytclv//qkwf/vq0uqLg5zDkM5VRgKFs0ZaSTGk26DFQo83/K4/hf5HHpBotXoL+BxUHVfiThMQqq8DiNlPazYykZ8c4j4RHwNLgZGvDItgLcrcPD7QeQCfkW32um7Hs/8VZ47+J70ceE8TOj6JvZ9izKdGRR7fqOwI5xUqCRYTzdbo7tCmocz3g2c6InoHczHm6YYROCh7+TFYCQdxNCqVfkuK5AiONpQog8Aa2b9bC3MyGf4OGAEm28gxMjuBexwQa35OazNOqlG0T+jjt4sYEuKojJCD5fRGdwD464oLtGnRFsaubPiCVRukG9IEW/bMjidGNDJoPvgmJ5JvPD+2AyckCvT3IS4+tmCm6us94jcHeCMDHMai/LClkppHmQwN9MKQqdYZvSvdShNIKe+oCEBet/DbkEr7xSxjhdn0TIXURpjKHtFVxDLpfiISOGqyghlNZRigx5FBdugzHnrhQZkoop5yYX3CTcuAkeev0mgaKvXQP9v4Rfo+qoCrWKEs/2dLZEg4huaU76iBTKmIhhK4LlTvlUra2pUA6UoMmlmmIcr4J8MXpboUqvRCCePpXjm2JmxVcsAyGApj/4j3dFEp31OFz15dYeD/olji6DUmKaZrir56E28j4T9UdDEnaHDdVg3zeKq4rJq+cTZVRM0uVk0Y2eVX3bB0KRcFg2B7b7VGtUEEU8Isssi2mJm7jlBRyRNYAEVQnTL4RGSvOzySIqJ/C9yWKRYmx8W4Ovgaaq8I0JytMlRhv0oFfAFNPSrFdSfLAtiIrxGI+4oNpWqKBySkfxEjEJKRt7tR8U9rf1o3sllrF+xHhYBrXSxiUrf4leo95z6R51ubZf5dv2t3WuwrC01lsMlCjHfPaS1foBOtkQvOeDdcHgfo3C1+ZhLvfSbipO5QFrW1L1LoK1paLJx6FIxYGjQSj0oKotB63VgLPlSokUYJliOVxFBYDMr2vyUU1e5VXRUVmDad5ozG3//qX/uZV78OWPv7MHdfTD6FEYAHLVC40jdv2IVvhPr+/Y8fpvSEExMKdX6Z/SiGqB9b+FWk3486nelR2l/BIM/AmYZcAQDiDbQJVCRStX4FpFoPCpkgYVHVRXpgEcmsyUQ6txUKsSdFdrNR1AzUwhxiy6SgBKBl9It9bHNtTVr22QFJrFKBxfutNsYppWjOV7s8EW62ujwW6u3CEEmUxB2ok7uxihvQOdYLo7EMd2FBj8cjKq1b/UEDeeK3aiZIpJJYVGJRpskiKmGGvprgv1qXXbt+5q9HPb0MmWdCjxoyVZ2USNS4xo0+XlscwSRDWHzCar1Uy3UhQNMvJH0IHdlI+KUW2gA/lUverFoAMwbwAzxxxzvIGiIJYmHwNBMVAZLB0sDQvQyEQTBIvLWcToIPV37o0du3AstvfO1e8j5n3r24q7b1LRlN48+Ac/cw9Zl61/tS4Pud1DSEAmEobcqOPALR09m48d29zTccuB7YcOoU8B6eStkoz9Yr5XeTMQ+PzJk58PmOrek/jxPaoz539mEiBLAtVAFWHOLTHdw5M5B4iFMXAZqTzB+prBqBCAhrUgnQTJUblIhuJO9xVAZZyumvhO1fpQW65anw0amYYPGvqD6Kj6dhD6GtSwAgoShJH+ht32QBCvNTLY7EpweetnBhAFSWd/w6WGDDIIYYPdqfjgvuVkyLB7bZ/jeRtzkiBvwoufKsdEogcqsX0pAjowwZJZLJdW4jJfqeIKuBVFW/Z1lawCCFkjbbsjBJXgc1Ia0ZEqUKUMRPunzmzJF/ruDNaDPiKMGJpGYLNl5tYhNHXm4pmpi8O9rCTUuxiWoREWhfrgnX2F/D9ti/rGT3XfOog8/aPoyTUHBl1LdZYRecQwiObgIQYb8ivpHT1DBwYHD7zXM5OSNbHJTbMA7FgQEcPqS10DdKG1eHCgOZPaSfwrzsYfP6yTl2qkWqnlVA91H/EP7h3s6iwvbY7XB9w08Q8AOm17D9BJ7Lj+V9oBX5MPZBBQtopQG3AhzvFskNAAYRwwOOUDJpKFX070lax+I3gKGjJEIQEASoqjN6pHRN6p8mK/JQkCRhewIFgPX6ln2Bc4Bv1WFMrFpJUHZC0RumdTrqw2p2WF1Dfhw89ar5BOdAspP6FuTWLf/EeSKooq3ngLixB7B7xx/qNcb3cOB+xJ3BOMIEO9RyR8I3bpeXoWvw7y7QOuiWdbG71gPEC+WZCTHCobiFTMKjg4AWJ3WHCewOaADDURda3iEh2PAR1gqIE5jYyhjZmODM6Vc+gPNXkfUKX5b/MejLwa9vvm34AFFZQN270qDnmOumROxALCj8sa32Dfx5iNCxXcZf3Co+LemFyvRTRN5kJKBKM3VUNDnKRIGq1RCL7hPH4K/x/qNogzqg0kziBOIOBoWdODzoJWAEZMYkkBSVNEMQFVdCLOYA9iPGdWSvaCl4nPVS5oPKCNRlazAeA1ZeKBZLmc1IJhDeUbjyqyK9i7oRd5fKJ6tCmL/Fqo3iyXzWAwHEK56NGA5JP71vehoKh4jzbmVTWEjvWu78cen+R/tDHn1+rCZrFoaho8Ltf4qCKLau9kFyaPu7spp9arITIcrguqKNd0NxmmIIi49gv6Cv5XapltPf6e2kR5u6RNk+uHV3WvWJ6mWfhosBHgd5pEQWU6lQODB24jOJKpIqh5ua1STBXB7hYawIssg2sc1LwoCJ/IahWCBiogQMoEsxhPan5NBaaViLTblXKAMIduo+n3jOEJEUcxM1bNKLn+yfZiV2ehCx+WGBFzzFewkOPExzkBC4zwvDS2y3oqEmNi4ezTkU5DSHRiAVtVcWyYGeMKz+cxN8aIT2Fhvbjv0X5UGHm5G5sc0/lSuzk4mhO4vo7RroIyGcIcLjOYiWxl4LGbNXhRBn7Gpv73OemiFMnu00Jr+zg/notYH17mmKdOYYbxY02wXkYCkXHWxoZL17FhJcgJ8G51z/I2BxeAd5WamDiaXND+rH0TLtzcDtzUBp3fQnQSiouLq/w0L9rF23+RILdQEbtOkxopHrLO2drdDeW/zF8idRyCEmlXz5MGXYZyIcZ8mHmBLlBLqY0kxlyW1wDvS3YQA9hUJDDuRBTQAm1diDh4jvhABgbfI6g3oRrFonEZ6w5BEPynHAbRSoE6Oc6qqaZvbQgm06gxILfILMNWp5Y1j1ZjNMPILV5fNG027JlU/Cq6egz/D4nFTGHturEiAyYjIXldgGoxw1fo81qcoEl659J6VqBdsie5lPeG3e7AQKo+GUz5O5r9qebKVBVwaCRTqQ9kOvxLAsn61EDAm0v7fZ1gEX8cU6LxlrXtuLiuOR5VYnm5yScCDkY7FZca4h9y82YsI9WZ/lhWFBVO9MYU4Blz7cq1k/S/02GqGfyyMWqC+GV3r+1fWVkaFohfJiM1Tjjk6BX4qYR1pFIp6AUyQKJs8LaAJ2DfSQWZwO+kxgNsEM8W5kyCRo3QAqn9EA1VdPuRXxY47PMyitTn9uAow2UM6JBN7WDxwbCk7owOZ2OMIA7KTKbjMjrpV/OaYm0QhH4JF5RoYXN7dqS3NyQDL/dKEiPFZMbsMLk0ZvxXn7YG/0P15zR0RYhoXg8j+wclCYcYLpLnZEMZ57BQDLV35DDomcDkQwUroSkZ2Y/eEaSq8L3N1bVhKTs01Bfq6Nfa2zk/B5FhIZKuSh2ge/O9l8f+oCo5fy2vcTfoVgKiGuHFlWmFsX2MIHEy7Jj6ug5B8A2WtHA9hg7UdAzkk8DOQiheKZFY2w6vNXp14ldfuv1EZ7+bYP8VWcOuNenJysC+FKezEuiJrCpO78i21U7n/byEEr/+0u0nyU0hxNLo+Heqy/rd9u1axL0mmR6oiu0eCb1U61jjtDmmRmjrEtiU1+gP8AtUCLQJYogGH4khSJqGbyIFAVoSjxMLQUIwkgYgn0rCMuKwNhEzAg4UfUkU5ilR4Pg5lj3NekWaggnatXlSA/2lRBkG/3kLRGnkx82xCjvHAgyIKC0ApcRtgT9BhD/od+b2R6YOeO6nlsDcomGZxU5uzbbKOUSCRBIYpoIQPHoB1Ss1WLLnytT5vxsaM+dnAxHkezk0lsT3BozvWfnS9vjLGCE00Ha6bQC1wm+lP/DzSFqOqaT87+PFJT+neRbjUNvAQJt/wOHT1Wt76HfoAcoD2Cq82KiCIQc4LdvowVVI4gRpFKnbTqStC9SMOTEiJcaOjDJcMURPh61TM+aYIPiNaEwRutIz6PVnYuLwRGLUL4UZrvMZ/HTY6t1hdnNyzIiC7o6aO9CYHXN+B++lMZWlSlQV5A90t2dlR7mtNawwhCEkZIK/66GFzzHugGnBMvF3nSZLskTEOQg4F1VDCxW8d4DLDnXkMpliiOnrm+zr7ydFekNHsWC358+k2zOZ9nRvhJRp9KxzxY8MGx1jxZAsK9F8whgu9PUVhmLowdggqQ3G3jQMv9aZi9rNSDrdkU7P95GyI43XOteFeGkcfDPHbolnmxP1AYmhF+TQ8WIqRPygnaq19VqbX9y+S1WufmTHpbTPC8HsJ7cmV9lVu0RKvx352iWSF0agYfuOML9vMxr+DkT8CfBLxLPFVDQkktgoSXJpoCAQ5BMlAMnUNRXRJO2bQxUIVkm+zAUa42hRylElAFAVrSVpP+sqx4GfrzARjnv3XQ71XsAyFxM4dIGW+DgvoGmgkLkIy777LstGoArUt0ITMXadgyGFee9dTsZD8608mBRaEvAFeICIZeuIddW56d334F3wCmgrjv38CvgJUSoNkZ7wYltLiOSOk0RrSsSCktwBCZEIYKVMkBwv0oJExEgOIdkWjIN5jJfaSm14+szV9xO5ib6cQHwVhhEYbt2v1gEIY1mWsZjrR73Hj0/C396ujqnzshTr69SKeSmcV1QwkGZ5x47yWiEWMRhJypW1zr4PCe1x4Dm6ZgHe3gW6nwdfd0kT8XVrMGqjqIwN2onRCId5koDM4Srt4KktBlf0gA/QsmNqMM+kRzdUu2eWMD5ukMVc53P3/t0T2/qZrp0n7h45saJfacGvAUS2KGvW5AandkwN5jpKHGLXMDI3MIx6dzz+3OM7egEx/QFbFqC4hL9FaTAzkt+6pdTSpIogCwD/hF9F22Ryup2CDcZjeqm4EoMw1BQSpKQBBppyCJVThJJ06sT9JjkbEBP/N7pxPFlqjC7tlzzb88z2ule0E8uSObRu7/jQimMhHJ//payin/XmGuNLl8RvedpfP1PY6p06GOaGU+vaW5fgwO5tbqGirzha93S92BfRx9oGp6cHp4pGn1j/dJLBIXTX1O4Abl5SHVk6LGoHo/josvqSADy/eu1N+hD+AxUGnocEZLvaJAKUEZRxEgGWSEGkXad3KqI2imXlzTdfjcijmqigR5WsgoYVzTovyxIqW+dVFZU1BR1TlAU9+ip9lDZAj9JUJ/BuWS4ZVlhbz+M2dq1AIFeA4RWITHwoGPfZgOYjwgYBu8YH2VpfymcTQl/Qh7sqsWysvT0WDMUQOliJ5qPt7dFcAs9/qRJtjSJo5KMfbfu6HovpX9+G/m/IQFHdcqHbtlki6UP/se3pkIFj2tPb7rf+s93z0P0oZHdZl2x9gckfxd8EJHaBvrh4TBE7lCw1BVESAmf0Y2slvdvqRS9f3Y+2vvWZz1in37JWo2/VfNVX6Rj+DUSdYbg3pEqMrWsgHa125kQpR4kIJBfAmWaMUC4RPTcwsvfcGUR9L2eFDj2/B/6GYpFcNHoucw5R3zq3d+3AM2sP7Zk7uAd0Bd4xBfo8QvXCurX5avtPDjtJ4GM3CAKBbSzZjF5k1NtKMAm7QQAMljvYdt2ku4+4DfVtQEX3UdEQj4Jv0f+2akDvogF3xL1oAE3I7r+FbvGTHft6+dq36N/RAsVRceCT5qFtHrNxIneg4jWbTzLHK1EbTzYpmoh7lWpDHyPm1Lmn8Dt+PxdhEtrVC1qCiYiZxzc8MycwaZRNC8zcMxto4eNrwCprTsz6T6rhsHoyH5reJ2zdKuyjbB7aen2KaiCyzxAeFmx2lNpSPEAe8KjcVtBNO0mn6WV8efLw4clzU88/t/nywPTUoMzhr2wdPxyKoA8PvX7o3K9/fW7zsc1YCk+f2DzCkO+7cm0bHabHqDqqBb4v0xCSsBPKcikvJmBBPq1iAy7xoss5QAnZRjf4YXDFaU5dv6m7a6ZvsxwdlFSsCCrCIdl/ZPvU3LThH500BIFmscb3KHII/EU8ueP7fkl8VXoqwsiMIm8wwmhfoW/qa6q67+XsVFXNSppL4VV2qSQoWKYoCCKvHaNP0Bmww/VUCuKEbmqIuof6NBXs8m+cuPO2NbdWO/NpsymkglcNMUOMNwHCNB3CKp3jTd4uwf2AHmSPAcOgJ2CSKIpQQlQOYzrxjDmeJCogHjcXBpATgxHvqbwClWlNr20Tpcrva2o+Wx5Y18kx1bKyVe1UuwtmTkDDEa2jfXRo59bBsfDUE/sY2ewMG3JoIq3MmEpHIbeTw8fPbR/vlXohFtCOoPXHma7uUFd+UpwMExs1Nt1R3ooui8XBgayZVRROybczG2Lh7TNT+7aurxZCKC9nIkZVToStYmitKoYi2ZwqTB+Qj8s5Rj42li+IicH1zycGHt2H5Q3orUNvalk/184cm1E1MTP/O1Hwx4a7MtITTg7q6rVH6ZN0FjgdAI9WPGuososleyOoDD4uA2ihx7ggR9I1pSIN5o0kI0E1SdSgAzdBStD3zyGFs/7DOmB9yCHpD5kcjkXN3BljuujPh2QxE84bM+1KUZOkRJjOYOuyQymiXch/PB+ORLPRjvnnisVQwnxifUcuHIud2EzBihMMmaXvAJTmKZJBCFA6SEEjaGMbSMJyO5vwABXviq6/Y3VvtbOjvVxsTceiRiQc0lS/Ikvg+zOY8rY06wAp5JdadEU3Xenr+xMqST+V0SL6Sm0MbKI9VqmlIJ2cA/H02hzgcmo6gbhVs7NvzM29sVCiL58+fXFuDj07O3vx9OnXJS4BAYdTftnuujg76xeFOMkrQPF2NnL1w4ZMpqG/mEwkixfLiXiyiFY1ZG6bnZ1NzM3NJWbnX5+9QorEHMrP2g+bJVGNZcLY7OyWRV3Z+RJ5FP5BQ6ZsbzuVa5fMdZw5hU9QQcAZn40ztbz6Agg7SEyf8lpRsKfWb7zeQbieQluhHPRiDULjqBc8MtJUlCfR/Qpcb5YvDdZLPFupv1m+wPUvlU2SN+RVTQ8QHYzHQOsI6Nf2eXkCRl57y9jphWndJHUvGyY2DRyBMvJ0eGqkK93LbFWUIUlRBEkTxaCbk5lphtMiuZtFcN4wI4aZgB9G/bHs0GA4s5lhwpGQqob8miR4ecHnEtQOgZEUVfHHajb0j/QW/BpgUhdgZ2dW5okNVTViFOzkfi3sC+p2ly1YPnu7y8AOe4kpdCL0CpEbskeBNmKEkSDM9UxM9MwJIkSEdtPe7TvDYQ5jzm39CCJyEj/LVyCERq3uHPazsotBEz3oUM+EKLhdnAf89HLC2gk3MlhAWdltXRBV76wmX4RAYpaE7dDh2Olv0YdoP6wOrL1E1h6QXsY5zPGBOA3OrEGX6SlZEdYfGq129M4Mj0++tG58V3977/jTeDMnS48cN8L5aLrbegJfiHWnY70DBRH8tj9e+xx9mV5LJeG5IEDAGy6RMrGTg9HBP4bFxLqWIBlTM8GXyoyuQdxK/90/WVOPHZU/L/jESFedJsic+GnuvgdR+/RwS77H+tVXz6JVQ8UldyiuL8iH/xEdeFz0cz5eD3VGJHHG+t/Tn22Ymfho5viDBbT8kW/+F+vqlLbg503hPPgj9eDnbQA5XFMwIWCinT0Z1UAk2WyvRhUVne0kWDuW5JjAEJRJcjZQrGKQu1IFNENXG2nN1OKqjMFSmlwJkKGKS8UC2TUD97oV28cYcH79hg3rn33nWXJ57ifPWYafEdbtOrBWNtZP7XxUiEh1Devw5MeTzHhLwOeTDAmLnCB5vTg2LuzoLXY/yK1r9ntYiWfw1uzmic51m3IzsaGh2Exu07rOic3ZmejQUJSTBa5YENWyNeA3EnIoss4olMuF6HhzIBjEedHvl0WvouAYGo92M2Y+ZhixvMl0G+uWBGRBlbQFeX4CYpsc1QPyXF0q2Wd3gjdgDmJdnfg8xPqZ8aaaODcVynaQQeyqFkA33LgF0FBp/0SPlScCjS7EDRfN13M8pj2SvdNSTqALySKb4HiacX/eWuZJyP8myyvkhPxF9GloVD1o9QvOvd0TSGYCEFwiurZNU058QWDjHGYQa3XI8r/Z9B5yoweeUPumQC33LLwYCQi2/7Zo6vBdpu77k2/U8GcXzay468bku9fj166/mQzedX1kAq2nFu19J+y8VS5t730nIYKqlEkYFfOCqEPBqY0g/lBohZUQnBdIjnjx5vfnxY0bRbEN3NuNG92GWHC74eouiAZcobNNfGfRHvj7MhltcC9QQfVP219YtBVu6/tH+Cf4IMyRO60RrE/WXHH+poxAI6rcSCDgnziIf8pBeLgqN9pe76lT3m0aqTz5pPfPCb05QmC/+4/2PmEc3h121eLnFPH+CWJWSrW9IRsO7R1BYkZpf1S7FNW2aFF0CQQQGoa+BSqXoOMs6f1Ag97gB9d7Cbnjvy+sR5CKkfxYnc/Oj968FBo5D6EvXoAfAtsi0i/3QFEQxfPAc0DZw4sPHrykkGUBCliWRqAAAnH1IkaTb/0u/Qy8OwXfGsfwrT7bWedtE0BCLa0SsK2e6Zws4hdM7rHNt3fL4CRLEr2MYfhXec6zRhKZkWU99z2GVlr/rW4gbD3Thf33HWu9IilIkZ6VsAu5XbIino0eu2+i3/qMYaAv9tv7i8R/8gC/s9StgHkrWjOpsEAv4ntqMd9tR+Y633WAQc5AVYTs4AzUHtjDGFgnuQG8XOR3E+dFQrttN2O3vbFKGv2PvXmcOfKTwyiW6VRfmfzc8LHNXbhz+sipw9va6VtfCaLHnLtI/tW5azdxeXaLdfcdw8fPn+AOWycbMsFXbq1OPfq1I1s7mO5Nx9d8bvKV4MKeqfNNXjs7LJ5dUq8F3PTCN9XybiQB+1fnb52zZ466/9Y525P969PknLMWsPaO31pPNYOv6uuSK/l0o644PikHitdUakrBL0l80JuShoFFH1OptflFH4eXo03WyYu4c/51tPHtt5GhyVfXO3nEJ+zLJ7a6+i+uenvV/KXaSRmvnV2sHbJx8o618zTgYFC2HX+BDoGfoxL/gLfzLzzy1c7ZAWgik0yI9rp81u81nveKR0Xr9/5ACJ/X8Td1xfq9tUEXaQipvWA7AkqLk0NfOI9VBr0sxBkbl6+frNLIURwMbra91wPYyBH/T8YpstkNltVJBNqnry7VDlLVNZ4fjJq99TjSnW6892w0VF7yVrEkxaJuLBkJd+mL6/3xTpRrpsuJIvq+dauD4d+NBB+uhMIRFI7ovbu0V7LDDcfiKZcflloVUhu7ZX0k0dxRdHzk2j7mncCHbho5eeCFbUoIEZpsnan12ctY6yOOxaI+sr43FM65BVQRPoa30Q6gbo5gWMn6ZcmGuzm7JE3SXWtlwGH5k2HU0JBF0HPyNKGCAm3ZYuif0ADSP2lnjC1GzUcC3XKD5WQhvhLP5mSGxhTJhTX5XKjJyXZe/+ymWurN2WMqXd/lIJtHYDR85ChGBQ1aX4bfGbzf1vYtgmgZwoLGkyZ692FWEdlHoOsQEP4Qfg9vuUGBfmFT7SZbt7sfYd0y97CVFCmGyBDTap8NcjL0ni4xm2jUvSJHM45TZxIXDgWbShUdJWtGn5ztS9WM/sIxvop9bKI6XoU/3Hn1w7lxcAaNq/ttdKBtoLodxGy/c15vd7KIfS1V3D3W1WVZV7acvgs1zIrC/Li9OfwULwXmx53DeU+Ry/XzxwFagnmmQd7NmIztWIGrHeNg9QLJpmAIDViaeKHkwAftH+mxQj0jjOQ3zI4m1swODgzkY3ysPR1RRe7Mnuf3MjtfmunuGRrqMdq7y+2xMA4ZIfjTzGJHtRNdXLsHaPAue11fA9ntgnirQn0W1vUzw0t05+wXx6dydOr6IhZuJOliHDiwbKpcMZjKQvbNd2NUxvbedE0tF26vYhKaVdnrd6AdsWZVMMI5zVnQf8D/Yu+/5Q0jnPLkQulwwtPULClGOBs6au/F2cNH67PRsOSvU0IJ/xK93G06d9dnEqriC0ekRCJX7ko7N+C+4sYlihkG15lIyvwbtX07jGkkippmqsXJOiOjqtjZxEO/qxEosURdbEWy0BtsDYc0ZN/tjybq4iuq4a58NqqghV2/mn+M94O88bYvGZJszAo0leyzzmxNnEC0HB2vafNp1EAOB6MLUW3+A1tRfWBpsB+qT04vH8XDK2atc7b7grpBEac3PfbYpmmjFq98hz5Bf4qKUMuocVizoeqSppC9/2T7L7xOknBkMxQgES04k+UF56bm16RymABOgdCW0fWcayW12E/XwCA68X3Wu0PJKRotIRyFyEtmtIDygLdFGfFaO70PgEc3oig7vDmfTouMobtkmdb96OP8SO6h3AO5pUvzD7XuaG0daT3Yur211vqGDo/0a7TCeWHCjMhovpx3h9d7u4K+qikPKN4RbxYeCU+UZRdwgBFp3Wcd6cnd3pp/oPWh/NKl8JCDuZFc647cIadl82bGjlUEsEo54E1jnd/NEXmu2OcCUaGcXPhSaCWdU/2mncK3j+UHyRluWKOLqqFhf0xBU9b+YIe2PBhEu7RRdEKq33cbOakY7atzuf7rNM6sbvKKDRA0+6OqesXar6or1OUa2lUZ/bmWXD2Bjl14FKsK5+cndnfiuhZVBD9lwfdUqSZ7js3JxpCy4KfcON6yYAXAWZFpA/zPxZEA+lgU5hwgJGfXLo088tThYTx66JmDY59b5I3i2BUCj0DxOhC/eccjIFhHvnYEKB+5Y5FP6pw3u4tWKBcgQRzmFNXBsbRxoJhCEOdWMWtvZCFeTUJkm6OJv4Tfy1t3D45Xtw0X5t9CT65ed8fhYYTf693+xLNf29aHu3c8/vxXZrrQ+vEBa12hMLz90+jJwvCjw3ffvfaJ7TA885UzJ3dWuYHpp6j/Dw7kfPMAAAB4nGNgZGBgAGK5WxOF4/ltvjJwM78AijBcsj3uBqHniv3/8T+LZSNzBJDLwcAEEgUAUnYMjAAAAHicY2BkYGAO+p/FEMWykYHh/zMgCRRBAS4AhjgFrgAAeJxjfsHAwLwAiiMZGFj0gfQLCBuML0P4cHFBiFqmZUD6JVRuI5IemNpDQDUNWMwE0S1IdopCxWCYB4hnQPECqBiM3QLhMxlA+YJQMwWR2CuRzIa5F2b2AqhboGJMTah+B2EAhNsmqwAAAAAAADoAhgEmAoYC9gM8A4YECARiBMAFNgXSBjQGpgdEB7gIUgjyCV4JrAnyCjAKoArwC1gLqgv2DGQMlAzwDQ4NQA2iDeIOEg5kDxQPYhAWEEQQsBEUEUARiBIYEoISuhMME0oTghPAFAIUbBS+FSQVThWoFhoWcBbGFwYXqBfgGG4YwBkKGUsAAAABAAAARAD0AA8AAAAAAAIAAAAQAHMAAAA0C3AAAAAAeJx1kc1Kw0AURr9pa9UWVBTceldSEdMf6EYQCpW60U2RbiWNaZKSZspkWuhr+A4+jC/hs/g1nYq0mJDMuWfu3LmZADjHNxQ2V5fPhhWOGG24hEM8OC7TPzqukJ8dH6COV8dV+jfHNdwiclzHBT5YQVWOGU3x6VjhTJ06LuFEXTku0985rpAfHB/gUr04rtIHjmsYqdxxHdfqq6/nK5NEsZVG/0Y6rXZXxivRVEnmp+IvbKxNLj2Z6MyGaaq9QM+2PAyjReqbbbgdR6HJE51J22tt1VOYhca34fu6er6MOtZOZGL0TAYuQ+ZGT8PAerG18/tm8+9+6ENjjhUMEh5VDAtBg/aGYwcttPkjBGNmCDM3WQky+EhpfCy4Ii5mcsY9PhNGGW3IjJTsIeB7tueHpIjrU1Yxe7O78Yi03iMpvLAvj93tZj2RsiLTL+z7b+85ltytQ2u5at2lKboSDHZqCM9jPTelCei94lQs7T2avP/5vh/gZIRNAHicbVHXktswDNTaVHHJpffeq5JcyqXnUu5HaAoqI5hUWOLYXx/JnstTMMPFABxggUU0inY2jf5vR1GEEcYQiJEgRYYJpphhjhPYw0mcwmmcwVmcw3lcwEVcwmVcwVVcw3XcwE3cwm3cwV3cw308wEM8wmM8wVM8Q47neIGX2McrvMYbvMUB3uE9PuAjPuEzvuArDvEN3/EDP3EknJd2OkBOy86vx8pUaf9yyV4sZcNJR1o1PO84uFw1VjEVY+l4TGsSXlZOqFr62Fvp6mQhXUs+6cJmw5Sx1FWQFSWuqbTkODiyLvbGsJtIa82qb7jK6E/fQFc0Kw0XZHPTE8YLG1w9K9ms8oWVWtViSToIZQrKhja5LIqRWsWVNaETtVnShH4Fyc2GbDKMne8njqQdCs1vSkLHRhbzncsVm1CMW1qnmvzK2Hav0aU53i7fz5Rk0oW0I9POa+Lu+CthU5ngRcmyil3X6INJbYKtWDoXq5pUO9viTss91U9O/K94F4pByalpj9M9gbS+X9O0pNONMcu80dnW91Sx7yV1SdmwJ5ttN+svk7rG01J2QlnTpV2jfLAkBmFSV4eyZBJsVCu40W2ysv0F61gNmXgxYBT9Ba0XvBgAAHicY/DewXAiKGIjI2Nf5AbGnRwMHAzJBRsZWJ02MjBoQWgOFHonAwMDJzKLmcFlowpjR2DEBoeOiI3MKS4b1UC8XRwNDIwsDh3JIREgJZFAsJGBR2sH4//WDSy9G5kYXAAH0yK4AAAA') format('woff'),
+       url('data:application/octet-stream;base64,AAEAAAAOAIAAAwBgT1MvMnwtYSoAAADsAAAAVmNtYXCdxeuOAAABRAAAA1ZjdnQgAAAAAAAAPsgAAAAKZnBnbYiQkFkAAD7UAAALcGdhc3AAAAAQAAA+wAAAAAhnbHlmb9Zo6QAABJwAADKWaGVhZAhDqAMAADc0AAAANmhoZWEIYARGAAA3bAAAACRobXR489wAAAAAN5AAAAEQbG9jYdViyOIAADigAAAAim1heHAA+wx2AAA5LAAAACBuYW1lzJ0bHQAAOUwAAALNcG9zdFs+fpAAADwcAAACoXByZXDdawOFAABKRAAAAHsAAQOWAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABAJgX//wNS/2oAWgNYAJYAAAABAAAAAAAAAAAABAAAAAMAAAAkAAEAAAAAAOQAAwABAAAAJAADAAoAAAHqAAQAwAAAACwAIAAEAAwAACYGJpkm7ycJJw4nleCt5wrnDecg5ynnPee26CXoKPCu8LDw4PDo8SX//wAAAAAmBSaZJu8nCScOJ5XgrecK5w3nIOcp5z3ntugA6CfwrvCw8ODw6PEl//8AANn82WrZFdj82PjYch9bGP8Y/RjrGOMY0BhYGA8YDg+JD4gPWQ9SDxYAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAFsAAAAAAAAAB0AAAAAAAAAAAAAAAAAACYFAAAmBgAAAAEAACaZAAAmmQAAAAMAACbvAAAm7wAAAAQAACcJAAAnCQAAAAUAACcOAAAnDgAAAAYAACeVAAAnlQAAAAcAAOCtAADgrQAAAAgAAOcKAADnCgAAAAkAAOcNAADnDQAAAAoAAOcgAADnIAAAAAsAAOcpAADnKQAAAAwAAOc9AADnPQAAAA0AAOe2AADntgAAAA4AAOgAAADoJQAAAA8AAOgnAADoKAAAADUAAPCuAADwrgAAADcAAPCwAADwsAAAADgAAPDgAADw4AAAADkAAPDoAADw6AAAADoAAPElAADxJQAAADsAAfMEAAHzBAAAADwAAfRkAAH0ZAAAAD0AAfUAAAH1AAAAAD4AAfUSAAH1EgAAAD8AAfUXAAH1FwAAAEAAAfUnAAH1JwAAAEEAAfVUAAH1VAAAAEIAAfarAAH2qwAAAEMAAAABAAD/ygOhA0AAIAAGsxsJAS0rARQPARMWFRQOAS8BBwYiJjU0NxMnJjU0NyU3NjIfAQUWA6EPyzABDBUM+/oNFQwBMMsOHwEYfgsgDH0BGCAB6QwPxf7pBAgLEAEHhIQHEgoECAEXxQ8MFQUo/hcX/igFAAIAAP/KA6EDQAAJACoACLUlEQcDAi0rATcvAQ8BFwc3FxMUDwETFhUUIyIvAQcGIiY1NDcTJyY1NDclNzYyHwEFFgJ6q+tqaeyrKdPT/g/LMAEXCgz7+g0VDAEwyw4fARh+CyAMfQEYIAEipSPV1SOl629vAbIMD8X+6QQIHAeEhAcSCgQIARfFDwwVBSj+Fxf+KAUAAAAAAgAA/7EDWgMKAAgAaAAItVEgBgICLSsBNCYiDgEWMjYlFRQGDwEGBxYXFhQHDgEnIi8BBgcGBwYrASImNScmJwcGIicmJyY0Nz4BNyYvAS4BJzU0Nj8BNjcmJyY0Nz4BMzIfATY3Njc2OwEyFh8BFhc3NjIXFhcWFA8BFh8BHgECO1J4UgJWdFYBHAgHaAoLEygGBQ9QDQcHTRkaCQcEEHwIDBAbF08GEAZGFgQFCCgKDwhmBwgBCgVoCA4XJQYFD1ANBwhNGBoJCAMRfAcMAQ8cFlAFDwdIFAQEOw4JZgcKAV47VFR2VFR4fAcMARAeFRsyBg4GFVABBTwNCEwcEAoHZwkMPAUGQB4FDgYMMg8cGw8BDAd8BwwBEBkaIC0HDAcUUAU8DQhMHA8ICGcJDDwFBUMcBQ4GTRwbDwEMAAAGAAD/cgQvA0kACAASABsAewC3APMAEUAO4MKlhmMzGRUQCwYCBi0rATQmIgYUFjI2BTQmDgEXFBYyNgM0JiIGHgEyNgcVFAYPAQYHFhcWFAcOASMiLwEGBwYHBisBIiY1JyYnBwYiJyY1NDc+ATcmLwEuAT0BNDY/ATY3JicmNDc+ATMyHwE2NzY3NjsBMhYfARYXNzYyFxYVFA8BBgcWHwEeAQEVFAcGBxYVFAcGIyIvAQYiJw4BByInJjU0NyYnJj0BNDc2NyY1ND8BNjMyFhc3FzY/ATIXFhUUBxYXFhEVFAcGBxYVFAcGIyImJwYiJw4BIicmNTQ3JicmPQE0NzY3JjU0PwE2MzIWFzYyFzY/ATIXFhUUBxYXFgH0VHZUVHZUAa0sOCwBKjosASw4LAEqOizYCAVWBgwTHwQEDUILBgVAFRYGBwQNaAYKDRMXQgQNBlAEBSQIDQdVBQgIBVYHCxMfBAQMRAoGBkATGAYHAw1oBgoBDRMWQgUNBVEEGBEIDQZVBQgBZVMGChwCRAEFFR0LDAsHLAMBRAMdCgdTUwcKHQM0EAEEKggRERwXBAJDAhwJB1NTBgocAkQBBSoICwwLBywERAMdCgdTUwcKHQM0EAEEKggMCgwcFwQCQwIcCQdTAV47VFR2VFTjHSwCKB8dKioCWR0qKjsqKs1nBgoBDhMXGyUGDAQRQgQyCwY8Gw0IBlUGDDIEBEsPBQUILAwYFg0BCAdnBgoBDhMXGyUGDAQRQgQyCgg8Gg0IBlUGCzEEBEsPBQUeFQ0bEwwCCP7PTgkIDw4/DgICKBslAQELNAEoAgIOPw4PCAlOCQkQDT8OAgIeCTQMAQEoFwEnAgIOPw0QCQIzTgkJDw4/DgICJzQMAQEMNCcCAg4/Dg8JCU4JCBANPw4CAh4JNAwCAigXAScCAg4/DRAIAAP///+xA+gCwwAZADcARwAKt0M8LSAVAQMtKyURBgcGBw4CKwEiJi8BJicmJxEUFjMhMjYTNS8BJgYnISIGBxQfAR4EFzMyPgM/AT4BNxEUBgchIiY3ETQ2MyEyFgOhEhWVWRwkPBsCGj4RLliWFRIMBgM2BwoBAgMDBAb8ygcKAVLgBCASIBgMAgsaHhQeBeAeNEc0JfzKJDYBNCUDNiU0CwGsFBFyShgcGhoOJkpyERT+VAgKCgJSDg4FBQIDDAZeQbECHA4WCAEKFBAaA7EYUjX9oSU0ATYkAl8lNDQABAAA/7EDTQL/AAYAFAAZACQADUAKIB0XFQ8IAgAELSsXNycHFTMVATQjIgcBBhUUMzI3ATYnFwEjNQEUDwEnNzYyHwEWyzKDM0gBXwwFBP7RBA0FBAEvAx7o/jDoA00UXehdFDsWgxQHM4MzPEcCBgwE/tIEBgwEAS4Ecej+L+kBmh0VXelcFRWDFgAC//3/sQNfAwsAIwAwAAi1LScbCQItKwE1NCYHIzU0JicjIgYHFSMiBhcVFBY7ARUUFhczMjY3NTMyNjcUDgEiLgI+ATIeAQKnFg6PFg5HDxQBjw4WARQPjxYORw8UAY8OFrJyxujIbgZ6vPS6fgE6SA4WAY8PFAEWDo8UD0gOFo4PFAEWDo4WMnXEdHTE6sR0dMQABP/9/8ID1QMBAC0ANwBBAEsADUAKSUQ/OjUwKQIELSsTJjYWHwEGFxYXHgE3MjcWNjceATc+AT8BNic1Fjc+ARcWBgcOAwcGIyEmJxMmNhYfARYGJicTPgEWHwEUBiYnEz4BFhcHDgEmJwEEJjQJNQ8BBh4HMigvGyJiGRtYHQwQAwUCARojMXgmIQQhPVYwRCwVLf6iVBVCBjY6CBUEKjIMeAI8QAQIODoBmARCOgEGBToyBAK8JSAWG7gdIx6uNDwBJScEJyUIHxAgFSEMHCYKIi1CGRhGFBlybnwfEgZwAZotKBgk0SksDiYBHykeICH4OyIqKQEAKxgmIf4vJigvAAADAAD/+QPoAn0AEQAiADMACrcwJxsUDwIDLSsBJicWFRQGIiY1NDcGBx4BIDYBNCYHIgYVFB4BNjU0NjMyNgUUBwYEICQnJjQ3NiwBBBcWA6FVgCKS0JIigFVL4AEE4P65EAtGZBAWEEQwCxAB2QtO/vj+2v74TgsLTgEIASYBCE4LATqEQTpDaJKSaEM6QYRyiIgBSQsQAWRFDA4CEgowRBDMExOBmpqBEyYUgJoCnn4UAAADAAD/vQQkAwsACAAdADQACrctIhcNBwIDLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFhcUBwEGIyImJwE2NCcBLgEjMzIWFwEW+io6LAIoPiYCVRT+7hY7FP5xFR4qHekdSBUBjxTXFf7uFh0UGhABBhUV/nEVSB19HUgVAY8VAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUdHhX+7hUQEQEGFTsVAY8VHh4V/nEVAAIAAP+wA+gCwwAlAEsACLVJNiIKAi0rARQOASMiJwYHBgcjIiY1JjQ2NT8CNgc3PgI3LgEnND4BMh4BFxQGBx4BHwEWHwMUBw4BJyYnJicGIyInFjMyNjc+ASc0Jx4BAxJqtGswMkZVFRsCBgwBAgEEAwMBHAUODgRFTgFqtNa0atZQRAUMCBsJBAUEAwECCggbFVVGMjCXcCARWqRCRUwBDUhUAaVNhEwJMRcFBAoHAQQEAQMGAwMBHgUYEhAodENOhExMhNxDdicOFgohCwMFBgoBAggKAQQFFzEJSgMyLzSGSisqJ3gAAAAABgAA/7EDEgMLAA8AHwAvADsAQwBnABFADl9MQDw2MSsjGxMLAwYtKwERFAYrASImNRE0NjsBMhYXERQGKwEiJjURNDY7ATIWFxEUBisBIiY1ETQ2OwEyFhMRIREUHgEzITI+AQEzJyYnIwYHBRUUBisBERQGIyEiJicRIyImPQE0NjsBNz4BNzMyFh8BMzIWAR4KCCQICgoIJAgKjwoIJAgKCggkCAqOCgckCAoKCCQHCkj+DAgIAgHQAggI/on6GwQFsQYEAesKCDY0Jf4wJTQBNQgKCgisJwksFrIWLAgnrQgKAbf+vwgKCggBQQgKCgj+vwgKCggBQQgKCgj+vwgKCggBQQgKCv5kAhH97wwUCgoUAmVBBQEBBVMkCAr97y5EQi4CEwoIJAgKXRUcAR4UXQoAAAAAA////7ADoQLEAAgAEQA7AAq3Lx8PDAYDAy0rBRQOAS4BNh4BBRQOASY+AR4BExEUBgcFFhQHITIWDgEjISImNTQ+AjUDIyIuATYXMzIeAgYWByEyFgFlKjoqAi42LgHyKjosAig+JkoUDP25Bw0CAQ8WAhIR/cUOFgoIEGJyDxQCGA2PCQ4GCgIIAQKeDhYHHSoCLjYuBCYfHSoCLjYuBCYCQP7iDRQCRCIOGxYcFhYOBhgQHAIBzBQeFgEGDBAMFgMWAAH////KAqYC8QBPAAazPh0BLSsBIgYUFjcyNzYWFxUUBisBIiY3NjU0JiIGBxQXFgYnIyImJzU0NhcWMzI2NCYnIgcGJjc1NDY7ATI2JyY1NDYyFgcUBwYWNzMyFh0BFAYnJgJKJTY2JRYVGhYBMB+PEA4JFURiRAENEQoUjyEsARIWGBsmNjYmFRUaGAEuII8TDBEORmBGARUKEA+PHzAUFBgBkkRgSAINEQwSkB8uEhYZGiY0NCYWFhoWAS4fkBAOChREZEACDREKFFshLhQbFBgmNDQmGhkVFAEuIVsQDgoUAAUAAP/iA/oC2gA5AEEASwBjAGYAD0AMZmRgUEdCPTsoAwUtKwEWBgciLwEmNz4BJw4DJy4BNTQ3NjcnDgEnNCY1JjYzNzQnNDMyNzIdATYzNhcUFhUWDwEVMzIWBRY3JwYHBhQ3PgInJiMiBiMlFhIWFCsBIjUnIwYHFCsBIjU2EzY7ATIDMwMD3B5QXgoCIAIEVj4qEC5IZDg0QDwyQAKMDAQKAgYEnAIILgYKngYIAggECLAMVnz+phwiBCIaLKgcPB4IJDwCCAL+PgpWUARWBjKwMAIGVgQKpgIIYAqCkEgBMlK8QgImBgQ8uDgmTFQuCAZGOlRAMhBkGAIGAjYEAgQcbgQIAghoFgQKAioECgIeZkjgBgzWDBwsghYYWEYGEgKyHP7u+AYEpqQCBAQSAhYI/rwBCAAAAAAFAAD/sQPoAwsADwAfAC8APwBPAA9ADEtDOzMrIxsTCwMFLSs3FRQGKwEiJj0BNDY7ATIWNxUUBisBIiY9ATQ2OwEyFjcRFAYrASImNRE0NjsBMhY3ERQGKwEiJjURNDY7ATIWExEUBisBIiY1ETQ2OwEyFo8KCGsICgoIawgK1goIawgKCghrCArWCgdsBwoKB2wHCtcKCGsICgoIawgK1goIawgKCghrCAouawgKCghrCAoKQLMICgoIswgKCof+vggKCggBQggKCs796AgKCggCGAgKCgEW/MoICgoIAzYICgoAAAAAAgAA/4kEsQMyADEAZQAItVE5MBYCLSs1Nj8BNjc+ATc0JyYnJjU0NyYnJj4BNzIeAgcGBxYVFAcGBwYVFBYXHgIXHgEVFyEBNDcmJyY+AR4CBwYHFhUUBwYHDgIXFBYXHgIXFSM1NC4CJy4BJzY1NC8BJicmJyYUKEUdFSUoAR8TDi0OBQQFPmo5K1Q+IgMEBA4tDxEgKCYdfmQQEhQB/JICwQwFAgQyWFxWNAQCBgwkDA8JCAoBIh4RMkYP/gYIFgwXPDEbBQgDCQ4NJTEHDxoLCxNKJxslFScSOisSJys3aj4BJj5SKjcbEyo6EikTJRsnShMPLigSETwVFQHTIhAgIy1YOAI0XCsjIBAiMA4hEQoMFAogPBAJFBgHhwsHJiIqDBkmEiIsCgoQBgoPIhAAAAAE//r/mgPzAxoAKwA3AFYAXgANQApbWEg/NzEaCAQtKxMOARQjBwYHBi8BJjc+ATc2Mj4BNzI+ATc2NzIXMgcGBwYXFhcWDwEGJy4BFwEWDwEGJwEmPwE2JRYHBicmDwEnNz4BJjc2NzYWBwYHBhYXFjc+ATc2FgE3FwcGLwEmmwgGAhEPBBAMRgsNAiAEBioeCAYCDiYWhjR6GgwUeCBQLCIECApMDgQqOvgBmhIUMBYQ/mIICEgMAjIQIDJoOCxSREQYDgIGDIAMDAQMIg4EJjomBigCBBL8qP5M9hQSLhYB+ggcFg8NBA4STAwMAhgEBhwwBg4eEFoGAgg0GDg6LgIIBkYIBDAYMv4kFhAqDhIB2AgMPgjAaD5YGgwsTk5GGDpIFjg4BhIGDEQKMhwoPgw6BAoC/UT4VvIUEC4SAAIAAP+xA1sDCwAkAEcACLU/KBAEAi0rARQVDgEjIiYnBwYiJj0BNDY7ATIWBg8BHgEzMjY3Njc2OwEyFhMVFAYrASImNj8BJiMiBgcGBwYrASImNzU+ATMyFhc3NjIWA0sk5JlRmDxICxwWFg76DhYCCU0oZDdKgicGFwUMawgKDhQQ+g4WAglNUnBLgicGFwUMbwcMASTmmVGaPEgLHBgBBQMBlro+OUgLFg76DhYWHAtNJShKPgo4DQwBuPoOFhYcC01NSj4KOA0MBgSWuj45SAsWAAAAAAL////DA+kCsQAYADEACLUtHREJAi0rJRUUBgchFRQGByIvASY0PwE2MhYdASEyFgMUDwEGIiY9ASEiJjc1NDYzITU0NjIfARYD6AoI/QAKCAYHsgUFswUPCgMABwwBBbMFDwr9AAcMAQoIAwAKDgeyBb1rBwoBawcKAQayBRAFsgUKCGsKASgIBbMFDAZrDAZrCAprCAoFsgUAAAL////5BBkDCwASACkACLUgGg4FAi0rARQPAQ4BIyEiLgE/AT4BMyEyFicVISIGDwInJjcRNDY7ATIWHQEhMhYEGRK7GFYm/aETHAERvBhWJQJfEx7A/jA1ciO8AgEBAUozszNKAS8zSgE/EhPdHCgOIhTdHCgOr1o0Kd0DBwUCAhgzSkozEkoAAAAAAv/8/34D2ANKAA0AHwAItR8UCAECLSs3Nh4CBwYHBjc0Nz4BARYABwYHBicmJyYnJjc2NzYAdiZeUgwkVo5UBAY0GANsGv6kdiZWCAgSHiAiEAhAKHYBxKoiClBeJFQSDBoEBjyqAqga/kR0JkIGDiIeIBAGClQmdAFWAAQAAP+6AoADAgAsADUAPgBHAA1ACkM/OjYzLxoQBC0rARQHDgMHDgMHFhUUBiImNTQ3ESY1NDYyFhUUBxU2Nz4CNyY1NDYyFgUUFjI2NCYiBhMyNjQmIgYUFgEyNjQmIgYUFgKASgYsTjouKio0GARGRmRGSEhGZEZIKGI6NDIERkZkRv20KDgqKjgoRBwqKjgoKAGsHCoqOCgoAopQHjpWNBgODhAgMCQeUDJGRjJOIgF6IkwyRkYyTCLMHh4SFjwuIEwyRkYyHCgoOigo/UYoOigoOigCWCg6KCg6KAAAAwAA//kDWgLEAA8AHwAvAAq3KyQbEwwEAy0rJRUUBgchIiYnNTQ2NyEyFgMVFAYnISImJzU0NhchMhYDFRQGByEiJic1NDYXITIWA1kUEPzvDxQBFg4DEQ8WARQQ/O8PFAEWDgMRDxYBFBD87w8UARYOAxEPFmRHDxQBFg5HDxQBFgEQSA4WARQPSA4WARQBDkcPFAEWDkcPFgEUAAAAAAMAAP+5BBYCugAUACQAOQAKtzQnIBgKAgMtKyUHBiInASY0NwE2Mh8BFhQPARcWFAEDDgEvAS4BNxM+AR8BHgEJAQYiLwEmND8BJyY0PwE2MhcBFhQBWBwFDgb+/AYGAQQFEAQcBgbb2wYBRNACDgYiCAYB0AMMByMHCAFs/vwGDgYcBQXb2wUFHAYOBgEEBUUcBQUBBAYOBgEEBgYcBRAE3NsGDgJO/S8HCAMJAwwIAtAIBgEKAg7+jv78BQUcBg4G29wFDgYcBgb+/AUQAAACAAD/nAPoAyAAKAA0AAi1My0YAwItKyUWHQEhNTY3PgE1NCYnLgEnNDY/ASYnJjYyFg8BFhUOAwcOARUUFiUzFSMVIzUjNTM1MwJstPzgJC5eRi4IAioECgQECAQGXORcBA4SAg4ODgIKLkgBRJaWZJaWZIBAOmrKDgwiRjwWNDAMGjAQFAIEMiY2dHQ2WAgiHB4EDAwuNhY8Ru5klpZklgAAAAH//v+xA1kDCwAwAAazKSEBLSsBFRQGKwEiJj8BJiMiDgIeAzMyNjc+AR8BHgEHDgEHIi4CPgMzMhYXNzYWA1kUEPoXExFNUnA6akwwBChUYj5CdikEEQZMBQIGPK5fV6BwSARAeJhbUpg9SBAtAsP6DhYtEE1NLkxqdGpMLjo1BgEFTQQOBkpQAUR0nq6edEQ+OUgSEwAAAwAAAAAD6AK2ABYAMABHAAq3QTUtIRQKAy0rPQE0PwEmJzQ3NjcyFwYXBg8BBgcVIyIXNTQ/Ai4BNzQ2MhYVFAcfARYdAQYHIS4BATYnNjcyFxYVFAcXFh0BFAcjNTQvASYSq0ICIyU1HyAxSAwNcjAEchm/Fpg5JS4BXIBaTj2SGAIj/eMOFAHZRC4fIzEpI0GoEht2Mm4PaoYaBlAnXDgvKQITfXALCDcXPY8ZqBsKRhwXVjNMbGxMajQeRgobqCUEAhgBWWp9EwIrKT5SMVAKFoYgAo85GzUIAAH//P/MA4gC8gAaAAazGAgBLSsBFgYrAREUDgErAREjESMiJjURIyImNwE2MhcDeBAKFlQCDhDMzMIcDlQWChABkBAsEAFQEBb+yg4ODAE2/soUFAE2FhABkhAQAAAAAAMAAP+fA48DHgAUACgAPAAKtzkuJRoQBQMtKyUVIxUUBiImPQEjNTMRNDY3MhYHEQEVIxEUBiImNREjNTM1ND4BFgcVBRUjERQGIiYnESM1MxE0PgEWFRECQDciLCI4OCIVGCIBAYY3IDAgODggLiQC/Zk3IC8gATg4IDAg73CnFyIiF6dwAfcYHgEgF/4JAU9w/goXIiIXAfZwqBgeAiIWqHBv/nkXIiIXAYdvARgYHgIiFv7oAAACAAAAAAOPAq0ABAAJAAi1CQcCAAItKwElNSEVASURIREB0/4/A33+RAG8/IMBbtJtbf6z0v5LAbYAAAACAAD/wgMiAuoAEQAaAAi1GBQMBAItKyUWDwEGLwEGIyImEDYgFhUUByUUFjI2NCYiBgMEHhguJCC+SlKAvrQBAMAu/hiIsH6IsH5OIhwuICC+Kr4BALa+gFhKqliIfrKGfgAAAQAA/2oD6ANSAEQABrMzEQEtKwEUDwEGIiY9ASMVMzIWFA8BBiIvASY0NjsBNSMVFAYiLwEmND8BNjIWHQEzNSMiJjQ/ATYyHwEWFAYrARUzNTQ2Mh8BFgPoC44LHhTXSA4WC48KHgqPCxYOSNcUHguOCwuOCx4U10gOFguPCxwLjwsWDkjXFB4LjgsBXg4LjwsWDkjXFB4LjgsLjgseFNdIDhYLjwscC48LFg5I1xQeC44LC44LHhTXSA4WC48KAAAAAAL/+P+2A+wDCAAGACMACLUWDQMAAi0rAQUjESMRIwEeAQ8BDgEjISImLwEmPwEzBzMyHwEhNzY7ASczAfQBBKS+pgLYEhIGHAQkFvzQFiQEHAoqnmKqsggEKAEsKAgEsqpiAwj0/wABAP6yCiwSmhQaGhSaMBhsgghubgiCAAAAAQAAAAAD6AKkAB0ABrMYBAEtKwEyFhQGKwE1MycHMxUjIiY0NjMyFyY1NDYzMhYXNgL4ZIyMZL5qsK5o+EpsakwOBgKcblqMGBwB7ojEiL7m5r5okmgCDBpsmGhSBAAAAv/6/3ADGgNWABkALQAItSodGAwCLSsBFgYHBicPAgYPAQYmLwEmNwEmJyY2NzYWBzYuAQYHDgEfAR4BHwEeAjI+AQMGFGBmQkB2RmgOIEwMFAIQCBQBAhgOEo5yarJsHhJUZB4ICAMFAhYHQxAOGA4UEAJkdMYSDArCDKYcBA4EEA5iHhoBgjJGaqIUFIK8LGo+FCwMFgkQBxQFMQwIEAIOAAAIAAD/kgOYAyoADwAbACcANwBCAE4AXQBpABVAEmVeVU9NRT48MCgmIRgUBgIILSsTIgcmJzY3FhcGFRQXBgcmBxQXBgcmNTQ3FhcGASIHJic2MzIXBgcmEyYnNjU0JzY3FjMyNxYXBhc2NzY3Bgc2NTQmJwYHJic2NxYzMjcWARYVFAcGByYnJic2PQE2AxYXFhUUBwYjIic24BYUMCw2Slw8BgQ+NhBuFDwUQjImLggBUBwWOjhUTnhuTFYaaqCCBA4mPBoeDhheKBB2JhA6Mi54BgKWvnJaRAxEBg4eFo4BYJYEQEIYQDBkCmQaDhICDlZsOjZuAfgKNExKLCYsEBAGEDA4BGIiGnJ2aoJuYD4yGAEwDiocHj4OJBr+NBhYFAoYHCwuFAhshA6WDi4EDpJWMDIKJExgsCRKkIICDmIB0ojMFiwSBjgEknYUFgoq/ewKCBIiUEAqDKAAAAAAA//8/5ADmgMsAAgAEwApAAq3HhQOCQUBAy0rATYAEgAEAAIAFyIGFQYWMzI2NTQDMjY3JwYjIj8BNiMiBgcXNjMyDwEGAca+ARAG/vb+hP7uBgEM8iouAiIgJi60Hmw0EjAYDgoqGjAedjgQNBYMDCQaAyoC/vj+hP7uBgEKAXwBEpYwGhwgLCA6/a40NBgkJqBgOi4aIiKYaAAADwAA/2oDoQNTAAMABwALAA8AEwAXABsAHwAjADMANwA7AD8ATwBzACNAIGBTS0Q+PDo4NjQvKCIgHhwaGBYUEhAODAoIBgQCAA8tKxczNSMXMzUjJzM1IxczNSMnMzUjATM1IyczNSMBMzUjJzM1IwM1NCYnIyIGBxUUFjczMjYBMzUjJzM1IxczNSM3NTQmJyMiBh0BFBY3MzI2NxEUBiMhIiY1ETQ2OwE1NDYXMzIWHQEzNTQ2FzMyFhcVMzIWR6GhxbKyxaGhxbKyxaGhAZuzs9aysgGsoaHWs7PEDAYkBwoBDAYkBwoBm6Gh1rOz1qGhEgoIIwgKCggjCArXLBz87h0qKh1INCUkJTTWNiQjJTQBRx0qT6GhoSSysrIkof3Eofqh/cShJLIBMKEHCgEMBqEHDAEK/iayJKGhoWuhBwoBDAahBwwBCiz9NR0qKh0Cyx0qNiQ2ATQlNjYkNgE0JTYqAAAAAQAAAAADpAKYABUABrMRBAEtKwEUBwEGIicBJjQ/ATYyHwEBNjIfARYDpA/+IBAsEP7qDw9MECwQpAFuECwQTA8CFhYQ/iAPDwEWECwQTBAQpQFvEBBMEAAAAAAD//z/kAOaAywACAAWAD8ACrc3Gw4JBQEDLSsBNgASAAQAAgATMjY1NiYrASIGBxQWFxM2NTQmIyIHBgcVMzU0NzYyFxYVFAcGDwEGDwEGBwYHFTM1NDc2PwE2Aca+ARAG/vb+hP7uBgEMvB4mAiYeAhwmAiYcqBpqUkAoRARuEBBODBAQCAwWCgoVCwYOBGwEBhYcLgMqAv74/oT+7gYBCgF8ARL9HiYcHiYkHB4mAgFIIixOTBoqaAQEGhwYFBQYEhYMCA8HCBEJCBQ6CAQMEBQQEiIAAAACAAD/+QNrAsMAJwBAAAi1PCwOBwItKyUUFg8BDgEHIyImNRE0NjsBMhYVFxYPAQ4BJyMiBgcRFBYXMzIeAgEUBwEGIiY9ASMiJj0BNDY3MzU0NhYXARYBZQIBAgEICLJDXl5DsggKAQEBAgEICLIlNAE2JLQGAgYCAgYL/tELHBb6DhYWDvoWHAsBLwsuAhIFDgkEAV5DAYhDXgoICwkGDQcIATYk/nglNAEEAggBLA4L/tAKFA+hFg7WDxQBoQ4WAgn+0AoAAAEAAP+2A4gDEgAWAAazEQwBLSsBNhYHDgIuAgYHEyMDNz4BHgM2A2oOEAhgiFQ+OkR2UFpkuFxafEg4RFqoAmgGDgyKlh4aMCAoQv6gAtAiQigiREoyCgAB//n/ewP4A1gAJQAGsx8BAS0rJQYkJyYCNz4BNzYWFx4BBwYHBgIXFiQ3PgEnJiQHNTYEFxYCBwYDV5f+apSPDoEIEQocQBkWCA4GCmkGZ3oBOGxQLTBD/uSftwFHTjQpUxAJjQ6MlQGEngoSBhEHFxg8HAwKdv7ebHEddl7vdpZ6MgE7iq1//vxqFgAAAAADAAD/agIwA1IAGwAoAGIACrdNMiYgGAoDLSsBFA4BFB4BHQEUBiImPQE0PgE0LgE9ATQ2MhYVBQcGFxYzMjc2JyYjIhM0PgI/ATY1NwYiJxcUHwMWJhYjFA4CDwIGJgY1Bh0BPgI1NDIVFB4BFzU0LwImLwEuAQIwYGJiYKzYrGBiYmCu1K7+HhIECFx8hFgOHmBqeJAIHAwZHVwCZPRkBFotExERDB4MAgoGCAwPDwIiWgh0RDRCegZcKxINBQwHBAJuLGhePFxmLnYiTk4idi5mXDxeaCx2IE5OIAYOCAY0MgoUNv5KEh4kDhgcXB4yNjYyIForExUVAjAKEhIOCg8QEAIiAVogQgQmMCIeHiIwJgRCHlwpEw4IFAwWAAACAAD/+QOgAwsALgBDAAi1PjEMAwItKwEVFAYjISImNRE0NjchMhceAQ8BBiMiJyYjISIGBxEUFhchMjY9ATQ/ATYzMhcWEwEGIi8BJjQ/ATYyHwEBNjIfARYUAxJeQ/4wQ15eQwHQIx4JAwcbBgcCAw0M/jAlNAE2JAHQJTQFJAYHAwQLgf45DSQO8A4OPQ4kDpMBaQ0kDj4NAUuxQ15eQwHQQl4BDgQTBhwFAQM0Jf4wJTQBNiSNCAUjBgIEAQX+Og4O8A0kDj4NDZMBaQ0NPQ4kAAIAAP/5AxMDCwAPAB8ACLUcEwgAAi0rASEiBgcRFBYXITI2NRE0JhcRFAYjISImNRE0NjchMhYCcf4wJTQBNiQB0CU0NHxeQ/4wQ15eQwHQQmACwzQl/jAlNAE2JAHQJTRZ/jBDXl5DAdBCXgFgAAAC//3/sQNfAwsAJAAxAAi1LigbCQItKyU0LwE3NjQvASYiDwEnJiIPAQYUHwEHBhQfARYyPwEXFjI/ATY3FA4BIi4CPgEyHgECgQplZQoKMwoeCmVlCx4KMgsLZWULCzIKHgtlZQoeCjMK2HLG6MhuBnq89Lp+4A4LZWULHQsyCwtlZQsLMgsdC2VlCx0LMgsLZWULCzILjXXEdHTE6sR0dMQAAAEAAP/vAtQChgAkAAazFgQBLSslFA8BBiIvAQcGIi8BJjQ/AScmND8BNjIfATc2Mh8BFhQPARcWAtQPTBAsEKSkECwQTBAQpKQQEEwQLBCkpBAsEEwPD6SkD3AWEEwPD6WlDw9MECwQpKQQLBBMEBCkpBAQTA8uD6SkDwABAAD/+QMSAwsAIwAGsxoJAS0rARUUBicjFRQGByMiJjc1IyImJzU0NjczNTQ2OwEyFhcVMzIWAxIgFuggFmsWIAHoFx4BIBboHhdrFx4B6BYgAbdrFiAB6RYeASAV6R4XaxceAegWICAW6CAAAAAAAv/9/7EDXwMLABUAIgAItR8ZEQQCLSsBNC8BJiIPAScmIg8BBhQfARYyNwE2FxQOASIuAj4BMh4BAs0LMgscDON+CxwMMgoKygoeCgEvC4xyxujIbgZ6vPS6fgG4EAoyCwvjfgsLMgofCsoKCgEvCkt1xHR0xOrEdHTEAAEAAP+7A6oDCwAnAAazIwIBLSsRNDYzMhcHFBYXMzIWDwEGFjcTNiYrASImPwE2MzIWBxQHAQYiJwEmkmhRQg4SDAoMDAM5BAQHwgcGDU0MCgRSOUNnlAE//qkZShr+qkACEmeSL/oMEAEQDKwMAgkBCwkOEAq3IJJnXkj+bR4eAZNIAAP///9qA6EDDQAjACwARQAKtz0vKicaCAMtKwEVFAYnIxUUBicjIiY3NSMiJic1NDY7ATU0NjsBMhYXFTMyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB30MBiQHDAF9BwoBDAZ9CggkBwoBfQcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAF9BwwBCgh9CggkBwp9CAoKCH0KGWeSApbKmAaM/podKhW/RT5qkKKObjoEQmaWTXtkvxUAAAAAA////2oDoQMNAA8AGAAxAAq3KRsWEwsDAy0rARUUBichIiYnNTQ2MyEyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB/6+BwoBDAYBQgcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAEKCCQHCgoZZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQAGAAD/+QPoAwsAAwAHAAsAGwArADsAEUAONzAoHxcQCggGBAIABi0rJSE1ISchNSElMzUjARUUBgchIiYnNTQ2FyEyFhMVFAYnISImJzU0NjchMhYTFRQGByEiJic1NDYzITIWAjsBZv6a1gI8/cQBZdfXAR4WDvxgDxQBFg4DoA8UARYO/GAPFAEWDgOgDxQBFg78YA8UARYOA6APFEBI1kfXR/3ojg8UARYOjg8WARQBDo8OFgEUD48PFAEWARCPDxQBFg6PDhYWAAAB//n/sQMYAsMAFAAGsxEHAS0rARYHAREUBwYjIi8BJjURASY2MyEyAw8JEf7tFgcHDwqPCv7tEhMYAsoXAq0XEP7t/mIXCgMLjwoPAQ8BExAtAAAC////sQPoAsMAGQA2AAi1MiMEAAItKwERFAYHISImNxEWFxYXHgI3MzI+ATc2NzY3FAYHBg8BDgInIyIuAS8CJicuASc0NjMhMhYD6DQl/MokNgEZH8pMICZEGwIcQigfX7cgGDYp0jQ1DCIgCwIMHiQLNZNgEiM8AS4rAzYkNAHG/kUlNAE2JAG7HBWJNxgaHAEaHBdEfBa/LFAdkiMnCRIMAQoUCCdlQg4XUiQrOjQAAAABAAD/sQPoAwsAVQAGs0IDAS0rJRUUBisBIiY9ATQ2FzM1IRUzMhYXFRQGKwEiJic1NDYXMzUhFTMyFh0BFAYrASImJzU0NhczNTQ2FyE1IyImJzU0NjsBMhYXFRQGJyMVITIWBxUzMhYD6CAWshYgIBY1/uM1Fx4BIBayFx4BIBY1/uM1FiAgFrIXHgEgFjUqHgEdNRceASAWshceASAWNQEdHSwBNRcemrMWICAWsxYgAWtrHhezFiAgFrMWIAFrax4XsxYgIBazFiABax0sAWseF7MWICAWsxYgAWsqHmseAAADAAD/agOhAwsAAgAFADcACrcuDgQDAgADLSslIREJASEBFRQGKwEVFAYrASImPQEhIiY1ESMiJj0BNDY7ATU0NjsBMhYdASE3NjIWFA8BETMyFgE3AUz+mwFM/rQCgwoIfQoIawgK/h4ICn0ICgoIfQoIawgKAduJBRAKBYp9CAqIAUz+zQFM/olrCAp9CAoKCH0KCAHiCghrCAp9BwoKB32KBQsOBon+JQoABP///7EELwMLAAgADwAfAC8ADUAKLCQfFw8KBgMELSsBFA4BJjQ2MhYBFSE1NxcBJSEiBgcRFBYzITI2JxE0JhcRFAYHISImNxE0NjchMhYBZT5aPj5aPgI8/O6yWgEdAR78gwcKAQwGA30HDAEKUTQl/IMkNgE0JQN9JTQCES0+AkJWQED+/vprs1kBHaEKCP1aCAoKCAKmBwwT/VolNAE2JAKmJTQBNgAAAAIAAP+xAxMDDAAfACgACLUmIg4CAi0rJRQGIyEiJjU0PgUXMh4CMj4CMzIeBQMUBiImPgEeAQMSUkP+GENSBAwSHiY6IQUmLExKSjAiByI4KBwUCga0frCABHi4dkJDTk5DHjhCNjgiGgIYHhgYHhgWJjQ6PjwB1lh+frCAAnwAAwAA/8MD6ANAABIANwBxAAq3bVApFw8CAy0rAQYHJy4DJyMiJj0BNDY7ATIBFA8BBiImPQEjIgYvAS4FJzY3HgQ3MzU0NjIfARYRFA8BBiImPQEjIg4CBwYHDgIPAQ4CJyMiJj0BNDY7ATI+Ajc2PwE+BTczNTQ2Mh8BFgF0IisUCB4aLhZ9CAoKCH2LAs4FswUPCjAeHhonDS4YKBokDSErDBAeGiwYjwoOB7IFBbMFDwqPGywgGgwSGRAYJBIpFzZCJn0ICgoIfRsqJBQQERocDCQkLjZAKI8KDgeyBQJGNGUpECYaDAIKCGsICv3FCAWzBQwGawICAwEKChYWJhQ0ZBkeKhQUAmsICgWyBQHsCAWzBQwGaxAiJBkiPSUyRBUvGhgWAQoIawgKEiAkGSM9PhpAMCwgEAFrCAoFsgUAAAAAAgAA//kCgwMLAAcAHwAItRgMBAACLSsTITU0Jg4BFwURFAYHISImJxE0NhczNTQ2MhYHFTMyFrMBHVR2VAEB0CAW/ekXHgEgFhGUzJYCEhceAaVsO1QCUD2h/r4WHgEgFQFCFiABbGaUlGZsHgAAAAMAAP+6A5gDSQAcADkAWgAKt04+KSEYBAMtKyU0LwEmIgcXHgEfARQGByIuAS8BBhQfARYyPwE2ATQvASYiDwEGFB8BFjI3Jy4CNTQ2FzIeAR8BNgEUDwEGIi8BJjQ3JwYiLwEmND8BNjIfARYUBxc2Mh8BFgMsD3QQLhAWAwwBAiAWCA4OBBYTEHMPLRBSD/54D3MQLBBSEBB0Dy4RFwMKBB4XCQ4OAxcSAfQwUi6HLnMuMTEwhy90Ly9SL4Yvci8xMTCHL3QvqxcPdBASFgMQBg8XHgEECgQWES4PdA8PURABnxYQcxAPUg8sEHQPERcDDg4JFiABBAoDFxH+jkMuUS8wcy+HMDExL3Qvhi5SLi90LogwMTEvdC8AAwAA/3YDoAMLAAgAFAAuAAq3HxkSCwYCAy0rNzQmDgEeATI2JQEGIi8BJjQ3AR4BJRQHDgEnIiY0NjcyFhcWFA8BFRc2PwE2MhbWFB4WAhIiEAFq/oMVOhY7FRUBfBZUAZgMG4JPaJKSaCBGGQkJo2wCKkshDwodDhYCEiAUFPr+gxQUPRQ7FgF8N1TdFiVLXgGS0JACFBAGEgdefTwCGS0UCgAD//3/sQNfAwsAFAAhAC4ACrcrJR8YEAMDLSsBFRQGKwEiJj0BNDY7ATU0NjsBMhYXNC4BDgMeAj4BNxQOASIuAj4BMh4BAfQKCLIICgoIfQoHJAgK6FKKpoxQAlSIqoZWe3LG6MhuBnq89Lp+AiL6BwoKByQICsQICgrMU4pUAlCOoo5QAlSKU3XEdHTE6sR0dMQAA////7ADWQMQAAkAEgAjAAq3IBcMCgQCAy0rATQnARYzMj4CBQEmIyIOAQcUJRQOAi4DPgQeAgLcMP5bTFo+cFAy/dIBpUtcU4xQAQLcRHKgrKJwRgJCdJ6wnHZAAWBaSv5cMjJQcmkBpTJQkFBbW1igckYCQnactJp4PgZKbKYAAAAAAQAAAAEAAB7akRNfDzz1AAsD6AAAAADSPcdGAAAAANI9nRb/+P9qBLEDWAAAAAgAAgAAAAAAAAABAAADUv9qAFoEsQAA/+YEsQABAAAAAAAAAAAAAAAAAAAARAPoAAADoAAAA6AAAANZAAAELwAAA+gAAANZAAADWQAAA9MAAAPoAAAELwAAA+gAAAMRAAADoAAAAqYAAAPpAAAD6AAABLEAAAPoAAADWQAAA+gAAAQvAAADwgAAAoAAAANZAAAELwAAA+gAAANZAAAD6AAAA4QAAAOgAAADoAAAAxUAAAPoAAAD6AAAA+gAAAMMAAADmAAAA5gAAAOgAAAD6AAAA5gAAAOgAAADhAAAA+gAAAIwAAADoAAAAxEAAANZAAADEQAAAxEAAANZAAADqQAAA6AAAAOgAAAD6AAAAxEAAAPoAAAD6AAAA6AAAAQvAAADEQAAA+gAAAKCAAADoAAAA6AAAANZAAADWQAAAAAAAAA6AIYBJgKGAvYDPAOGBAgEYgTABTYF0gY0BqYHRAe4CFII8gleCawJ8gowCqAK8AtYC6oL9gxkDJQM8A0ODUANog3iDhIOZA8UD2IQFhBEELARFBFAEYgSGBKCEroTDBNKE4ITwBQCFGwUvhUkFU4VqBYaFnAWxhcGF6gX4BhuGMAZChlLAAAAAQAAAEQA9AAPAAAAAAACAAAAEABzAAAANAtwAAAAAAAAABIA3gABAAAAAAAAADUAAAABAAAAAAABAAgANQABAAAAAAACAAcAPQABAAAAAAADAAgARAABAAAAAAAEAAgATAABAAAAAAAFAAsAVAABAAAAAAAGAAgAXwABAAAAAAAKACsAZwABAAAAAAALABMAkgADAAEECQAAAGoApQADAAEECQABABABDwADAAEECQACAA4BHwADAAEECQADABABLQADAAEECQAEABABPQADAAEECQAFABYBTQADAAEECQAGABABYwADAAEECQAKAFYBcwADAAEECQALACYByUNvcHlyaWdodCAoQykgMjAxNSBieSBvcmlnaW5hbCBhdXRob3JzIEAgZm9udGVsbG8uY29tZm9udGVsbG9SZWd1bGFyZm9udGVsbG9mb250ZWxsb1ZlcnNpb24gMS4wZm9udGVsbG9HZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuaHR0cDovL2ZvbnRlbGxvLmNvbQBDAG8AcAB5AHIAaQBnAGgAdAAgACgAQwApACAAMgAwADEANQAgAGIAeQAgAG8AcgBpAGcAaQBuAGEAbAAgAGEAdQB0AGgAbwByAHMAIABAACAAZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AZgBvAG4AdABlAGwAbABvAFIAZQBnAHUAbABhAHIAZgBvAG4AdABlAGwAbABvAGYAbwBuAHQAZQBsAGwAbwBWAGUAcgBzAGkAbwBuACAAMQAuADAAZgBvAG4AdABlAGwAbABvAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEBHN0YXIKc3Rhci1lbXB0eQNjb2cHY29nLWFsdARtYWlsBnBlbmNpbAxwbHVzLWNpcmNsZWQDYXNsA2V5ZQR0YWdzBGNoYXQFdHJhc2gGYmFza2V0BnB1enpsZQhsYW5ndWFnZQZzaWduYWwFdXNlcnMFdG9vbHMJYXJyb3dzLWN3CGV4Y2hhbmdlC2ZvbGRlci1vcGVuBWJydXNoC2Zsb3ctYnJhbmNoBG1lbnUEY29kZQh1c2VyLWFkZAJjdwVncm91cARob21lCWVxdWFsaXplcgZtYWlsLTEGc2VhcmNoBG1vdmUGdXBsb2FkDHVwbG9hZC1jbG91ZANrZXkHbmV0d29yaw5pbmZvLWNpcmNsZWQtMQhjYWxlbmRhcgJvawxoZWxwLWNpcmNsZWQGbG9nb3V0BGZsYWcFc3BpbjYJaG91cmdsYXNzBWNoZWNrC2NoZWNrLWVtcHR5DmNhbmNlbC1jaXJjbGVkBmNhbmNlbARwbHVzCm9rLWNpcmNsZWQMaGVhcnQtYnJva2VuB3pvb20taW4Iem9vbS1vdXQFdGFza3MGZmlsdGVyCG1haWwtYWx0B3NpdGVtYXAEY3JvcAdwaWN0dXJlBHVzZXIHc2h1ZmZsZQRsb2NrBGxpbmsGd3JlbmNoBWNsb2NrBWJsb2NrAAAAAAAAAQAB//8ADwAAAAAAAAAAAAAAALAALCCwAFVYRVkgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbkIAAgAY2MjYhshIbAAWbAAQyNEsgABAENgQi2wASywIGBmLbACLCBkILDAULAEJlqyKAEKQ0VjRVJbWCEjIRuKWCCwUFBYIbBAWRsgsDhQWCGwOFlZILEBCkNFY0VhZLAoUFghsQEKQ0VjRSCwMFBYIbAwWRsgsMBQWCBmIIqKYSCwClBYYBsgsCBQWCGwCmAbILA2UFghsDZgG2BZWVkbsAErWVkjsABQWGVZWS2wAywgRSCwBCVhZCCwBUNQWLAFI0KwBiNCGyEhWbABYC2wBCwjISMhIGSxBWJCILAGI0KxAQpDRWOxAQpDsABgRWOwAyohILAGQyCKIIqwASuxMAUlsAQmUVhgUBthUllYI1khILBAU1iwASsbIbBAWSOwAFBYZVktsAUssAdDK7IAAgBDYEItsAYssAcjQiMgsAAjQmGwAmJmsAFjsAFgsAUqLbAHLCAgRSCwC0NjuAQAYiCwAFBYsEBgWWawAWNgRLABYC2wCCyyBwsAQ0VCKiGyAAEAQ2BCLbAJLLAAQyNEsgABAENgQi2wCiwgIEUgsAErI7AAQ7AEJWAgRYojYSBkILAgUFghsAAbsDBQWLAgG7BAWVkjsABQWGVZsAMlI2FERLABYC2wCywgIEUgsAErI7AAQ7AEJWAgRYojYSBksCRQWLAAG7BAWSOwAFBYZVmwAyUjYUREsAFgLbAMLCCwACNCsgsKA0VYIRsjIVkqIS2wDSyxAgJFsGRhRC2wDiywAWAgILAMQ0qwAFBYILAMI0JZsA1DSrAAUlggsA0jQlktsA8sILAQYmawAWMguAQAY4ojYbAOQ2AgimAgsA4jQiMtsBAsS1RYsQRkRFkksA1lI3gtsBEsS1FYS1NYsQRkRFkbIVkksBNlI3gtsBIssQAPQ1VYsQ8PQ7ABYUKwDytZsABDsAIlQrEMAiVCsQ0CJUKwARYjILADJVBYsQEAQ2CwBCVCioogiiNhsA4qISOwAWEgiiNhsA4qIRuxAQBDYLACJUKwAiVhsA4qIVmwDENHsA1DR2CwAmIgsABQWLBAYFlmsAFjILALQ2O4BABiILAAUFiwQGBZZrABY2CxAAATI0SwAUOwAD6yAQEBQ2BCLbATLACxAAJFVFiwDyNCIEWwCyNCsAojsABgQiBgsAFhtRAQAQAOAEJCimCxEgYrsHIrGyJZLbAULLEAEystsBUssQETKy2wFiyxAhMrLbAXLLEDEystsBgssQQTKy2wGSyxBRMrLbAaLLEGEystsBsssQcTKy2wHCyxCBMrLbAdLLEJEystsB4sALANK7EAAkVUWLAPI0IgRbALI0KwCiOwAGBCIGCwAWG1EBABAA4AQkKKYLESBiuwcisbIlktsB8ssQAeKy2wICyxAR4rLbAhLLECHistsCIssQMeKy2wIyyxBB4rLbAkLLEFHistsCUssQYeKy2wJiyxBx4rLbAnLLEIHistsCgssQkeKy2wKSwgPLABYC2wKiwgYLAQYCBDI7ABYEOwAiVhsAFgsCkqIS2wKyywKiuwKiotsCwsICBHICCwC0NjuAQAYiCwAFBYsEBgWWawAWNgI2E4IyCKVVggRyAgsAtDY7gEAGIgsABQWLBAYFlmsAFjYCNhOBshWS2wLSwAsQACRVRYsAEWsCwqsAEVMBsiWS2wLiwAsA0rsQACRVRYsAEWsCwqsAEVMBsiWS2wLywgNbABYC2wMCwAsAFFY7gEAGIgsABQWLBAYFlmsAFjsAErsAtDY7gEAGIgsABQWLBAYFlmsAFjsAErsAAWtAAAAAAARD4jOLEvARUqLbAxLCA8IEcgsAtDY7gEAGIgsABQWLBAYFlmsAFjYLAAQ2E4LbAyLC4XPC2wMywgPCBHILALQ2O4BABiILAAUFiwQGBZZrABY2CwAENhsAFDYzgtsDQssQIAFiUgLiBHsAAjQrACJUmKikcjRyNhIFhiGyFZsAEjQrIzAQEVFCotsDUssAAWsAQlsAQlRyNHI2GwCUMrZYouIyAgPIo4LbA2LLAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjILAIQyCKI0cjRyNhI0ZgsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhIyAgsAQmI0ZhOBsjsAhDRrACJbAIQ0cjRyNhYCCwBEOwAmIgsABQWLBAYFlmsAFjYCMgsAErI7AEQ2CwASuwBSVhsAUlsAJiILAAUFiwQGBZZrABY7AEJmEgsAQlYGQjsAMlYGRQWCEbIyFZIyAgsAQmI0ZhOFktsDcssAAWICAgsAUmIC5HI0cjYSM8OC2wOCywABYgsAgjQiAgIEYjR7ABKyNhOC2wOSywABawAyWwAiVHI0cjYbAAVFguIDwjIRuwAiWwAiVHI0cjYSCwBSWwBCVHI0cjYbAGJbAFJUmwAiVhuQgACABjYyMgWGIbIVljuAQAYiCwAFBYsEBgWWawAWNgIy4jICA8ijgjIVktsDossAAWILAIQyAuRyNHI2EgYLAgYGawAmIgsABQWLBAYFlmsAFjIyAgPIo4LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKxAAAqsQAFQrEACCqxAAVCsQAIKrEABUK5AAAACSqxAAVCuQAAAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbEADCq4Af+FsASNsQIARAA=') format('truetype');
 }
 /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
 /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
@@ -19,7 +19,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?76878460#fontello') format('svg');
+    src: url('../font/fontello.svg?37675340#fontello') format('svg');
   }
 }
 */
@@ -105,6 +105,7 @@
 .icon-cancel:before { content: '\e822'; } /* '' */
 .icon-plus:before { content: '\e823'; } /* '' */
 .icon-ok-circled:before { content: '\e824'; } /* '' */
+.icon-heart-broken:before { content: '\e825'; } /* '' */
 .icon-zoom-in:before { content: '\e827'; } /* '' */
 .icon-zoom-out:before { content: '\e828'; } /* '' */
 .icon-tasks:before { content: '\f0ae'; } /* '' */
diff --git a/sources/admin/themes/default/fontello/css/fontello-ie7-codes.css b/sources/admin/themes/default/fontello/css/fontello-ie7-codes.css
index 49cd553..708cfdf 100644
--- a/sources/admin/themes/default/fontello/css/fontello-ie7-codes.css
+++ b/sources/admin/themes/default/fontello/css/fontello-ie7-codes.css
@@ -50,6 +50,7 @@
 .icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe822;&nbsp;'); }
 .icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe823;&nbsp;'); }
 .icon-ok-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe824;&nbsp;'); }
+.icon-heart-broken { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe825;&nbsp;'); }
 .icon-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe827;&nbsp;'); }
 .icon-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe828;&nbsp;'); }
 .icon-tasks { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ae;&nbsp;'); }
diff --git a/sources/admin/themes/default/fontello/css/fontello-ie7.css b/sources/admin/themes/default/fontello/css/fontello-ie7.css
index 9eec9e6..c1e1ec5 100644
--- a/sources/admin/themes/default/fontello/css/fontello-ie7.css
+++ b/sources/admin/themes/default/fontello/css/fontello-ie7.css
@@ -61,6 +61,7 @@
 .icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe822;&nbsp;'); }
 .icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe823;&nbsp;'); }
 .icon-ok-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe824;&nbsp;'); }
+.icon-heart-broken { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe825;&nbsp;'); }
 .icon-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe827;&nbsp;'); }
 .icon-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe828;&nbsp;'); }
 .icon-tasks { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ae;&nbsp;'); }
diff --git a/sources/admin/themes/default/fontello/css/fontello.css b/sources/admin/themes/default/fontello/css/fontello.css
index 9b3319d..40777f1 100644
--- a/sources/admin/themes/default/fontello/css/fontello.css
+++ b/sources/admin/themes/default/fontello/css/fontello.css
@@ -2,11 +2,11 @@
 
  @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?80487531');
-  src: url('../font/fontello.eot?80487531#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff?80487531') format('woff'),
-       url('../font/fontello.ttf?80487531') format('truetype'),
-       url('../font/fontello.svg?80487531#fontello') format('svg');
+  src: url('../font/fontello.eot?38260160');
+  src: url('../font/fontello.eot?38260160#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff?38260160') format('woff'),
+       url('../font/fontello.ttf?38260160') format('truetype'),
+       url('../font/fontello.svg?38260160#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -16,7 +16,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?80487531#fontello') format('svg');
+    src: url('../font/fontello.svg?38260160#fontello') format('svg');
   }
 }
 */
@@ -37,7 +37,7 @@
   /* For safety - reset parent styles, that can break glyph codes*/
   font-variant: normal;
   text-transform: none;
-     
+ 
   /* fix buttons height, for twitter bootstrap */
   line-height: 1em;
  
@@ -48,6 +48,10 @@
   /* you can be more comfortable with increased icons size */
   /* font-size: 120%; */
  
+  /* Font smoothing. That was taken from TWBS */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+ 
   /* Uncomment for 3D effect */
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
@@ -103,6 +107,7 @@
 .icon-cancel:before { content: '\e822'; } /* '' */
 .icon-plus:before { content: '\e823'; } /* '' */
 .icon-ok-circled:before { content: '\e824'; } /* '' */
+.icon-heart-broken:before { content: '\e825'; } /* '' */
 .icon-zoom-in:before { content: '\e827'; } /* '' */
 .icon-zoom-out:before { content: '\e828'; } /* '' */
 .icon-tasks:before { content: '\f0ae'; } /* '' */
diff --git a/sources/admin/themes/default/fontello/demo.html b/sources/admin/themes/default/fontello/demo.html
index eeb1903..c7bd65f 100644
--- a/sources/admin/themes/default/fontello/demo.html
+++ b/sources/admin/themes/default/fontello/demo.html
@@ -227,8 +227,54 @@ body {
 .i-code {
   display: none;
 }
-</style>
-    <link rel="stylesheet" href="css/fontello.css">
+@font-face {
+      font-family: 'fontello';
+      src: url('./font/fontello.eot?58887028');
+      src: url('./font/fontello.eot?58887028#iefix') format('embedded-opentype'),
+           url('./font/fontello.woff?58887028') format('woff'),
+           url('./font/fontello.ttf?58887028') format('truetype'),
+           url('./font/fontello.svg?58887028#fontello') format('svg');
+      font-weight: normal;
+      font-style: normal;
+    }
+     
+     
+    .demo-icon
+    {
+      font-family: "fontello";
+      font-style: normal;
+      font-weight: normal;
+      speak: none;
+     
+      display: inline-block;
+      text-decoration: inherit;
+      width: 1em;
+      margin-right: .2em;
+      text-align: center;
+      /* opacity: .8; */
+     
+      /* For safety - reset parent styles, that can break glyph codes*/
+      font-variant: normal;
+      text-transform: none;
+     
+      /* fix buttons height, for twitter bootstrap */
+      line-height: 1em;
+     
+      /* Animation center compensation - margins should be symmetric */
+      /* remove if not needed */
+      margin-left: .2em;
+     
+      /* You can be more comfortable with increased icons size */
+      /* font-size: 120%; */
+     
+      /* Font smoothing. That was taken from TWBS */
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
+     
+      /* Uncomment for 3D effect */
+      /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+    }
+     </style>
     <link rel="stylesheet" href="css/animation.css"><!--[if IE 7]><link rel="stylesheet" href="css/fontello-ie7.css"><![endif]-->
     <script>
       function toggleCodes(on) {
@@ -255,104 +301,105 @@ body {
     </div>
     <div id="icons" class="container">
       <div class="row">
-        <div title="Code: 0x2605" class="the-icons span3"><i class="icon-star"></i> <span class="i-name">icon-star</span><span class="i-code">0x2605</span></div>
-        <div title="Code: 0x2606" class="the-icons span3"><i class="icon-star-empty"></i> <span class="i-name">icon-star-empty</span><span class="i-code">0x2606</span></div>
-        <div title="Code: 0x2699" class="the-icons span3"><i class="icon-cog"></i> <span class="i-name">icon-cog</span><span class="i-code">0x2699</span></div>
-        <div title="Code: 0x26ef" class="the-icons span3"><i class="icon-cog-alt"></i> <span class="i-name">icon-cog-alt</span><span class="i-code">0x26ef</span></div>
+        <div title="Code: 0x2605" class="the-icons span3"><i class="demo-icon icon-star">&#x2605;</i> <span class="i-name">icon-star</span><span class="i-code">0x2605</span></div>
+        <div title="Code: 0x2606" class="the-icons span3"><i class="demo-icon icon-star-empty">&#x2606;</i> <span class="i-name">icon-star-empty</span><span class="i-code">0x2606</span></div>
+        <div title="Code: 0x2699" class="the-icons span3"><i class="demo-icon icon-cog">&#x2699;</i> <span class="i-name">icon-cog</span><span class="i-code">0x2699</span></div>
+        <div title="Code: 0x26ef" class="the-icons span3"><i class="demo-icon icon-cog-alt">&#x26ef;</i> <span class="i-name">icon-cog-alt</span><span class="i-code">0x26ef</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0x2709" class="the-icons span3"><i class="icon-mail"></i> <span class="i-name">icon-mail</span><span class="i-code">0x2709</span></div>
-        <div title="Code: 0x270e" class="the-icons span3"><i class="icon-pencil"></i> <span class="i-name">icon-pencil</span><span class="i-code">0x270e</span></div>
-        <div title="Code: 0x2795" class="the-icons span3"><i class="icon-plus-circled"></i> <span class="i-name">icon-plus-circled</span><span class="i-code">0x2795</span></div>
-        <div title="Code: 0xe0ad" class="the-icons span3"><i class="icon-asl"></i> <span class="i-name">icon-asl</span><span class="i-code">0xe0ad</span></div>
+        <div title="Code: 0x2709" class="the-icons span3"><i class="demo-icon icon-mail">&#x2709;</i> <span class="i-name">icon-mail</span><span class="i-code">0x2709</span></div>
+        <div title="Code: 0x270e" class="the-icons span3"><i class="demo-icon icon-pencil">&#x270e;</i> <span class="i-name">icon-pencil</span><span class="i-code">0x270e</span></div>
+        <div title="Code: 0x2795" class="the-icons span3"><i class="demo-icon icon-plus-circled">&#x2795;</i> <span class="i-name">icon-plus-circled</span><span class="i-code">0x2795</span></div>
+        <div title="Code: 0xe0ad" class="the-icons span3"><i class="demo-icon icon-asl">&#xe0ad;</i> <span class="i-name">icon-asl</span><span class="i-code">0xe0ad</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe70a" class="the-icons span3"><i class="icon-eye"></i> <span class="i-name">icon-eye</span><span class="i-code">0xe70a</span></div>
-        <div title="Code: 0xe70d" class="the-icons span3"><i class="icon-tags"></i> <span class="i-name">icon-tags</span><span class="i-code">0xe70d</span></div>
-        <div title="Code: 0xe720" class="the-icons span3"><i class="icon-chat"></i> <span class="i-name">icon-chat</span><span class="i-code">0xe720</span></div>
-        <div title="Code: 0xe729" class="the-icons span3"><i class="icon-trash"></i> <span class="i-name">icon-trash</span><span class="i-code">0xe729</span></div>
+        <div title="Code: 0xe70a" class="the-icons span3"><i class="demo-icon icon-eye">&#xe70a;</i> <span class="i-name">icon-eye</span><span class="i-code">0xe70a</span></div>
+        <div title="Code: 0xe70d" class="the-icons span3"><i class="demo-icon icon-tags">&#xe70d;</i> <span class="i-name">icon-tags</span><span class="i-code">0xe70d</span></div>
+        <div title="Code: 0xe720" class="the-icons span3"><i class="demo-icon icon-chat">&#xe720;</i> <span class="i-name">icon-chat</span><span class="i-code">0xe720</span></div>
+        <div title="Code: 0xe729" class="the-icons span3"><i class="demo-icon icon-trash">&#xe729;</i> <span class="i-name">icon-trash</span><span class="i-code">0xe729</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe73d" class="the-icons span3"><i class="icon-basket"></i> <span class="i-name">icon-basket</span><span class="i-code">0xe73d</span></div>
-        <div title="Code: 0xe7b6" class="the-icons span3"><i class="icon-puzzle"></i> <span class="i-name">icon-puzzle</span><span class="i-code">0xe7b6</span></div>
-        <div title="Code: 0xe800" class="the-icons span3"><i class="icon-language"></i> <span class="i-name">icon-language</span><span class="i-code">0xe800</span></div>
-        <div title="Code: 0xe801" class="the-icons span3"><i class="icon-signal"></i> <span class="i-name">icon-signal</span><span class="i-code">0xe801</span></div>
+        <div title="Code: 0xe73d" class="the-icons span3"><i class="demo-icon icon-basket">&#xe73d;</i> <span class="i-name">icon-basket</span><span class="i-code">0xe73d</span></div>
+        <div title="Code: 0xe7b6" class="the-icons span3"><i class="demo-icon icon-puzzle">&#xe7b6;</i> <span class="i-name">icon-puzzle</span><span class="i-code">0xe7b6</span></div>
+        <div title="Code: 0xe800" class="the-icons span3"><i class="demo-icon icon-language">&#xe800;</i> <span class="i-name">icon-language</span><span class="i-code">0xe800</span></div>
+        <div title="Code: 0xe801" class="the-icons span3"><i class="demo-icon icon-signal">&#xe801;</i> <span class="i-name">icon-signal</span><span class="i-code">0xe801</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe802" class="the-icons span3"><i class="icon-users"></i> <span class="i-name">icon-users</span><span class="i-code">0xe802</span></div>
-        <div title="Code: 0xe803" class="the-icons span3"><i class="icon-tools"></i> <span class="i-name">icon-tools</span><span class="i-code">0xe803</span></div>
-        <div title="Code: 0xe804" class="the-icons span3"><i class="icon-arrows-cw"></i> <span class="i-name">icon-arrows-cw</span><span class="i-code">0xe804</span></div>
-        <div title="Code: 0xe805" class="the-icons span3"><i class="icon-exchange"></i> <span class="i-name">icon-exchange</span><span class="i-code">0xe805</span></div>
+        <div title="Code: 0xe802" class="the-icons span3"><i class="demo-icon icon-users">&#xe802;</i> <span class="i-name">icon-users</span><span class="i-code">0xe802</span></div>
+        <div title="Code: 0xe803" class="the-icons span3"><i class="demo-icon icon-tools">&#xe803;</i> <span class="i-name">icon-tools</span><span class="i-code">0xe803</span></div>
+        <div title="Code: 0xe804" class="the-icons span3"><i class="demo-icon icon-arrows-cw">&#xe804;</i> <span class="i-name">icon-arrows-cw</span><span class="i-code">0xe804</span></div>
+        <div title="Code: 0xe805" class="the-icons span3"><i class="demo-icon icon-exchange">&#xe805;</i> <span class="i-name">icon-exchange</span><span class="i-code">0xe805</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe806" class="the-icons span3"><i class="icon-folder-open"></i> <span class="i-name">icon-folder-open</span><span class="i-code">0xe806</span></div>
-        <div title="Code: 0xe807" class="the-icons span3"><i class="icon-brush"></i> <span class="i-name">icon-brush</span><span class="i-code">0xe807</span></div>
-        <div title="Code: 0xe808" class="the-icons span3"><i class="icon-flow-branch"></i> <span class="i-name">icon-flow-branch</span><span class="i-code">0xe808</span></div>
-        <div title="Code: 0xe809" class="the-icons span3"><i class="icon-menu"></i> <span class="i-name">icon-menu</span><span class="i-code">0xe809</span></div>
+        <div title="Code: 0xe806" class="the-icons span3"><i class="demo-icon icon-folder-open">&#xe806;</i> <span class="i-name">icon-folder-open</span><span class="i-code">0xe806</span></div>
+        <div title="Code: 0xe807" class="the-icons span3"><i class="demo-icon icon-brush">&#xe807;</i> <span class="i-name">icon-brush</span><span class="i-code">0xe807</span></div>
+        <div title="Code: 0xe808" class="the-icons span3"><i class="demo-icon icon-flow-branch">&#xe808;</i> <span class="i-name">icon-flow-branch</span><span class="i-code">0xe808</span></div>
+        <div title="Code: 0xe809" class="the-icons span3"><i class="demo-icon icon-menu">&#xe809;</i> <span class="i-name">icon-menu</span><span class="i-code">0xe809</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe80a" class="the-icons span3"><i class="icon-code"></i> <span class="i-name">icon-code</span><span class="i-code">0xe80a</span></div>
-        <div title="Code: 0xe80b" class="the-icons span3"><i class="icon-user-add"></i> <span class="i-name">icon-user-add</span><span class="i-code">0xe80b</span></div>
-        <div title="Code: 0xe80c" class="the-icons span3"><i class="icon-cw"></i> <span class="i-name">icon-cw</span><span class="i-code">0xe80c</span></div>
-        <div title="Code: 0xe80d" class="the-icons span3"><i class="icon-group"></i> <span class="i-name">icon-group</span><span class="i-code">0xe80d</span></div>
+        <div title="Code: 0xe80a" class="the-icons span3"><i class="demo-icon icon-code">&#xe80a;</i> <span class="i-name">icon-code</span><span class="i-code">0xe80a</span></div>
+        <div title="Code: 0xe80b" class="the-icons span3"><i class="demo-icon icon-user-add">&#xe80b;</i> <span class="i-name">icon-user-add</span><span class="i-code">0xe80b</span></div>
+        <div title="Code: 0xe80c" class="the-icons span3"><i class="demo-icon icon-cw">&#xe80c;</i> <span class="i-name">icon-cw</span><span class="i-code">0xe80c</span></div>
+        <div title="Code: 0xe80d" class="the-icons span3"><i class="demo-icon icon-group">&#xe80d;</i> <span class="i-name">icon-group</span><span class="i-code">0xe80d</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe80e" class="the-icons span3"><i class="icon-home"></i> <span class="i-name">icon-home</span><span class="i-code">0xe80e</span></div>
-        <div title="Code: 0xe80f" class="the-icons span3"><i class="icon-equalizer"></i> <span class="i-name">icon-equalizer</span><span class="i-code">0xe80f</span></div>
-        <div title="Code: 0xe810" class="the-icons span3"><i class="icon-mail-1"></i> <span class="i-name">icon-mail-1</span><span class="i-code">0xe810</span></div>
-        <div title="Code: 0xe811" class="the-icons span3"><i class="icon-search"></i> <span class="i-name">icon-search</span><span class="i-code">0xe811</span></div>
+        <div title="Code: 0xe80e" class="the-icons span3"><i class="demo-icon icon-home">&#xe80e;</i> <span class="i-name">icon-home</span><span class="i-code">0xe80e</span></div>
+        <div title="Code: 0xe80f" class="the-icons span3"><i class="demo-icon icon-equalizer">&#xe80f;</i> <span class="i-name">icon-equalizer</span><span class="i-code">0xe80f</span></div>
+        <div title="Code: 0xe810" class="the-icons span3"><i class="demo-icon icon-mail-1">&#xe810;</i> <span class="i-name">icon-mail-1</span><span class="i-code">0xe810</span></div>
+        <div title="Code: 0xe811" class="the-icons span3"><i class="demo-icon icon-search">&#xe811;</i> <span class="i-name">icon-search</span><span class="i-code">0xe811</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe812" class="the-icons span3"><i class="icon-move"></i> <span class="i-name">icon-move</span><span class="i-code">0xe812</span></div>
-        <div title="Code: 0xe813" class="the-icons span3"><i class="icon-upload"></i> <span class="i-name">icon-upload</span><span class="i-code">0xe813</span></div>
-        <div title="Code: 0xe814" class="the-icons span3"><i class="icon-upload-cloud"></i> <span class="i-name">icon-upload-cloud</span><span class="i-code">0xe814</span></div>
-        <div title="Code: 0xe815" class="the-icons span3"><i class="icon-key"></i> <span class="i-name">icon-key</span><span class="i-code">0xe815</span></div>
+        <div title="Code: 0xe812" class="the-icons span3"><i class="demo-icon icon-move">&#xe812;</i> <span class="i-name">icon-move</span><span class="i-code">0xe812</span></div>
+        <div title="Code: 0xe813" class="the-icons span3"><i class="demo-icon icon-upload">&#xe813;</i> <span class="i-name">icon-upload</span><span class="i-code">0xe813</span></div>
+        <div title="Code: 0xe814" class="the-icons span3"><i class="demo-icon icon-upload-cloud">&#xe814;</i> <span class="i-name">icon-upload-cloud</span><span class="i-code">0xe814</span></div>
+        <div title="Code: 0xe815" class="the-icons span3"><i class="demo-icon icon-key">&#xe815;</i> <span class="i-name">icon-key</span><span class="i-code">0xe815</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe816" class="the-icons span3"><i class="icon-network"></i> <span class="i-name">icon-network</span><span class="i-code">0xe816</span></div>
-        <div title="Code: 0xe817" class="the-icons span3"><i class="icon-info-circled-1"></i> <span class="i-name">icon-info-circled-1</span><span class="i-code">0xe817</span></div>
-        <div title="Code: 0xe818" class="the-icons span3"><i class="icon-calendar"></i> <span class="i-name">icon-calendar</span><span class="i-code">0xe818</span></div>
-        <div title="Code: 0xe819" class="the-icons span3"><i class="icon-ok"></i> <span class="i-name">icon-ok</span><span class="i-code">0xe819</span></div>
+        <div title="Code: 0xe816" class="the-icons span3"><i class="demo-icon icon-network">&#xe816;</i> <span class="i-name">icon-network</span><span class="i-code">0xe816</span></div>
+        <div title="Code: 0xe817" class="the-icons span3"><i class="demo-icon icon-info-circled-1">&#xe817;</i> <span class="i-name">icon-info-circled-1</span><span class="i-code">0xe817</span></div>
+        <div title="Code: 0xe818" class="the-icons span3"><i class="demo-icon icon-calendar">&#xe818;</i> <span class="i-name">icon-calendar</span><span class="i-code">0xe818</span></div>
+        <div title="Code: 0xe819" class="the-icons span3"><i class="demo-icon icon-ok">&#xe819;</i> <span class="i-name">icon-ok</span><span class="i-code">0xe819</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe81a" class="the-icons span3"><i class="icon-help-circled"></i> <span class="i-name">icon-help-circled</span><span class="i-code">0xe81a</span></div>
-        <div title="Code: 0xe81b" class="the-icons span3"><i class="icon-logout"></i> <span class="i-name">icon-logout</span><span class="i-code">0xe81b</span></div>
-        <div title="Code: 0xe81c" class="the-icons span3"><i class="icon-flag"></i> <span class="i-name">icon-flag</span><span class="i-code">0xe81c</span></div>
-        <div title="Code: 0xe81d" class="the-icons span3"><i class="icon-spin6 animate-spin"></i> <span class="i-name">icon-spin6</span><span class="i-code">0xe81d</span></div>
+        <div title="Code: 0xe81a" class="the-icons span3"><i class="demo-icon icon-help-circled">&#xe81a;</i> <span class="i-name">icon-help-circled</span><span class="i-code">0xe81a</span></div>
+        <div title="Code: 0xe81b" class="the-icons span3"><i class="demo-icon icon-logout">&#xe81b;</i> <span class="i-name">icon-logout</span><span class="i-code">0xe81b</span></div>
+        <div title="Code: 0xe81c" class="the-icons span3"><i class="demo-icon icon-flag">&#xe81c;</i> <span class="i-name">icon-flag</span><span class="i-code">0xe81c</span></div>
+        <div title="Code: 0xe81d" class="the-icons span3"><i class="demo-icon icon-spin6 animate-spin">&#xe81d;</i> <span class="i-name">icon-spin6</span><span class="i-code">0xe81d</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe81e" class="the-icons span3"><i class="icon-hourglass"></i> <span class="i-name">icon-hourglass</span><span class="i-code">0xe81e</span></div>
-        <div title="Code: 0xe81f" class="the-icons span3"><i class="icon-check"></i> <span class="i-name">icon-check</span><span class="i-code">0xe81f</span></div>
-        <div title="Code: 0xe820" class="the-icons span3"><i class="icon-check-empty"></i> <span class="i-name">icon-check-empty</span><span class="i-code">0xe820</span></div>
-        <div title="Code: 0xe821" class="the-icons span3"><i class="icon-cancel-circled"></i> <span class="i-name">icon-cancel-circled</span><span class="i-code">0xe821</span></div>
+        <div title="Code: 0xe81e" class="the-icons span3"><i class="demo-icon icon-hourglass">&#xe81e;</i> <span class="i-name">icon-hourglass</span><span class="i-code">0xe81e</span></div>
+        <div title="Code: 0xe81f" class="the-icons span3"><i class="demo-icon icon-check">&#xe81f;</i> <span class="i-name">icon-check</span><span class="i-code">0xe81f</span></div>
+        <div title="Code: 0xe820" class="the-icons span3"><i class="demo-icon icon-check-empty">&#xe820;</i> <span class="i-name">icon-check-empty</span><span class="i-code">0xe820</span></div>
+        <div title="Code: 0xe821" class="the-icons span3"><i class="demo-icon icon-cancel-circled">&#xe821;</i> <span class="i-name">icon-cancel-circled</span><span class="i-code">0xe821</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe822" class="the-icons span3"><i class="icon-cancel"></i> <span class="i-name">icon-cancel</span><span class="i-code">0xe822</span></div>
-        <div title="Code: 0xe823" class="the-icons span3"><i class="icon-plus"></i> <span class="i-name">icon-plus</span><span class="i-code">0xe823</span></div>
-        <div title="Code: 0xe824" class="the-icons span3"><i class="icon-ok-circled"></i> <span class="i-name">icon-ok-circled</span><span class="i-code">0xe824</span></div>
-        <div title="Code: 0xe827" class="the-icons span3"><i class="icon-zoom-in"></i> <span class="i-name">icon-zoom-in</span><span class="i-code">0xe827</span></div>
+        <div title="Code: 0xe822" class="the-icons span3"><i class="demo-icon icon-cancel">&#xe822;</i> <span class="i-name">icon-cancel</span><span class="i-code">0xe822</span></div>
+        <div title="Code: 0xe823" class="the-icons span3"><i class="demo-icon icon-plus">&#xe823;</i> <span class="i-name">icon-plus</span><span class="i-code">0xe823</span></div>
+        <div title="Code: 0xe824" class="the-icons span3"><i class="demo-icon icon-ok-circled">&#xe824;</i> <span class="i-name">icon-ok-circled</span><span class="i-code">0xe824</span></div>
+        <div title="Code: 0xe825" class="the-icons span3"><i class="demo-icon icon-heart-broken">&#xe825;</i> <span class="i-name">icon-heart-broken</span><span class="i-code">0xe825</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe828" class="the-icons span3"><i class="icon-zoom-out"></i> <span class="i-name">icon-zoom-out</span><span class="i-code">0xe828</span></div>
-        <div title="Code: 0xf0ae" class="the-icons span3"><i class="icon-tasks"></i> <span class="i-name">icon-tasks</span><span class="i-code">0xf0ae</span></div>
-        <div title="Code: 0xf0b0" class="the-icons span3"><i class="icon-filter"></i> <span class="i-name">icon-filter</span><span class="i-code">0xf0b0</span></div>
-        <div title="Code: 0xf0e0" class="the-icons span3"><i class="icon-mail-alt"></i> <span class="i-name">icon-mail-alt</span><span class="i-code">0xf0e0</span></div>
+        <div title="Code: 0xe827" class="the-icons span3"><i class="demo-icon icon-zoom-in">&#xe827;</i> <span class="i-name">icon-zoom-in</span><span class="i-code">0xe827</span></div>
+        <div title="Code: 0xe828" class="the-icons span3"><i class="demo-icon icon-zoom-out">&#xe828;</i> <span class="i-name">icon-zoom-out</span><span class="i-code">0xe828</span></div>
+        <div title="Code: 0xf0ae" class="the-icons span3"><i class="demo-icon icon-tasks">&#xf0ae;</i> <span class="i-name">icon-tasks</span><span class="i-code">0xf0ae</span></div>
+        <div title="Code: 0xf0b0" class="the-icons span3"><i class="demo-icon icon-filter">&#xf0b0;</i> <span class="i-name">icon-filter</span><span class="i-code">0xf0b0</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xf0e8" class="the-icons span3"><i class="icon-sitemap"></i> <span class="i-name">icon-sitemap</span><span class="i-code">0xf0e8</span></div>
-        <div title="Code: 0xf125" class="the-icons span3"><i class="icon-crop"></i> <span class="i-name">icon-crop</span><span class="i-code">0xf125</span></div>
-        <div title="Code: 0x1f304" class="the-icons span3"><i class="icon-picture"></i> <span class="i-name">icon-picture</span><span class="i-code">0x1f304</span></div>
-        <div title="Code: 0x1f464" class="the-icons span3"><i class="icon-user"></i> <span class="i-name">icon-user</span><span class="i-code">0x1f464</span></div>
+        <div title="Code: 0xf0e0" class="the-icons span3"><i class="demo-icon icon-mail-alt">&#xf0e0;</i> <span class="i-name">icon-mail-alt</span><span class="i-code">0xf0e0</span></div>
+        <div title="Code: 0xf0e8" class="the-icons span3"><i class="demo-icon icon-sitemap">&#xf0e8;</i> <span class="i-name">icon-sitemap</span><span class="i-code">0xf0e8</span></div>
+        <div title="Code: 0xf125" class="the-icons span3"><i class="demo-icon icon-crop">&#xf125;</i> <span class="i-name">icon-crop</span><span class="i-code">0xf125</span></div>
+        <div title="Code: 0x1f304" class="the-icons span3"><i class="demo-icon icon-picture">&#x1f304;</i> <span class="i-name">icon-picture</span><span class="i-code">0x1f304</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0x1f500" class="the-icons span3"><i class="icon-shuffle"></i> <span class="i-name">icon-shuffle</span><span class="i-code">0x1f500</span></div>
-        <div title="Code: 0x1f512" class="the-icons span3"><i class="icon-lock"></i> <span class="i-name">icon-lock</span><span class="i-code">0x1f512</span></div>
-        <div title="Code: 0x1f517" class="the-icons span3"><i class="icon-link"></i> <span class="i-name">icon-link</span><span class="i-code">0x1f517</span></div>
-        <div title="Code: 0x1f527" class="the-icons span3"><i class="icon-wrench"></i> <span class="i-name">icon-wrench</span><span class="i-code">0x1f527</span></div>
+        <div title="Code: 0x1f464" class="the-icons span3"><i class="demo-icon icon-user">&#x1f464;</i> <span class="i-name">icon-user</span><span class="i-code">0x1f464</span></div>
+        <div title="Code: 0x1f500" class="the-icons span3"><i class="demo-icon icon-shuffle">&#x1f500;</i> <span class="i-name">icon-shuffle</span><span class="i-code">0x1f500</span></div>
+        <div title="Code: 0x1f512" class="the-icons span3"><i class="demo-icon icon-lock">&#x1f512;</i> <span class="i-name">icon-lock</span><span class="i-code">0x1f512</span></div>
+        <div title="Code: 0x1f517" class="the-icons span3"><i class="demo-icon icon-link">&#x1f517;</i> <span class="i-name">icon-link</span><span class="i-code">0x1f517</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0x1f554" class="the-icons span3"><i class="icon-clock"></i> <span class="i-name">icon-clock</span><span class="i-code">0x1f554</span></div>
-        <div title="Code: 0x1f6ab" class="the-icons span3"><i class="icon-block"></i> <span class="i-name">icon-block</span><span class="i-code">0x1f6ab</span></div>
+        <div title="Code: 0x1f527" class="the-icons span3"><i class="demo-icon icon-wrench">&#x1f527;</i> <span class="i-name">icon-wrench</span><span class="i-code">0x1f527</span></div>
+        <div title="Code: 0x1f554" class="the-icons span3"><i class="demo-icon icon-clock">&#x1f554;</i> <span class="i-name">icon-clock</span><span class="i-code">0x1f554</span></div>
+        <div title="Code: 0x1f6ab" class="the-icons span3"><i class="demo-icon icon-block">&#x1f6ab;</i> <span class="i-name">icon-block</span><span class="i-code">0x1f6ab</span></div>
       </div>
     </div>
     <div class="container footer">Generated by <a href="http://fontello.com">fontello.com</a></div>
diff --git a/sources/admin/themes/default/fontello/font/fontello.eot b/sources/admin/themes/default/fontello/font/fontello.eot
index 9e3a4d6..b0615da 100644
Binary files a/sources/admin/themes/default/fontello/font/fontello.eot and b/sources/admin/themes/default/fontello/font/fontello.eot differ
diff --git a/sources/admin/themes/default/fontello/font/fontello.svg b/sources/admin/themes/default/fontello/font/fontello.svg
index a24fef1..77b8186 100644
--- a/sources/admin/themes/default/fontello/font/fontello.svg
+++ b/sources/admin/themes/default/fontello/font/fontello.svg
@@ -1,77 +1,78 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2015 by original authors @ fontello.com</metadata>
 <defs>
 <font id="fontello" horiz-adv-x="1000" >
 <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
 <missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="star" unicode="&#x2605;" d="m0 489q0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26 0-12-15-27l-203-197 48-279q1-4 1-12 0-11-6-19t-17-9q-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27z" horiz-adv-x="928.6" />
-<glyph glyph-name="star-empty" unicode="&#x2606;" d="m0 489q0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26 0-12-15-27l-203-197 48-279q1-4 1-12 0-28-23-28-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27z m123-34l171-165-41-235 211 111 211-111-41 235 171 165-235 35-106 213-105-213z" horiz-adv-x="928.6" />
-<glyph glyph-name="cog" unicode="&#x2699;" d="m0 289v124q0 7 5 13t10 7l104 16q8 25 22 51-23 32-60 77-6 7-6 14 0 5 5 12 15 20 55 60t53 40q7 0 15-5l77-60q24 13 50 21 9 76 17 104 3 15 20 15h124q7 0 13-4t7-12l15-103q28-9 50-21l80 60q5 5 13 5 7 0 14-5 72-67 92-95 4-5 4-13 0-6-4-12-9-12-29-38t-30-39q14-28 23-55l102-15q7-1 12-7t4-13v-124q0-7-4-13t-11-7l-104-16q-10-30-21-51 19-28 59-77 6-6 6-14t-5-12q-15-21-55-61t-53-39q-7 0-14 5l-77 60q-25-13-51-21-9-76-16-104-4-16-20-16h-124q-8 0-14 5t-6 12l-16 103q-27 9-50 20l-79-59q-6-5-14-5-8 0-14 6-70 63-92 94-4 5-4 12 0 7 5 13 8 12 28 37t30 40q-15 28-23 55l-102 15q-7 1-11 7t-5 13z m286 61q0-59 42-101t101-42 101 42 41 101-41 101-101 42-101-42-42-101z" horiz-adv-x="857.1" />
-<glyph glyph-name="cog-alt" unicode="&#x26ef;" d="m0 299v103q0 6 4 11t9 6l86 14q7 19 18 42-19 27-50 64-4 6-4 11 0 7 4 12 12 16 46 49t44 33q6 0 12-4l64-50q19 10 43 18 6 60 13 86 3 13 16 13h104q6 0 11-4t6-10l13-85q19-6 41-17l66 49q5 4 11 4 7 0 12-4 81-75 81-90 0-5-4-10-7-9-24-30t-25-34q13-27 19-46l85-12q5-2 9-6t4-11v-103q0-6-4-11t-9-6l-86-14q-6-19-18-42 19-27 50-64 4-6 4-11 0-7-4-11-13-17-46-50t-44-33q-6 0-11 4l-64 50q-21-11-43-17-6-60-13-87-4-13-17-13h-104q-6 0-11 4t-5 10l-13 85q-19 6-42 18l-66-50q-4-4-11-4-6 0-12 4-80 75-80 90 0 5 4 10 5 8 23 30t26 34q-13 24-20 46l-85 13q-5 1-9 5t-4 11z m214 51q0-59 42-101t101-42 101 42 42 101-42 101-101 42-101-42-42-101z m429-325v78q0 9 83 18 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 1 17 1t17-1q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-9 83-18v-78q0-9-83-17-6-15-16-29 28-63 28-77 0-2-2-4-68-40-69-40-5 0-26 27t-29 37q-11-1-17-1t-17 1q-7-11-29-37t-25-27q-1 0-69 40-3 2-3 4 0 14 29 77-10 14-17 29-83 8-83 17z m0 572v78q0 9 83 17 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 2 17 2t17-2q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-8 83-17v-78q0-9-83-18-6-15-16-29 28-63 28-77 0-2-2-4-68-39-69-39-5 0-26 26t-29 38q-11-1-17-1t-17 1q-7-12-29-38t-25-26q-1 0-69 39-3 2-3 4 0 14 29 77-10 14-17 29-83 9-83 18z m143-533q0-29 21-50t50-21 51 21 21 50q0 29-22 51t-50 21-50-21-21-51z m0 572q0-30 21-51t50-21 51 21 21 51q0 29-22 50t-50 21-50-21-21-50z" horiz-adv-x="1071.4" />
-<glyph glyph-name="mail" unicode="&#x2709;" d="m0 11v607q0 37 26 63t63 26h822q37 0 63-26t26-63v-607q0-37-26-63t-63-27h-822q-36 0-63 27t-26 63z m71 0q0-8 6-13t12-5h822q7 0 12 5t6 13v428q-18-20-39-37-149-114-238-188-28-24-46-38t-48-27-57-13h-2q-26 0-57 13t-48 27-46 38q-88 74-238 188-21 17-39 37v-428z m0 607q0-94 82-159 108-84 224-176 4-3 20-17t25-21 25-17 28-16 24-5h2q11 0 24 5t28 16 25 17 25 21 20 17q116 92 224 176 30 24 56 65t26 73v14t-1 7-1 7-3 5-5 4-8 2h-822q-7 0-12-6t-6-12z" horiz-adv-x="1000" />
-<glyph glyph-name="pencil" unicode="&#x270e;" d="m0-79v233l464 464 232-232-464-465h-232z m71 143h72v-71h60l50 51-131 131-51-51v-60z m95 143q0-12 13-12 5 0 9 4l303 302q3 4 3 10 0 12-12 12-5 0-9-4l-303-302q-4-4-4-10z m334 447l93 92q20 21 50 21 29 0 51-21l131-131q20-22 20-51 0-29-20-50l-93-93z" horiz-adv-x="857.1" />
-<glyph glyph-name="plus-circled" unicode="&#x2795;" d="m0 350q0 117 58 215t155 156 216 58 215-58 156-156 57-215-57-215-156-156-215-58-216 58-155 156-58 215z m179-36q0-14 10-25t25-10h143v-143q0-15 11-25t25-11h71q15 0 25 11t11 25v143h143q14 0 25 10t11 25v72q0 14-11 25t-25 10h-143v143q0 15-11 25t-25 11h-71q-15 0-25-11t-11-25v-143h-143q-14 0-25-10t-10-25v-72z" horiz-adv-x="857.1" />
+<glyph glyph-name="star" unicode="&#x2605;" d="m929 489q0-12-15-27l-203-197 48-279q1-4 1-12 0-11-6-19t-17-9q-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27 0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26z" horiz-adv-x="928.6" />
+<glyph glyph-name="star-empty" unicode="&#x2606;" d="m634 290l171 165-235 35-106 213-105-213-236-35 171-165-41-235 211 111 211-111z m295 199q0-12-15-27l-203-197 48-279q1-4 1-12 0-28-23-28-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27 0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26z" horiz-adv-x="928.6" />
+<glyph glyph-name="cog" unicode="&#x2699;" d="m571 350q0 59-41 101t-101 42-101-42-42-101 42-101 101-42 101 42 41 101z m286 61v-124q0-7-4-13t-11-7l-104-16q-10-30-21-51 19-27 59-77 6-6 6-13t-5-13q-15-21-55-61t-53-39q-7 0-14 5l-77 60q-25-13-51-21-9-76-16-104-4-16-20-16h-124q-8 0-14 5t-6 12l-16 103q-27 9-50 21l-79-60q-6-5-14-5-8 0-14 6-70 64-92 94-4 5-4 13 0 6 5 12 8 12 28 37t30 40q-15 28-23 55l-102 15q-7 1-11 7t-5 13v124q0 7 5 13t10 7l104 16q8 25 22 51-23 32-60 77-6 7-6 14 0 5 5 12 15 20 55 60t53 40q7 0 15-5l77-60q24 13 50 21 9 76 17 104 3 15 20 15h124q7 0 13-4t7-12l15-103q28-9 50-21l80 60q5 5 13 5 7 0 14-5 72-67 92-95 4-5 4-13 0-6-4-12-9-12-29-38t-30-39q14-28 23-55l102-15q7-1 12-7t4-13z" horiz-adv-x="857.1" />
+<glyph glyph-name="cog-alt" unicode="&#x26ef;" d="m500 350q0 59-42 101t-101 42-101-42-42-101 42-101 101-42 101 42 42 101z m429-286q0 29-22 51t-50 21-50-21-21-51q0-29 21-50t50-21 51 21 21 50z m0 572q0 29-22 50t-50 21-50-21-21-50q0-30 21-51t50-21 51 21 21 51z m-215-235v-103q0-6-4-11t-9-6l-86-14q-6-19-18-42 19-27 50-64 4-6 4-11 0-7-4-11-13-17-46-50t-44-33q-6 0-11 4l-64 50q-21-11-43-17-6-60-13-87-4-13-17-13h-104q-6 0-11 4t-5 10l-13 85q-19 6-42 18l-66-50q-4-4-11-4-6 0-12 4-80 75-80 90 0 5 4 10 5 8 23 30t26 34q-13 24-20 46l-85 13q-5 1-9 5t-4 11v103q0 6 4 11t9 6l86 14q7 19 18 42-19 27-50 64-4 6-4 11 0 7 4 11 12 17 46 50t44 33q6 0 12-4l64-50q19 10 43 18 6 60 13 86 3 13 16 13h104q6 0 11-4t6-10l13-85q19-6 41-17l66 49q5 4 11 4 7 0 12-4 81-75 81-90 0-5-4-10-7-9-24-30t-25-34q13-27 19-46l85-12q5-2 9-6t4-11z m357-298v-78q0-9-83-17-6-15-16-29 28-63 28-77 0-2-2-4-68-40-69-40-5 0-26 27t-29 37q-11-1-17-1t-17 1q-7-11-29-37t-25-27q-1 0-69 40-3 2-3 4 0 14 29 77-10 14-17 29-83 8-83 17v78q0 9 83 18 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 1 17 1t17-1q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-9 83-18z m0 572v-78q0-9-83-18-6-15-16-29 28-63 28-77 0-2-2-4-68-39-69-39-5 0-26 26t-29 38q-11-1-17-1t-17 1q-7-12-29-38t-25-26q-1 0-69 39-3 2-3 4 0 14 29 77-10 14-17 29-83 9-83 18v78q0 9 83 17 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 2 17 2t17-2q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-8 83-17z" horiz-adv-x="1071.4" />
+<glyph glyph-name="mail" unicode="&#x2709;" d="m929 11v428q-18-20-39-37-149-114-238-188-28-24-46-38t-48-27-57-13h-2q-26 0-57 13t-48 27-46 38q-88 74-238 188-21 17-39 37v-428q0-8 6-13t12-5h822q7 0 12 5t6 13z m0 586v14t-1 7-1 7-3 5-5 4-8 2h-822q-7 0-12-6t-6-12q0-94 82-159 108-85 224-177 4-2 20-16t25-21 25-18 28-15 24-5h2q11 0 24 5t28 15 25 18 25 21 20 16q116 92 224 177 30 24 56 65t26 73z m71 21v-607q0-37-26-63t-63-27h-822q-36 0-63 27t-26 63v607q0 37 26 63t63 26h822q37 0 63-26t26-63z" horiz-adv-x="1000" />
+<glyph glyph-name="pencil" unicode="&#x270e;" d="m203-7l50 51-131 131-51-51v-60h72v-71h60z m291 518q0 12-12 12-5 0-9-4l-303-302q-4-4-4-10 0-12 13-12 5 0 9 4l303 302q3 4 3 10z m-30 107l232-232-464-465h-232v233z m381-54q0-29-20-50l-93-93-232 233 93 92q20 21 50 21 29 0 51-21l131-131q20-22 20-51z" horiz-adv-x="857.1" />
+<glyph glyph-name="plus-circled" unicode="&#x2795;" d="m679 314v72q0 14-11 25t-25 10h-143v143q0 15-11 25t-25 11h-71q-15 0-25-11t-11-25v-143h-143q-14 0-25-10t-10-25v-72q0-14 10-25t25-11h143v-142q0-15 11-25t25-11h71q15 0 25 11t11 25v142h143q14 0 25 11t11 25z m178 36q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
 <glyph glyph-name="asl" unicode="&#xe0ad;" d="m1 700q-4 37 15 53t45 5 35-38l53-184q-15-29-14-64 6-30 36-204 7-52 32-82t65-29q47 0 74 37 34-39 83-37t74 41q27-37 71-41t73 27q12 16 20 32t11 37 5 33 1 40l0 38q26-10 61 24 49 45 109 78t98 8q33-24 31-59t-35-55q-61-25-104-82t-67-112-58-117-78-93q-21-18-66-18l-350 0q-84 6-105 118z m181-234q-6 45 21 65t56 8 37-48l21-209q4-41-17-63t-46-15-37 45z m155 70q2 41 32 56t62-1 36-49l8-248q0-59-28-76t-57 4-30 62z m175 4q4 43 37 55t62-7 30-52l-6-254q-5-47-34-66t-54 1-29 67z" horiz-adv-x="979" />
-<glyph glyph-name="eye" unicode="&#xe70a;" d="m0 314q0 19 11 39 78 128 210 205t279 78 279-78 210-205q11-20 11-39t-11-38q-78-129-210-206t-279-77-279 77-210 206q-11 19-11 38z m71 0q75-114 187-182t242-68 242 68 187 182q-85 132-213 197 34-58 34-125 0-104-73-177t-177-73-177 73-73 177q0 67 34 125-128-65-213-197z m259 72q0-11 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19-8 19-19 7q-70 0-120-50t-50-119z" horiz-adv-x="1000" />
-<glyph glyph-name="tags" unicode="&#xe70d;" d="m0 475v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50 0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65z m107 125q0-30 21-50t51-21 50 21 21 50-21 51-50 20-51-20-21-51z m286 179h125q29 0 65-15t57-36l399-399q21-21 21-50 0-30-21-51l-274-274q-22-21-51-21-20 0-33 8t-29 25l262 262q21 21 21 51 0 29-21 50l-399 399q-21 21-57 36t-65 15z" horiz-adv-x="1071.4" />
-<glyph glyph-name="chat" unicode="&#xe720;" d="m0 421q0 78 53 144t143 104 197 38 197-38 143-104 53-144-53-143-143-104-197-38q-48 0-98 9-70-50-155-72-21-5-48-9h-2q-6 0-12 5t-6 11q-1 2-1 4t1 4 1 3l1 3t2 3 2 3 3 2 2 3q3 3 13 14t15 16 12 17 14 21 11 25q-69 40-108 98t-40 125z m344-354q32-3 49-3 90 0 172 25t148 72q69 52 107 119t37 141q0 43-13 85 72-39 114-99t42-128q0-67-40-126t-108-98q5-14 11-25t14-21 13-16 14-17 13-14q0 0 2-2t3-3 2-3 2-3l1-3t1-3 1-4-1-3q-2-8-7-13t-13-4q-27 4-48 9-85 23-155 72-50-9-98-9-151 0-263 74z" horiz-adv-x="1000" />
-<glyph glyph-name="trash" unicode="&#xe729;" d="m0 582v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q22 0 44-15t30-35l39-93h173q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13z m143-547q0-12 4-22t8-15 6-5h464q2 0 6 5t8 15 4 22v529h-500v-529z m71 83v321q0 8 5 13t13 5h36q8 0 13-5t5-13v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13z m54 518h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m89-518v321q0 8 5 13t13 5h36q8 0 13-5t5-13v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13z m143 0v321q0 8 5 13t13 5h36q7 0 12-5t5-13v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13z" horiz-adv-x="785.7" />
-<glyph glyph-name="basket" unicode="&#xe73d;" d="m0 671q0 15 11 26t25 10h143q9 0 16-3t11-9 7-14 4-15 3-16 3-14h670q14 0 25-11t11-25v-286q0-13-9-24t-23-12l-583-68q1-3 3-12t3-14 1-13q0-9-13-35h513q15 0 26-11t10-25-10-25-26-11h-571q-14 0-25 11t-11 25q0 8 6 22t17 33 11 21l-98 460h-114q-15 0-25 10t-11 25z m214-678q0 29 21 50t51 21 50-21 21-50-21-51-50-21-51 21-21 51z m500 0q0 29 21 50t51 21 50-21 21-50-21-51-50-21-51 21-21 51z" horiz-adv-x="928.6" />
+<glyph glyph-name="eye" unicode="&#xe70a;" d="m929 314q-85 132-213 197 34-58 34-125 0-104-73-177t-177-73-177 73-73 177q0 67 34 125-128-65-213-197 75-114 187-182t242-68 242 68 187 182z m-402 215q0 11-8 19t-19 7q-70 0-120-50t-50-119q0-12 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19z m473-215q0-19-11-38-78-129-210-206t-279-77-279 77-210 206q-11 19-11 38t11 39q78 128 210 205t279 78 279-78 210-205q11-20 11-39z" horiz-adv-x="1000" />
+<glyph glyph-name="tags" unicode="&#xe70d;" d="m250 600q0 30-21 51t-50 20-51-20-21-51 21-50 51-21 50 21 21 50z m595-321q0-30-20-51l-274-274q-22-21-51-21-30 0-50 21l-399 399q-21 21-36 57t-15 65v232q0 29 21 50t50 22h233q29 0 65-15t57-36l399-399q20-21 20-50z m215 0q0-30-21-51l-274-274q-22-21-51-21-20 0-33 8t-29 25l262 262q21 21 21 51 0 29-21 50l-399 399q-21 21-57 36t-65 15h125q29 0 65-15t57-36l399-399q21-21 21-50z" horiz-adv-x="1071.4" />
+<glyph glyph-name="chat" unicode="&#xe720;" d="m786 421q0-77-53-143t-143-104-197-38q-48 0-98 9-70-49-155-72-21-5-48-9h-2q-6 0-12 5t-6 12q-1 1-1 3t1 4 1 3l1 3t2 3 2 3 3 3 2 2q3 3 13 14t15 16 12 17 14 21 11 25q-69 40-108 98t-40 125q0 78 53 144t143 104 197 38 197-38 143-104 53-144z m214-142q0-67-40-126t-108-98q5-14 11-25t14-21 13-16 14-17 13-14q0 0 2-2t3-3 2-3 2-3l1-3t1-3 1-4-1-3q-2-8-7-13t-13-4q-27 4-48 9-85 23-155 72-50-9-98-9-151 0-263 74 32-3 49-3 90 0 172 25t148 72q69 52 107 119t37 141q0 43-13 85 72-39 114-99t42-128z" horiz-adv-x="1000" />
+<glyph glyph-name="trash" unicode="&#xe729;" d="m286 439v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m143 0v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m142 0v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q7 0 12-5t5-13z m72-404v529h-500v-529q0-12 4-22t8-15 6-5h464q2 0 6 5t8 15 4 22z m-375 601h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q22 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" />
+<glyph glyph-name="basket" unicode="&#xe73d;" d="m357-7q0-29-21-50t-50-22-50 22-22 50 22 50 50 21 50-21 21-50z m500 0q0-29-21-50t-50-22-51 22-21 50 21 50 51 21 50-21 21-50z m72 607v-286q0-13-10-23t-22-12l-583-68q7-34 7-40 0-8-13-35h513q15 0 26-11t10-25-10-25-26-11h-571q-14 0-25 11t-11 25q0 6 5 18t9 20 12 22 8 16l-98 460h-114q-15 0-25 10t-11 25 11 26 25 10h143q9 0 16-3t10-9 8-14 4-14 3-17 3-14h670q14 0 25-11t11-25z" horiz-adv-x="928.6" />
 <glyph glyph-name="puzzle" unicode="&#xe7b6;" d="m586 402q-37 0-64-34t-27-82 27-84 64-34q22 0 43 13 26 17 37 11t12-24l0-144q0-31-24-54t-55-23l-143 0q-16 0-23 9t2 31q21 25 21 51 0 38-34 64t-83 26-83-26-35-64q0-22 13-44 17-26 12-37t-25-10l-143 0q-33 0-55 23t-23 54l0 144q0 16 9 23t31-3q24-20 51-20 38 0 65 34t27 84-27 82-65 34q-21 0-42-13-26-17-38-12t-11 25l0 91q0 33 23 56t55 23l143 0q19 0 25 10t-11 37q-14 20-14 44 0 38 35 64t83 26 83-26 34-64q0-26-21-51-10-21-2-31t23-9l143 0q31 0 55-23t24-56l0-91q0-16-10-23t-30 3q-24 20-52 20z" horiz-adv-x="678" />
 <glyph glyph-name="language" unicode="&#xe800;" d="m988 306q30-82-10-176t-134-160q-10 0-12 2t-16 19-16 19q-2 6 2 10 86 60 117 152t-11 148q-16-38-39-76t-59-80-86-65-106-15q-52 6-84 41t-32 93q0 84 60 148 50 50 114 66l-2 100q-140-24-146-24-6-2-10 4 0 2-5 29t-5 31q-2 2 1 4t7 2l156 28q0 110-2 114 0 8 8 8 46 0 52 2 10 0 10-8l0-104q158 22 164 22 8 4 10-6 0-2 4-23t4-25q4-10-4-12l-176-30 0-102 12 0q86 0 148-36t86-100z m-370-160q28-6 62 6l-4 214q-34-12-60-40-44-44-44-108 0-66 46-72z m122 28q28 24 58 68t45 79 7 41q-36 18-96 18-2 0-6-1t-6-1z m-448 382q10-28 53-165t83-261 40-126q0-4-4-4l-86 0q-6 0-6 4l-50 166-176 0q-48-164-50-166 0-4-6-4l-86 0q-4 0-4 4 10 18 176 552 2 8 10 8l96 0q10 0 10-8z m-130-316l144 0-72 264z" horiz-adv-x="1001" />
-<glyph glyph-name="signal" unicode="&#xe801;" d="m0-61v107q0 8 5 13t13 5h107q8 0 13-5t5-13v-107q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13z m214 0v179q0 8 5 13t13 5h107q8 0 13-5t5-13v-179q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13z m215 0v322q0 8 5 13t12 5h108q7 0 12-5t5-13v-322q0-8-5-13t-12-5h-108q-7 0-12 5t-5 13z m214 0v536q0 8 5 13t13 5h107q8 0 13-5t5-13v-536q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13z m214 0v822q0 8 5 13t13 5h107q8 0 13-5t5-13v-822q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13z" horiz-adv-x="1000" />
+<glyph glyph-name="signal" unicode="&#xe801;" d="m143 46v-107q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13v107q0 8 5 13t13 5h107q8 0 13-5t5-13z m214 72v-179q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13v179q0 8 5 13t13 5h107q8 0 13-5t5-13z m214 143v-322q0-8-5-13t-12-5h-108q-7 0-12 5t-5 13v322q0 8 5 13t12 5h108q7 0 12-5t5-13z m215 214v-536q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13v536q0 8 5 13t13 5h107q8 0 13-5t5-13z m214 286v-822q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13v822q0 8 5 13t13 5h107q8 0 13-5t5-13z" horiz-adv-x="1000" />
 <glyph glyph-name="users" unicode="&#xe802;" d="m0 49q20 7 60 22t69 26 50 22q37 19 57 56t21 76q0 27-31 64-19 21-33 60-45 18-45 76 0 43 14 61-5 39-9 82-5 55 26 108t84 84 110 32q43 0 85-19t73-50 48-72 14-83q-4-55-8-82 14-19 14-61 0-58-45-76-15-41-32-60-32-37-32-64 0-39 20-76t58-56q29-15 92-38t113-43 66-38q18-17 28-47t10-51l1-21h-878v168z m705 299q0 34 12 50-5 32-7 67-4 45 21 89t69 72 90 27 89-27 69-72 22-89q-2-35-8-67 12-16 12-50 0-48-36-62-12-33-27-50-9-10-13-16t-9-16-4-20q0-32 17-62t47-46q17-9 42-19t60-22 50-19v-135h-254q0 4 0 11t-3 26-7 36-15 38-23 33q-23 25-53 44t-79 37q27 34 27 78 0 10-5 20t-8 16-12 16q-14 15-27 49-37 16-37 63z" horiz-adv-x="1201.2" />
 <glyph glyph-name="tools" unicode="&#xe803;" d="m155 506q-8-8-11-22t-3-25-2-11q-2-2-17-15t-19-17q-16-14-28 4l-70 76q-11 12 2 24 2 2 18 14t20 16q6 6 27 6t37 14q14 14 18 38t10 30q2 0 9 7t26 22 41 31q134 90 186 96 122 0 148-2 12 0-8-8-120-52-152-76-80-56-36-114 34-46 38-48 8-8-2-14-2-2-38-35t-38-35q-14-8-18-4-42 48-71 60t-67-12z m286-26l410-476q18-22-2-38l-48-42q-22-14-38 4l-414 472q-8 8 0 20l72 62q12 8 20-2z m554 202q16-104-16-166-50-88-154-62-56 12-100-32l-82-78-68 78 68 70q24 24 31 53t6 65 5 58q12 56 140 112 12 6 18-3t2-15q-12-12-46-80-14-10-12-35t40-53q58-40 96 22 6 12 26 41t22 33q4 10 13 9t11-17z m-858-684l254 248 76-86-246-242q-20-20-38-4l-46 46q-22 18 0 38z" horiz-adv-x="1000" />
-<glyph glyph-name="arrows-cw" unicode="&#xe804;" d="m0-7v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-37 90-57t105-20q74 0 139 37t104 99q6 10 29 66 5 13 17 13h107q8 0 13-6t5-12q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25z m10 446v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12z" horiz-adv-x="857.1" />
-<glyph glyph-name="exchange" unicode="&#xe805;" d="m0 136q0 8 5 13l179 178q5 5 12 5 8 0 13-5t5-13v-107h768q7 0 13-5t5-13v-107q0-7-5-12t-13-6h-768v-107q0-7-5-12t-13-6q-6 0-13 6l-178 178q-5 5-5 13z m0 303v107q0 8 5 13t13 5h768v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13t-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107h-768q-7 0-13 6t-5 12z" horiz-adv-x="1000" />
-<glyph glyph-name="folder-open" unicode="&#xe806;" d="m0 118v536q0 51 37 88t88 37h179q51 0 88-37t37-88v-18h303q51 0 88-37t37-88v-90h-464q-53 0-110-26t-92-67l-188-221-2-3q0 2-1 7t0 7z m41-94q0 17 17 37l188 221q24 28 67 48t80 20h607q19 0 34-7t15-24q0-18-18-37l-187-221q-24-28-67-48t-81-20h-607q-19 0-33 7t-15 24z" horiz-adv-x="1071.4" />
+<glyph glyph-name="arrows-cw" unicode="&#xe804;" d="m843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-37 90-57t105-20q74 0 139 37t104 99q6 10 29 66 5 13 17 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" />
+<glyph glyph-name="exchange" unicode="&#xe805;" d="m1000 189v-107q0-7-5-12t-13-6h-768v-107q0-7-5-12t-13-6q-6 0-13 6l-178 178q-5 5-5 13 0 8 5 13l179 178q5 5 12 5 8 0 13-5t5-13v-107h768q7 0 13-5t5-13z m0 304q0-8-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107h-768q-7 0-13 6t-5 12v107q0 8 5 13t13 5h768v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13z" horiz-adv-x="1000" />
+<glyph glyph-name="folder-open" unicode="&#xe806;" d="m1049 319q0-18-18-37l-187-221q-24-28-67-48t-81-20h-607q-19 0-33 7t-15 24q0 17 17 37l188 221q24 28 67 48t80 20h607q19 0 34-7t15-24z m-192 192v-90h-464q-53 0-110-26t-92-67l-188-221-2-3q0 2-1 7t0 7v536q0 51 37 88t88 37h179q51 0 88-37t37-88v-18h303q51 0 88-37t37-88z" horiz-adv-x="1071.4" />
 <glyph glyph-name="brush" unicode="&#xe807;" d="m118 170q38 34 85 29t87-45q42-40 48-87t-30-83q-86-84-228-102-84-12-80 14 0 4 6 10 52 60 64 145t48 119z m840 646q26-26-148-248t-292-338q-38-38-124-104-8-6-16 8-18 34-48 64-32 32-66 48-16 6-8 16 64 84 104 122 118 116 344 287t254 145z" horiz-adv-x="962" />
 <glyph glyph-name="flow-branch" unicode="&#xe808;" d="m640 650q0-80-74-110-6-58-28-101t-61-69-68-38-75-26q-42-14-63-22t-47-24-38-40-16-60q70-30 70-110 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 378q-72 34-72 110 0 50 35 85t85 35 85-35 35-85q0-76-72-110l0-204q40 30 138 60 58 18 84 29t51 41 29 76q-70 32-70 108 0 50 35 85t85 35 85-35 35-85z m-588 0q0-28 20-48t48-20 49 20 21 48q0 30-21 50t-49 20-48-20-20-50z m68-668q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z m400 600q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z" horiz-adv-x="640" />
-<glyph glyph-name="menu" unicode="&#xe809;" d="m0 29v71q0 15 11 25t25 11h785q15 0 26-11t10-25v-71q0-15-10-26t-26-10h-785q-15 0-25 10t-11 26z m0 285v72q0 14 11 25t25 10h785q15 0 26-10t10-25v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25z m0 286v71q0 15 11 26t25 10h785q15 0 26-10t10-26v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25z" horiz-adv-x="857.1" />
-<glyph glyph-name="code" unicode="&#xe80a;" d="m25 314q0 8 6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13t-6-12l-219-220 219-219q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-260 260q-6 6-6 13z m372-350l208 720q3 8 9 11t13 2l35-10q7-2 11-9t1-13l-208-721q-2-7-9-11t-13-1l-34 9q-8 3-11 9t-2 14z m325 118q0 7 5 13l219 219-219 220q-5 5-5 12t5 13l28 28q6 6 13 6t13-6l260-260q5-5 5-13t-5-13l-260-260q-6-5-13-5t-13 5l-28 28q-5 6-5 13z" horiz-adv-x="1071.4" />
+<glyph glyph-name="menu" unicode="&#xe809;" d="m857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
+<glyph glyph-name="code" unicode="&#xe80a;" d="m344 69l-28-28q-5-5-12-5t-13 5l-260 260q-6 6-6 13t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13t-6-12l-219-220 219-219q6-6 6-13t-6-13z m330 596l-208-721q-2-7-9-11t-13-1l-34 9q-8 3-11 9t-2 14l208 720q3 8 9 11t13 2l35-10q7-2 11-9t1-13z m367-364l-260-260q-6-5-13-5t-13 5l-28 28q-5 6-5 13t5 13l219 219-219 220q-5 5-5 12t5 13l28 28q6 6 13 6t13-6l260-260q5-5 5-13t-5-13z" horiz-adv-x="1071.4" />
 <glyph glyph-name="user-add" unicode="&#xe80b;" d="m620 128q180-64 180-122l0-106-800 0 0 202q36 14 82 26 94 34 129 69t35 95q0 22-23 48t-31 74q-2 12-23 25t-25 61q0 16 5 26t9 12l4 4q-8 50-12 88-6 54 40 112t160 58 160-58 42-112l-14-88q18-8 18-42-2-28-9-43t-14-17-14-8-9-18q-10-46-33-73t-23-49q0-60 36-95t130-69z m230 272l150 0 0-100-150 0 0-150-100 0 0 150-150 0 0 100 150 0 0 150 100 0 0-150z" horiz-adv-x="1000" />
-<glyph glyph-name="cw" unicode="&#xe80c;" d="m0 350q0 87 34 166t92 137 136 92 167 34q82 0 158-31t137-88l72 72q16 18 39 8 22-9 22-33v-250q0-14-10-25t-26-11h-250q-23 0-32 23-10 22 7 38l77 77q-82 77-194 77-58 0-111-23t-91-61-62-91-22-111 22-111 62-91 91-61 111-23q66 0 125 29t100 82q4 6 13 7 8 0 14-5l76-77q5-4 6-11t-5-13q-60-74-147-114t-182-41q-87 0-167 34t-136 92-92 137-34 166z" horiz-adv-x="857.1" />
+<glyph glyph-name="cw" unicode="&#xe80c;" d="m857 707v-250q0-14-10-25t-26-11h-250q-23 0-32 23-10 22 7 38l77 77q-82 77-194 77-58 0-111-23t-91-61-62-91-22-111 22-111 62-91 91-61 111-23q66 0 125 29t100 82q4 6 13 7 8 0 14-5l76-77q5-4 6-11t-5-13q-60-74-147-114t-182-41q-87 0-167 34t-136 92-92 137-34 166 34 166 92 137 136 92 167 34q82 0 158-31t137-88l72 72q16 18 39 8 22-9 22-33z" horiz-adv-x="857.1" />
 <glyph glyph-name="group" unicode="&#xe80d;" d="m0 106l0 134q0 26 18 32l171 80q-66 39-68 131 0 56 35 103 37 41 90 43 31 0 63-19-49-125 23-237-12-11-25-19l-114-55q-48-23-52-84l0-143-114 0q-25 0-27 34z m193-59l0 168q0 27 22 37l152 70 57 28q-37 23-60 66t-22 94q0 76 46 130t110 54 109-54 45-130q0-106-78-158l61-30 146-70q24-10 24-37l0-168q-2-37-37-41l-541 0q-14 2-24 14t-10 27z m473 330q68 106 22 231 31 19 66 21 49 0 90-43 35-41 35-103 0-82-65-131l168-80q18-10 18-32l0-134q0-32-27-34l-118 0 0 143q0 57-50 84l-110 53q-15 8-29 25z" horiz-adv-x="1000" />
 <glyph glyph-name="home" unicode="&#xe80e;" d="m888 336q16-16 11-27t-27-11l-84 0 0-310q0-14-1-21t-8-13-23-6l-204 0 0 310-204 0 0-310-194 0q-28 0-35 10t-7 30l0 310-84 0q-22 0-27 11t11 27l400 402q16 16 38 16t38-16z" horiz-adv-x="900" />
 <glyph glyph-name="equalizer" unicode="&#xe80f;" d="m576 239l0-112-55 0 0-167q0-23-17-40t-39-17-39 17-17 40l0 167-56 0 0 112 56 0 0 503q0 24 17 39t38 16q24 0 41-16t16-39l0-503 55 0z m335 335l0-112-55 0 0-502q0-23-16-40t-41-17q-23 0-39 17t-16 40l0 502-56 0 0 112 56 0 0 168q0 24 16 39t39 16 41-16 16-39l0-168 55 0z m-670-112l0-111-55 0 0-391q0-23-16-40t-40-17q-23 0-39 17t-17 40l0 391-56 0 0 111 56 0 0 280q0 24 16 39t40 16 40-16 16-39l0-280 55 0z" horiz-adv-x="928" />
 <glyph glyph-name="mail-1" unicode="&#xe810;" d="m467 366l-449 210 0 109 893 0 0-109z m0-123l444 210 0-437-893 0 0 438z" horiz-adv-x="928" />
 <glyph glyph-name="search" unicode="&#xe811;" d="m772 78q30-34 6-62l-46-46q-36-32-68 0l-190 190q-74-42-156-42-128 0-223 95t-95 223 90 219 218 91 224-95 96-223q0-88-46-162z m-678 358q0-88 68-156t156-68 151 63 63 153q0 88-68 155t-156 67-151-63-63-151z" horiz-adv-x="789" />
-<glyph glyph-name="move" unicode="&#xe812;" d="m0 350q0 15 11 25l143 143q10 11 25 11t25-11 10-25v-72h215v215h-72q-14 0-25 10t-11 25 11 26l143 142q11 11 25 11t25-11l143-142q11-11 11-26t-11-25-25-10h-72v-215h215v72q0 14 10 25t25 11 26-11l142-143q11-10 11-25t-11-25l-142-143q-11-11-26-11t-25 11-10 25v72h-215v-215h72q14 0 25-10t11-25-11-26l-143-142q-10-11-25-11t-25 11l-143 142q-11 11-11 26t11 25 25 10h72v215h-215v-72q0-14-10-25t-25-11-26 11l-142 143q-11 11-11 25z" horiz-adv-x="1000" />
+<glyph glyph-name="move" unicode="&#xe812;" d="m1000 350q0-14-11-25l-142-143q-11-11-26-11t-25 11-10 25v72h-215v-215h72q14 0 25-10t11-25-11-26l-143-142q-10-11-25-11t-25 11l-143 142q-11 11-11 26t11 25 25 10h72v215h-215v-72q0-14-10-25t-25-11-26 11l-142 143q-11 11-11 25t11 25l142 143q11 11 26 11t25-11 10-25v-72h215v215h-72q-14 0-25 10t-11 25 11 26l143 142q11 11 25 11t25-11l143-142q11-11 11-26t-11-25-25-10h-72v-215h215v72q0 14 10 25t25 11 26-11l142-143q11-10 11-25z" horiz-adv-x="1000" />
 <glyph glyph-name="upload" unicode="&#xe813;" d="m500 776l260-244-164 0 0-256-190 0 0 256-166 0z m468-578q18-10 27-32t3-40l-28-154q-4-20-22-33t-40-13l-816 0q-22 0-40 13t-22 33l-28 154q-10 48 32 72l158 108 98 0-170-130 178 0q8 0 12-8l40-110 300 0 40 110q8 8 12 8l178 0-170 130 98 0z" horiz-adv-x="1000" />
 <glyph glyph-name="upload-cloud" unicode="&#xe814;" d="m760 494q100 0 170-68t70-166-70-166-170-68l-190 0 0 190 106 0-176 230-174-230 104 0 0-190-248 0q-74 0-128 52t-54 124q0 74 53 126t129 52q14 0 20-2-2 12-2 38 0 108 78 184t188 76q90 0 160-52t94-134q28 4 40 4z" horiz-adv-x="1000" />
 <glyph glyph-name="key" unicode="&#xe815;" d="m774 612q20-116-28-215t-150-117q-66-12-130-2l-118-194-70-12-104-166q-14-28-46-32l-76-14q-12-4-22 4t-12 22l-16 98q-8 30 12 56l258 386q-24 50-38 120-18 106 53 187t185 101q106 20 195-45t107-177z m-126-76q30 44 21 97t-51 83q-42 32-92 22t-80-54q-8-12-12-23t-1-20 5-16 13-17 18-15 22-16 23-17q6-4 22-16t23-16 19-12 19-8 17 1 18 8 16 19z" horiz-adv-x="780" />
 <glyph glyph-name="network" unicode="&#xe816;" d="m224 504q-22 0-42-10-48 52-92 128 54 74 128 118 92-38 152-82-6-16-6-32 0-6 4-22-62-48-116-104-16 4-28 4z m-98-98q0-34 20-60-60-114-80-232-66 106-66 236 0 110 50 206 38-62 84-112-8-24-8-38z m336 318q-28 0-50-14-58 42-114 70 84 30 162 30 120 0 230-62-76-14-162-50-26 26-66 26z m146-460q-160 24-290 112 4 20 4 30 0 24-14 52 38 44 98 90 26-20 56-20 14 0 38 8 94-108 134-240-16-14-26-32z m128-132q38 14 54 60 58 4 108 18-46-146-166-232 6 48 6 98 0 10-1 28t-1 28z m-150 66q-190-96-304-272-90 36-158 110 12 144 80 274 6-2 20-2 30 0 52 14 142-98 310-124z m184 492q150-136 150-340 0-22-4-66-64-18-130-24-24 56-88 60-48 146-148 264 10 20 10 42l0 10q100 42 210 54z m-136-544q14-10 32-18 2-18 2-52 0-80-14-144-86-42-194-42-58 0-112 12 110 160 286 244z" horiz-adv-x="920" />
 <glyph glyph-name="info-circled-1" unicode="&#xe817;" d="m454 810q190 2 326-130t140-322q2-190-131-327t-323-141q-190-2-327 131t-139 323q-4 190 130 327t324 139z m52-152q-42 0-65-24t-23-50q-2-28 15-44t49-16q38 0 61 22t23 54q0 58-60 58z m-120-594q30 0 84 26t106 78l-18 24q-48-36-72-36-14 0-4 38l42 160q26 96-22 96-30 0-89-29t-115-75l16-26q52 34 74 34 12 0 0-34l-36-152q-26-104 34-104z" horiz-adv-x="920" />
-<glyph glyph-name="calendar" unicode="&#xe818;" d="m0-79v715q0 29 21 50t50 21h72v54q0 36 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 36 27 63t63 26h35q37 0 63-26t27-63v-54h71q29 0 50-21t22-50v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50z m71 0h161v161h-161v-161z m0 197h161v178h-161v-178z m0 214h161v161h-161v-161z m143 268q0-7 6-13t12-5h36q7 0 12 5t6 13v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161z m54-679h178v161h-178v-161z m0 197h178v178h-178v-178z m0 214h178v161h-178v-161z m214-411h179v161h-179v-161z m0 197h179v178h-179v-178z m0 214h179v161h-179v-161z m161 268q0-7 5-13t13-5h35q8 0 13 5t5 13v161q0 7-5 12t-13 6h-35q-8 0-13-6t-5-12v-161z m53-679h161v161h-161v-161z m0 197h161v178h-161v-178z m0 214h161v161h-161v-161z" horiz-adv-x="928.6" />
-<glyph glyph-name="ok" unicode="&#xe819;" d="m68 332q0 22 15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q15-16 15-38t-15-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38z" horiz-adv-x="1000" />
+<glyph glyph-name="calendar" unicode="&#xe818;" d="m71-79h161v161h-161v-161z m197 0h178v161h-178v-161z m-197 197h161v178h-161v-178z m197 0h178v178h-178v-178z m-197 214h161v161h-161v-161z m411-411h179v161h-179v-161z m-214 411h178v161h-178v-161z m428-411h161v161h-161v-161z m-214 197h179v178h-179v-178z m-196 482v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161q0-7 6-13t12-5h36q7 0 12 5t6 13z m410-482h161v178h-161v-178z m-214 214h179v161h-179v-161z m214 0h161v161h-161v-161z m18 268v161q0 7-5 12t-13 6h-35q-8 0-13-6t-5-12v-161q0-7 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 36 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 36 27 63t63 26h35q37 0 63-26t27-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" />
+<glyph glyph-name="ok" unicode="&#xe819;" d="m932 534q0-22-15-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38t15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q15-16 15-38z" horiz-adv-x="1000" />
 <glyph glyph-name="help-circled" unicode="&#xe81a;" d="m454 810q190 2 326-130t140-322q2-190-131-327t-323-141q-190-2-327 131t-139 323q-4 190 130 327t324 139z m-2-740q30 0 49 19t19 47q2 30-17 49t-49 19l-2 0q-28 0-47-18t-21-46q0-30 19-49t47-21l2 0z m166 328q26 34 26 78 0 78-54 116-52 38-134 38-64 0-104-26-68-42-72-146l0-4 110 0 0 4q0 26 16 54 16 24 54 24 40 0 52-20 16-20 16-44 0-18-16-40-8-12-20-20l-6-4q-6-4-16-11t-20-15-21-17-17-17q-14-20-18-78l0-8 108 0 0 4q0 12 4 28 6 20 28 36l28 18q46 34 56 50z" horiz-adv-x="920" />
-<glyph glyph-name="logout" unicode="&#xe81b;" d="m0 154v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-27t-27-63v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114z m214 89v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25t-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25z" horiz-adv-x="928.6" />
+<glyph glyph-name="logout" unicode="&#xe81b;" d="m357 46q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-27t-27-63v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8z m518 304q0-14-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25z" horiz-adv-x="928.6" />
 <glyph glyph-name="flag" unicode="&#xe81c;" d="m874 616q14 6 22-1t0-19q-96-138-164-213t-110-90-73-2-60 37-63 40-93-4-139-86l90-352-100 0-184 720 92 34q90 66 152 86t98 3 64-51 62-71 79-62 129-20 198 51z" horiz-adv-x="900" />
 <glyph glyph-name="spin6" unicode="&#xe81d;" d="m855 9c-189-190-520-172-705 13-190 190-200 494-28 695 11 13 21 26 35 34 36 23 85 18 117-13 30-31 35-76 16-112-5-9-9-15-16-22-140-151-145-379-8-516 153-153 407-121 542 34 106 122 142 297 77 451-83 198-305 291-510 222l0 1c236 82 492-24 588-252 71-167 37-355-72-493-11-15-23-29-36-42z" horiz-adv-x="1000" />
 <glyph glyph-name="hourglass" unicode="&#xe81e;" d="m560 622q0-44-48-96t-97-99-49-77 49-76 97-97 48-97l0-118q0-34-86-73t-194-39-194 39-86 73l0 118q0 46 48 97t97 97 49 76-49 77-97 99-48 96l0 118q0 32 87 71t193 39 193-39 87-71l0-118z m-482 112l-18-14q-4-8 4-14 92-52 216-52 132 0 220 50 14 10-16 30-96 54-202 54-120 0-204-54z m228-384q0 18 4 33t18 33 20 25 31 31 29 28q92 92 92 122l2 50q-100-54-222-54t-222 54l4-50q0-32 90-122 6-6 22-21t23-22l19-19t17-21 11-20 9-23 3-24q0-10-1-19t-6-18-8-16-11-17l-12-15t-15-16-16-15-18-16-17-16q-90-90-90-122l0-66q8 4 66 23t92 43 34 58q0 30 26 30t26-30q0-34 33-58t94-43 67-23l0 66q0 30-92 122-4 4-21 20t-22 21-18 19-18 22-12 20-9 23-2 23z" horiz-adv-x="560" />
-<glyph glyph-name="check" unicode="&#xe81f;" d="m0 154v464q0 66 47 113t114 48h464q35 0 65-14 9-4 10-13 2-10-5-16l-27-28q-6-5-13-5-2 0-5 1-13 3-25 3h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v141q0 8 5 13l36 35q6 6 13 6 3 0 7-2 11-4 11-16v-177q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114z m143 267q0 19 14 32l61 62q14 13 32 13t32-13l147-147 361 361q13 13 31 13t32-13l62-61q13-14 13-32t-13-32l-455-454q-13-14-31-14t-32 14l-240 240q-14 13-14 31z" horiz-adv-x="928.6" />
-<glyph glyph-name="check-empty" unicode="&#xe820;" d="m0 154v464q0 66 47 113t114 48h464q66 0 114-48t47-113v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114z m71 0q0-37 27-63t63-27h464q37 0 63 27t26 63v464q0 37-26 63t-63 26h-464q-37 0-63-26t-27-63v-464z" horiz-adv-x="785.7" />
-<glyph glyph-name="cancel-circled" unicode="&#xe821;" d="m0 350q0 117 58 215t155 156 216 58 215-58 156-156 57-215-57-215-156-156-215-58-216 58-155 156-58 215z m216-126q0-15 11-26l50-50q10-11 25-11 15 0 26 11l101 101 101-101q10-11 25-11 15 0 25 11l51 50q10 11 10 26 0 14-10 25l-101 101 101 101q10 11 10 25 0 15-10 26l-51 50q-10 11-25 11-15 0-25-11l-101-101-101 101q-11 11-26 11-15 0-25-11l-50-50q-11-11-11-26 0-14 11-25l101-101-101-101q-11-11-11-25z" horiz-adv-x="857.1" />
-<glyph glyph-name="cancel" unicode="&#xe822;" d="m61 112q0 23 16 38l164 164-164 164q-16 16-16 38t16 38l76 76q16 16 38 16t38-16l164-164 164 164q16 16 38 16t38-16l76-76q15-15 15-38t-15-38l-164-164 164-164q15-15 15-38t-15-38l-76-76q-16-15-38-15t-38 15l-164 164-164-164q-16-15-38-15t-38 15l-76 76q-16 16-16 38z" horiz-adv-x="785.7" />
-<glyph glyph-name="plus" unicode="&#xe823;" d="m0 332v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q22 0 38-16t16-38v-107q0-22-16-38t-38-16h-232v-232q0-22-16-38t-38-15h-107q-22 0-38 15t-15 38v232h-232q-23 0-38 16t-16 38z" horiz-adv-x="785.7" />
-<glyph glyph-name="ok-circled" unicode="&#xe824;" d="m0 350q0 117 58 215t155 156 216 58 215-58 156-156 57-215-57-215-156-156-215-58-216 58-155 156-58 215z m141-11q0-15 10-25l202-202q10-10 25-10 15 0 25 10l303 303q11 10 11 25 0 16-11 26l-50 50q-11 11-25 11t-26-11l-227-227-126 126q-11 11-25 11t-26-11l-50-50q-10-10-10-26z" horiz-adv-x="857.1" />
-<glyph glyph-name="zoom-in" unicode="&#xe827;" d="m0 386q0 80 31 152t84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51t-21-50-51-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 83-84 126-31 153z m143 0q0-103 73-177t177-73 176 73 74 177-74 176-176 74-177-74-73-176z m71-18v36q0 7 6 12t12 5h125v125q0 8 5 13t13 5h36q7 0 12-5t6-13v-125h125q7 0 12-5t5-12v-36q0-7-5-13t-12-5h-125v-125q0-7-6-13t-12-5h-36q-7 0-13 5t-5 13v125h-125q-7 0-12 5t-6 13z" horiz-adv-x="928.6" />
-<glyph glyph-name="zoom-out" unicode="&#xe828;" d="m0 386q0 80 31 152t84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51t-21-50-51-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 83-84 126-31 153z m143 0q0-103 73-177t177-73 176 73 74 177-74 176-176 74-177-74-73-176z m71-18v36q0 7 6 12t12 5h322q7 0 12-5t5-12v-36q0-7-5-13t-12-5h-322q-7 0-12 5t-6 13z" horiz-adv-x="928.6" />
-<glyph glyph-name="tasks" unicode="&#xf0ae;" d="m0 29v142q0 15 11 26t25 10h928q15 0 25-10t11-26v-142q0-15-11-26t-25-10h-928q-15 0-25 10t-11 26z m0 285v143q0 15 11 25t25 11h928q15 0 25-11t11-25v-143q0-14-11-25t-25-10h-928q-15 0-25 10t-11 25z m0 286v143q0 14 11 25t25 11h928q15 0 25-11t11-25v-143q0-15-11-25t-25-11h-928q-15 0-25 11t-11 25z m357-250h572v71h-572v-71z m214-286h358v72h-358v-72z m143 572h215v71h-215v-71z" horiz-adv-x="1000" />
-<glyph glyph-name="filter" unicode="&#xf0b0;" d="m3 685q9 22 33 22h714q23 0 33-22 9-23-8-39l-275-275v-414q0-23-22-33-7-3-14-3-15 0-25 11l-143 143q-10 10-10 25v271l-275 275q-18 16-8 39z" horiz-adv-x="785.7" />
-<glyph glyph-name="mail-alt" unicode="&#xf0e0;" d="m0 11v443q25-28 56-49 202-137 278-192 32-24 51-37t53-27 61-13h2q28 0 61 13t53 27 51 37q95 68 278 192 32 22 56 49v-443q0-37-26-63t-63-27h-822q-36 0-63 27t-26 63z m0 595q0 43 23 72t66 29h822q36 0 62-26t27-63q0-44-27-84t-68-69q-210-146-262-181-5-4-23-17t-30-22-29-18-33-15-27-5h-2q-12 0-27 5t-33 15-29 18-30 22-23 17q-51 35-147 101t-114 80q-35 23-65 64t-31 77z" horiz-adv-x="1000" />
-<glyph glyph-name="sitemap" unicode="&#xf0e8;" d="m0-25v179q0 22 16 38t38 15h53v107q0 29 21 51t51 21h285v107h-53q-23 0-38 15t-16 38v179q0 22 16 38t38 16h178q23 0 38-16t16-38v-179q0-22-16-38t-38-15h-53v-107h285q29 0 51-21t21-51v-107h53q23 0 38-15t16-38v-179q0-22-16-38t-38-16h-178q-22 0-38 16t-16 38v179q0 22 16 38t38 15h53v107h-285v-107h53q23 0 38-15t16-38v-179q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v179q0 22 16 38t38 15h53v107h-285v-107h53q22 0 38-15t16-38v-179q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38z" horiz-adv-x="1000" />
-<glyph glyph-name="crop" unicode="&#xf125;" d="m0 511v107q0 8 5 13t13 5h125v125q0 7 5 12t13 5h107q8 0 13-5t5-12v-125h475l137 138q5 5 13 5t13-5q5-6 5-13t-5-13l-138-137v-475h125q8 0 13-5t5-13v-107q0-8-5-13t-13-5h-125v-125q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13v125h-482q-8 0-13 5t-5 13v482h-125q-8 0-13 5t-5 13z m286-350l332 332h-332v-332z m25-25h332v332z" horiz-adv-x="928.6" />
-<glyph glyph-name="picture" unicode="&#x1f304;" d="m0 11v678q0 37 26 63t63 27h893q37 0 63-27t26-63v-678q0-37-26-63t-63-27h-893q-36 0-63 27t-26 63z m71 0q0-8 6-13t12-5h893q7 0 13 5t5 13v678q0 8-5 13t-13 5h-893q-7 0-12-5t-6-13v-678z m72 53v107l178 179 90-89 285 285 233-232v-250h-786z m0 465q0 44 31 75t76 32 76-32 31-75-31-76-76-32-76 32-31 76z" horiz-adv-x="1071.4" />
-<glyph glyph-name="user" unicode="&#x1f464;" d="m0 66q0 30 2 58t8 61 15 60 24 55 34 45 48 30 62 11q5 0 24-12t41-27 60-27 75-12 74 12 61 27 41 27 24 12q34 0 62-11t48-30 34-45 24-55 15-60 8-61 2-58q0-67-41-106t-108-39h-488q-67 0-108 39t-41 106z m179 498q0 89 62 152t152 63 151-63 63-152-63-151-151-63-152 63-62 151z" horiz-adv-x="785.7" />
-<glyph glyph-name="shuffle" unicode="&#x1f500;" d="m0 82v107q0 8 5 13t13 5h125q27 0 48 9t39 25 28 34 26 43q17 35 43 96 16 36 28 62t30 58 36 56 41 46 50 38 59 24 72 9h143v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13t-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107h-143q-27 0-49-8t-38-25-29-35-25-43q-18-34-43-95-16-37-28-62t-30-59-36-55-41-47-50-38-60-23-71-10h-125q-8 0-13 5t-5 13z m0 500v107q0 8 5 13t13 5h125q139 0 229-125-34-52-77-153-12 25-20 41t-23 35-28 32-36 19-45 8h-125q-8 0-13 5t-5 13z m415-392q33 52 76 152 12-25 20-40t23-36 28-31 35-20 46-8h143v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13t-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107q-18 0-48 0t-45-1-41 1-39 3-36 6-35 10-32 16-33 22-31 30-31 39z" horiz-adv-x="1000" />
-<glyph glyph-name="lock" unicode="&#x1f512;" d="m0 46v322q0 22 16 38t38 15h17v108q0 102 74 176t176 74 177-74 73-176v-108h18q23 0 38-15t16-38v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37z m179 375h285v108q0 59-42 101t-101 41-101-41-41-101v-108z" horiz-adv-x="642.9" />
-<glyph glyph-name="link" unicode="&#x1f517;" d="m9 600q0 67 47 113l82 82q47 46 114 46 67 0 114-47l114-116q47-46 47-113 0-69-49-117l49-49q48 49 116 49 67 0 114-47l116-116q47-47 47-114t-48-113l-82-81q-46-47-113-47-68 0-114 48l-115 115q-46 47-46 114 0 68 49 116l-49 49q-48-49-116-49-67 0-114 47l-116 116q-47 47-47 114z m107 0q0-22 16-38l116-116q15-15 38-15 23 0 40 17-2 2-11 11t-12 12-8 10-7 14-2 16q0 22 15 38t38 15q9 0 16-2t14-7 10-8 12-12 11-11q18 17 18 41 0 22-15 38l-115 115q-16 16-38 16-22 0-38-15l-82-82q-16-15-16-37z m392-393q0-23 16-38l115-116q15-15 38-15 22 0 38 15l82 81q15 16 15 37 0 23-15 38l-116 116q-16 16-38 16-24 0-40-18 1-1 10-10t12-12 9-11 7-14 2-15q0-23-16-38t-38-16q-8 0-15 2t-14 7-11 9-12 12-10 10q-19-17-19-40z" horiz-adv-x="928.6" />
-<glyph glyph-name="wrench" unicode="&#x1f527;" d="m12-7q0 29 21 51l380 380q22-55 64-97t97-64l-381-381q-21-20-50-20-29 0-51 20l-59 61q-21 20-21 50z m131 36q0-15 10-26t26-10 25 10 10 26-10 25-25 10-26-10-10-25z m286 500q0 103 73 176t177 74q32 0 67-10t60-26q9-6 9-15t-9-16l-163-94v-125l108-60q2 2 44 27t75 45 40 20q8 0 13-5t4-14q0-22-12-60-27-74-92-121t-144-47q-104 0-177 74t-73 176z" horiz-adv-x="928.6" />
-<glyph glyph-name="clock" unicode="&#x1f554;" d="m0 350q0 117 58 215t155 156 216 58 215-58 156-156 57-215-57-215-156-156-215-58-216 58-155 156-58 215z m125 0q0-83 41-152t110-111 153-41 152 41 110 111 41 152-41 152-110 111-152 41-153-41-110-111-41-152z m161-54v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12z" horiz-adv-x="857.1" />
-<glyph glyph-name="block" unicode="&#x1f6ab;" d="m0 352q0 87 34 167t91 137 137 91 167 34 166-34 137-91 91-137 34-167-34-168-91-137-137-92-166-34-167 34-137 92-91 137-34 168z m125 0q0-91 50-167l421 421q-75 50-167 50-83 0-153-40t-110-112-41-152z m138-256q76-50 166-50 62 0 118 25t96 65 65 97 24 119q0 90-48 164z" horiz-adv-x="857.1" />
+<glyph glyph-name="check" unicode="&#xe81f;" d="m786 331v-177q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q35 0 65-14 9-4 10-13 2-10-5-16l-27-28q-6-5-13-5-2 0-5 1-13 3-25 3h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v141q0 8 5 13l36 35q6 6 13 6 3 0 7-2 11-4 11-16z m129 273l-455-454q-13-14-31-14t-32 14l-240 240q-14 13-14 31t14 32l61 62q14 13 32 13t32-13l147-147 361 361q13 13 31 13t32-13l62-61q13-14 13-32t-13-32z" horiz-adv-x="928.6" />
+<glyph glyph-name="check-empty" unicode="&#xe820;" d="m625 707h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v464q0 37-26 63t-63 26z m161-89v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q66 0 114-48t47-113z" horiz-adv-x="785.7" />
+<glyph glyph-name="cancel-circled" unicode="&#xe821;" d="m641 224q0 14-10 25l-101 101 101 101q10 11 10 25 0 15-10 26l-51 50q-10 11-25 11-15 0-25-11l-101-101-101 101q-11 11-26 11-15 0-25-11l-50-50q-11-11-11-26 0-14 11-25l101-101-101-101q-11-11-11-25 0-15 11-26l50-50q10-11 25-11 15 0 26 11l101 101 101-101q10-11 25-11 15 0 25 11l51 50q10 11 10 26z m216 126q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+<glyph glyph-name="cancel" unicode="&#xe822;" d="m724 112q0-22-15-38l-76-76q-16-15-38-15t-38 15l-164 165-164-165q-16-15-38-15t-38 15l-76 76q-16 16-16 38t16 38l164 164-164 164q-16 16-16 38t16 38l76 76q16 16 38 16t38-16l164-164 164 164q16 16 38 16t38-16l76-76q15-15 15-38t-15-38l-164-164 164-164q15-15 15-38z" horiz-adv-x="785.7" />
+<glyph glyph-name="plus" unicode="&#xe823;" d="m786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q22 0 38-16t16-38z" horiz-adv-x="785.7" />
+<glyph glyph-name="ok-circled" unicode="&#xe824;" d="m717 440q0 16-11 26l-50 50q-11 11-25 11t-26-11l-227-227-126 126q-11 11-25 11t-26-11l-50-50q-10-10-10-26 0-15 10-25l202-202q10-10 25-10 15 0 25 10l303 303q11 10 11 25z m140-90q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+<glyph glyph-name="heart-broken" unicode="&#xe825;" d="m0 530q0 103 73 176t177 73q81 0 147-47l-14-250q0-12 9-20t21-9h10q12 0 18-8t3-20l-57-172q-4-12-2-13t9 8l194 267q7 9 4 16t-16 7h-77q-12 0-17 8t-1 18l82 183q57 32 124 32 103 0 177-73t73-176q0-94-63-166l-343-403q-25-30-62-30t-63 30l-342 403q-64 72-64 166z" horiz-adv-x="937.5" />
+<glyph glyph-name="zoom-in" unicode="&#xe827;" d="m571 404v-36q0-7-5-13t-12-5h-125v-125q0-7-6-13t-12-5h-36q-7 0-13 5t-5 13v125h-125q-7 0-12 5t-6 13v36q0 7 6 12t12 5h125v125q0 8 5 13t13 5h36q7 0 12-5t6-13v-125h125q7 0 12-5t5-12z m72-18q0 103-74 176t-176 74-177-74-73-176 73-177 177-73 176 73 74 177z m286-465q0-29-21-50t-51-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" />
+<glyph glyph-name="zoom-out" unicode="&#xe828;" d="m571 404v-36q0-7-5-13t-12-5h-322q-7 0-12 5t-6 13v36q0 7 6 12t12 5h322q7 0 12-5t5-12z m72-18q0 103-74 176t-176 74-177-74-73-176 73-177 177-73 176 73 74 177z m286-465q0-29-21-50t-51-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" />
+<glyph glyph-name="tasks" unicode="&#xf0ae;" d="m571 64h358v72h-358v-72z m-214 286h572v71h-572v-71z m357 286h215v71h-215v-71z m286-465v-142q0-15-11-25t-25-11h-928q-15 0-25 11t-11 25v142q0 15 11 26t25 10h928q15 0 25-10t11-26z m0 286v-143q0-14-11-25t-25-10h-928q-15 0-25 10t-11 25v143q0 15 11 25t25 11h928q15 0 25-11t11-25z m0 286v-143q0-15-11-25t-25-11h-928q-15 0-25 11t-11 25v143q0 14 11 25t25 11h928q15 0 25-11t11-25z" horiz-adv-x="1000" />
+<glyph glyph-name="filter" unicode="&#xf0b0;" d="m783 685q9-23-8-39l-275-275v-414q0-23-22-33-7-3-14-3-15 0-25 11l-143 143q-10 10-10 25v271l-275 275q-18 16-8 39 9 22 33 22h714q23 0 33-22z" horiz-adv-x="785.7" />
+<glyph glyph-name="mail-alt" unicode="&#xf0e0;" d="m1000 454v-443q0-37-26-63t-63-27h-822q-36 0-63 27t-26 63v443q25-28 56-49 202-137 278-192 32-24 51-37t53-27 61-13h2q28 0 61 13t53 27 51 37q95 68 278 192 32 22 56 49z m0 164q0-44-27-84t-68-69q-210-146-262-181-5-4-23-17t-30-22-29-18-33-15-27-5h-2q-12 0-27 5t-33 15-29 18-30 22-23 17q-51 35-147 101t-114 80q-35 23-65 64t-31 77q0 43 23 72t66 29h822q36 0 62-26t27-63z" horiz-adv-x="1000" />
+<glyph glyph-name="sitemap" unicode="&#xf0e8;" d="m1000 154v-179q0-22-16-38t-38-16h-178q-22 0-38 16t-16 38v179q0 22 16 38t38 15h53v107h-285v-107h53q23 0 38-15t16-38v-179q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v179q0 22 16 38t38 15h53v107h-285v-107h53q22 0 38-15t16-38v-179q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v179q0 22 16 38t38 15h53v107q0 29 21 51t51 21h285v107h-53q-23 0-38 15t-16 38v179q0 22 16 38t38 16h178q23 0 38-16t16-38v-179q0-22-16-38t-38-15h-53v-107h285q29 0 51-21t21-51v-107h53q23 0 38-15t16-38z" horiz-adv-x="1000" />
+<glyph glyph-name="crop" unicode="&#xf125;" d="m311 136h332v332z m-25 25l332 332h-332v-332z m643-43v-107q0-8-5-13t-13-5h-125v-125q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13v125h-482q-8 0-13 5t-5 13v482h-125q-8 0-13 5t-5 13v107q0 8 5 13t13 5h125v125q0 7 5 12t13 5h107q8 0 13-5t5-12v-125h475l137 138q5 5 13 5t13-5q5-6 5-13t-5-13l-138-137v-475h125q8 0 13-5t5-13z" horiz-adv-x="928.6" />
+<glyph glyph-name="picture" unicode="&#x1f304;" d="m357 529q0-45-31-76t-76-32-76 32-31 76 31 75 76 32 76-32 31-75z m572-215v-250h-786v107l178 179 90-89 285 285z m53 393h-893q-7 0-12-5t-6-13v-678q0-8 6-13t12-5h893q7 0 13 5t5 13v678q0 7-5 13t-13 5z m89-18v-678q0-37-26-63t-63-27h-893q-36 0-63 27t-26 63v678q0 37 26 63t63 27h893q37 0 63-27t26-63z" horiz-adv-x="1071.4" />
+<glyph glyph-name="user" unicode="&#x1f464;" d="m786 66q0-67-41-106t-108-39h-488q-67 0-108 39t-41 106q0 30 2 58t8 61 15 60 24 55 34 45 48 30 62 11q5 0 24-12t41-27 60-27 75-12 74 12 61 27 41 27 24 12q34 0 62-11t48-30 34-45 24-55 15-60 8-61 2-58z m-179 498q0-88-63-151t-151-63-152 63-62 151 62 152 152 63 151-63 63-152z" horiz-adv-x="785.7" />
+<glyph glyph-name="shuffle" unicode="&#x1f500;" d="m372 582q-34-52-77-153-12 25-20 41t-23 35-28 32-36 19-45 8h-125q-8 0-13 5t-5 13v107q0 8 5 13t13 5h125q139 0 229-125z m628-446q0-8-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107q-18 0-48 0t-45-1-41 1-39 3-36 6-35 10-32 16-33 22-31 30-31 39q33 52 76 152 12-25 20-40t23-36 28-31 35-20 46-8h143v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13z m0 500q0-8-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107h-143q-27 0-49-8t-38-25-29-35-25-43q-18-34-43-95-16-37-28-62t-30-59-36-55-41-47-50-38-60-23-71-10h-125q-8 0-13 5t-5 13v107q0 8 5 13t13 5h125q27 0 48 9t39 25 28 34 26 43q17 35 43 96 16 36 28 62t30 58 36 56 41 46 50 38 59 24 72 9h143v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13z" horiz-adv-x="1000" />
+<glyph glyph-name="lock" unicode="&#x1f512;" d="m179 421h285v108q0 59-42 101t-101 41-101-41-41-101v-108z m464-53v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v322q0 22 16 38t38 15h17v108q0 102 74 176t176 74 177-74 73-176v-108h18q23 0 38-15t16-38z" horiz-adv-x="642.9" />
+<glyph glyph-name="link" unicode="&#x1f517;" d="m812 171q0 23-15 38l-116 116q-16 16-38 16-24 0-40-18 1-1 10-10t12-12 9-11 7-14 2-15q0-23-16-38t-38-16q-8 0-15 2t-14 7-11 9-12 12-10 10q-19-17-19-40 0-23 16-38l115-116q15-15 38-15 22 0 38 15l82 81q15 16 15 37z m-392 394q0 22-15 38l-115 115q-16 16-38 16-22 0-38-15l-82-82q-16-15-16-37 0-22 16-38l116-116q15-15 38-15 23 0 40 17-2 2-11 11t-12 12-8 10-7 14-2 16q0 22 15 38t38 15q9 0 16-2t14-7 10-8 12-12 11-11q18 17 18 41z m500-394q0-67-48-113l-82-81q-46-47-113-47-68 0-114 48l-115 115q-46 47-46 114 0 68 49 116l-49 49q-48-49-116-49-67 0-114 47l-116 116q-47 47-47 114t47 113l82 82q47 46 114 46 67 0 114-47l114-116q47-46 47-113 0-69-49-117l49-49q48 49 116 49 67 0 114-47l116-116q47-47 47-114z" horiz-adv-x="928.6" />
+<glyph glyph-name="wrench" unicode="&#x1f527;" d="m214 29q0 14-10 25t-25 10-26-10-10-25 10-26 26-10 25 10 10 26z m360 234l-381-381q-21-20-50-20-29 0-51 20l-59 61q-21 20-21 50 0 29 21 51l380 380q22-55 64-97t97-64z m353 243q0-22-12-59-27-75-92-122t-144-46q-104 0-177 73t-73 177 73 176 177 74q32 0 67-10t60-26q9-6 9-15t-9-16l-163-94v-125l108-60q2 2 44 27t75 45 40 20q8 0 13-5t4-14z" horiz-adv-x="928.6" />
+<glyph glyph-name="clock" unicode="&#x1f554;" d="m500 546v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13z m232-196q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+<glyph glyph-name="block" unicode="&#x1f6ab;" d="m732 352q0 90-48 164l-421-420q76-50 166-50 62 0 118 25t96 65 65 97 24 119z m-557-167l421 421q-75 50-167 50-83 0-153-40t-110-112-41-152q0-91 50-167z m682 167q0-88-34-168t-91-137-137-92-166-34-167 34-137 92-91 137-34 168 34 167 91 137 137 91 167 34 166-34 137-91 91-137 34-167z" horiz-adv-x="857.1" />
 </font>
 </defs>
 </svg>
\ No newline at end of file
diff --git a/sources/admin/themes/default/fontello/font/fontello.ttf b/sources/admin/themes/default/fontello/font/fontello.ttf
index a73ac95..2ea7664 100644
Binary files a/sources/admin/themes/default/fontello/font/fontello.ttf and b/sources/admin/themes/default/fontello/font/fontello.ttf differ
diff --git a/sources/admin/themes/default/fontello/font/fontello.woff b/sources/admin/themes/default/fontello/font/fontello.woff
index 964384e..0da2b58 100644
Binary files a/sources/admin/themes/default/fontello/font/fontello.woff and b/sources/admin/themes/default/fontello/font/fontello.woff differ
diff --git a/sources/admin/themes/default/icon/index.php b/sources/admin/themes/default/icon/index.php
index c8de97f..0b96c3e 100644
--- a/sources/admin/themes/default/icon/index.php
+++ b/sources/admin/themes/default/icon/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/themes/default/index.php b/sources/admin/themes/default/index.php
index c8de97f..0b96c3e 100644
--- a/sources/admin/themes/default/index.php
+++ b/sources/admin/themes/default/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/themes/default/js/batchManagerGlobal.js b/sources/admin/themes/default/js/batchManagerGlobal.js
index 5fd6948..50fadb1 100644
--- a/sources/admin/themes/default/js/batchManagerGlobal.js
+++ b/sources/admin/themes/default/js/batchManagerGlobal.js
@@ -95,7 +95,7 @@ jQuery(document).ready(function() {
 	$('ul.thumbnails').enableShiftClick();
 });
 
-jQuery("a.preview-box").colorbox();
+jQuery("a.preview-box").colorbox( {photo: true} );
 
 jQuery('.thumbnails img').tipTip({
 	'delay' : 0,
diff --git a/sources/admin/themes/default/template/admin.tpl b/sources/admin/themes/default/template/admin.tpl
index 67e0832..3180754 100644
--- a/sources/admin/themes/default/template/admin.tpl
+++ b/sources/admin/themes/default/template/admin.tpl
@@ -41,6 +41,9 @@ $('#menubar').lightAccordion({
 				<li><a href="{$U_BATCH}"><i class="icon-pencil"></i>{'Batch Manager'|@translate}</a></li>
 {if $NB_PHOTOS_IN_CADDIE > 0}
 				<li><a href="{$U_CADDIE}"><i class="icon-flag"></i>{'Caddie'|@translate}<span class="adminMenubarCounter">{$NB_PHOTOS_IN_CADDIE}</span></a></li>
+{/if}
+{if $NB_ORPHANS > 0}
+				<li><a href="{$U_ORPHANS}"><i class="icon-heart-broken"></i>{'Orphans'|@translate}<span class="adminMenubarCounter">{$NB_ORPHANS}</span></a></li>
 {/if}
 			</ul>
 		</dd>
diff --git a/sources/admin/themes/default/template/album_notification.tpl b/sources/admin/themes/default/template/album_notification.tpl
index 32aa8e4..1b3aa73 100644
--- a/sources/admin/themes/default/template/album_notification.tpl
+++ b/sources/admin/themes/default/template/album_notification.tpl
@@ -1,3 +1,59 @@
+{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
+{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
+
+{footer_script}
+jQuery(document).ready(function() {
+  jQuery("select[name=who]").change(function () {
+    checkWhoOptions();
+  });
+
+  checkWhoOptions();
+
+  function checkWhoOptions() {
+    var option = jQuery("select[name=who] option:selected").val();
+    jQuery(".who_option").hide();
+    jQuery(".who_" + option).show();
+  }
+
+  jQuery(".who_option select").selectize({
+    plugins: ['remove_button']
+  });
+
+  jQuery("form#categoryNotify").submit(function(e) {
+    var who_selected = false;
+    var who_option = jQuery("select[name=who] option:selected").val();
+
+    if (jQuery(".who_" + who_option + " select").length > 0) {
+      if (jQuery(".who_" + who_option + " select option:selected").length > 0) {
+         who_selected = true;
+      }
+    }
+
+    if (!who_selected) {
+      jQuery(".actionButtons .errors").show();
+      e.preventDefault();
+    }
+    else {
+      jQuery(".actionButtons .errors").hide();
+      console.log("form can be submited");
+    }
+  });
+});
+{/footer_script}
+
+{html_style}
+.who_option {
+  margin-top:5px;
+}
+
+span.errors {
+  background-image:none;
+  padding:2px 5px;
+  margin:0;
+  border-radius:5px;
+}
+{/html_style}
+
 <div class="titrePage">
   <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
@@ -5,36 +61,58 @@
 <form action="{$F_ACTION}" method="post" id="categoryNotify">
 
 <fieldset id="emailCatInfo">
-  <legend>{'Send an information email to group members'|@translate}</legend>
-
-{if isset($group_mail_options)}
+  <legend>{'Send mail to users'|@translate}</legend>
 
   <p>
-    <strong>{'Group'|@translate}</strong>
-    <br>
-    <select name="group">
-      {html_options options=$group_mail_options}
+    <strong>{'Recipients'|@translate}</strong>
+    <select name="who">
+      <option value="group">{'Group'|translate}</option>
+      <option value="users">{'Users'|translate}</option>
     </select>
   </p>
 
+  <p class="who_option who_group">
+{if isset($group_mail_options)}
+    <select name="group" placeholder="{'Type in a search term'|translate}" style="width:524px;">
+      {html_options options=$group_mail_options}
+    </select>
+{elseif isset($no_group_in_gallery) and $no_group_in_gallery}
+    {'There is no group in this gallery.'|@translate} <a href="admin.php?page=group_list" class="externalLink">{'Group management'|@translate}</a>
+{else}
+    {'No group is permitted to see this private album'|@translate}.
+    <a href="{$permission_url}" class="externalLink">{'Permission management'|@translate}</a>
+{/if}
+    </p>
+
+    <p class="who_option who_users">
+{if isset($user_options)}
+    <select name="users[]" multiple placeholder="{'Type in a search term'|translate}" style="width:524px;">
+      {html_options options=$user_options selected=$user_options_selected}
+    </select>
+{else}
+    {'No user is permitted to see this private album'|@translate}.
+    <a href="{$permission_url}" class="externalLink">{'Permission management'|@translate}</a>
+{/if}
+    </p>
+
   <p>
     <strong>{'Complementary mail content'|@translate}</strong>
     <br>
     <textarea cols="50" rows="5" name="mail_content" id="mail_content" class="description">{$MAIL_CONTENT}</textarea>
   </p>
 
+{if isset($auth_key_duration)}
   <p>
-    <input class="submit" type="submit" value="{'Send'|@translate}" name="submitEmail">
-  </p>
-
-{elseif isset($no_group_in_gallery) and $no_group_in_gallery}
-  <p>{'There is no group in this gallery.'|@translate} <a href="admin.php?page=group_list" class="externalLink">{'Group management'|@translate}</a></p>
-{else}
-  <p>
-    {'No group is permitted to see this private album'|@translate}.
-    <a href="{$permission_url}" class="externalLink">{'Permission management'|@translate}</a>
+  {'Each email sent will contain its own automatic authentication key on links, valid for %s.'|translate:$auth_key_duration}
+  <br>{'For security reason, authentication keys do not work for administrators.'|translate}
   </p>
 {/if}
+
+  <p class="actionButtons">
+    <input class="submit" type="submit" value="{'Send'|@translate}" name="submitEmail">
+    <span class="errors" style="display:none">&#x2718; {'No recipient selected'|translate}</span>
+  </p>
+
 </fieldset>
 
 </form>
diff --git a/sources/admin/themes/default/template/batch_manager_global.tpl b/sources/admin/themes/default/template/batch_manager_global.tpl
index 46262c0..c87f9ea 100644
--- a/sources/admin/themes/default/template/batch_manager_global.tpl
+++ b/sources/admin/themes/default/template/batch_manager_global.tpl
@@ -134,7 +134,13 @@ $(document).ready(function() {
 
   $("select[name=selectAction]").change(function () {
     $("[id^=action_]").hide();
-    $("#action_"+$(this).prop("value")).show();
+
+    var action = $(this).prop("value");
+    if (action == 'move') {
+      action = 'associate';
+    }
+
+    $("#action_"+action).show();
 
     if ($(this).val() != -1) {
       $("#applyActionBlock").show();
@@ -268,6 +274,7 @@ $(document).ready(function() {
   jQuery("select[name=filter_prefilter]").change(function() {
     jQuery("#empty_caddie").toggle(jQuery(this).val() == "caddie");
     jQuery("#duplicates_options").toggle(jQuery(this).val() == "duplicates");
+    jQuery("#delete_orphans").toggle(jQuery(this).val() == "no_album");
   });
 });
 
@@ -329,10 +336,15 @@ var sliders = {
         {'Predefined filter'|@translate}
         <select name="filter_prefilter">
           {foreach from=$prefilters item=prefilter}
-          <option value="{$prefilter.ID}" {if isset($filter.prefilter) && $filter.prefilter eq $prefilter.ID}selected="selected"{/if}>{$prefilter.NAME}</option>
+            {assign 'optionClass' ''}
+            {if $prefilter.ID eq 'no_album'}{assign 'optionClass' 'icon-heart-broken'}{/if}
+            {if $prefilter.ID eq 'caddie'}{assign 'optionClass' 'icon-flag'}{/if}
+
+          <option value="{$prefilter.ID}"  class="{$optionClass}" {if isset($filter.prefilter) && $filter.prefilter eq $prefilter.ID}selected="selected"{/if}>{$prefilter.NAME}</option>
           {/foreach}
         </select>
         <a id="empty_caddie" href="admin.php?page=batch_manager&amp;action=empty_caddie" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'caddie'}display:none{/if}">{'Empty caddie'|translate}</a>
+        <a id="delete_orphans" href="admin.php?page=batch_manager&amp;action=delete_orphans" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'no_album'}display:none{/if}">{'Delete %d orphan photos'|translate:$NB_ORPHANS}</a>
 
         <span id="duplicates_options" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'duplicates'}display:none{/if}">
           {'based on'|translate}
@@ -584,21 +596,13 @@ UL.thumbnails SPAN.wrap2 {ldelim}
     <p><label><input type="checkbox" name="confirm_deletion" value="1"> {'Are you sure?'|@translate}</label></p>
     </div>
 
-    <!-- associate -->
+    <!-- associate -->{* also used for "move" action *}
     <div id="action_associate" class="bulkAction">
       <select data-selectize="categories" data-default="first" name="associate" style="width:600px"></select>
       <br>{'... or '|@translate}
       <a href="#" data-add-album="associate" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
     </div>
 
-    <!-- move -->
-    <div id="action_move" class="bulkAction">
-      <select data-selectize="categories" data-default="first" name="move" style="width:600px"></select>
-      <br>{'... or '|@translate}
-      <a href="#" data-add-album="move" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
-    </div>
-
-
     <!-- dissociate -->
     <div id="action_dissociate" class="bulkAction">
       <select data-selectize="categories" placeholder="{'Type in a search term'|translate}"
@@ -627,15 +631,13 @@ UL.thumbnails SPAN.wrap2 {ldelim}
     <!-- author -->
     <div id="action_author" class="bulkAction">
     <label><input type="checkbox" name="remove_author"> {'remove author'|@translate}</label><br>
-    {assign var='authorDefaultValue' value='Type here the author name'|@translate}
-<input type="text" class="large" name="author" value="{$authorDefaultValue}" onfocus="this.value=(this.value=='{$authorDefaultValue|@escape:javascript}') ? '' : this.value;" onblur="this.value=(this.value=='') ? '{$authorDefaultValue|@escape:javascript}' : this.value;">
+		<input type="text" class="large" name="author" placeholder="{'Type here the author name'|@translate}">
     </div>
 
     <!-- title -->
     <div id="action_title" class="bulkAction">
     <label><input type="checkbox" name="remove_title"> {'remove title'|@translate}</label><br>
-    {assign var='titleDefaultValue' value='Type here the title'|@translate}
-<input type="text" class="large" name="title" value="{$titleDefaultValue}" onfocus="this.value=(this.value=='{$titleDefaultValue|@escape:javascript}') ? '' : this.value;" onblur="this.value=(this.value=='') ? '{$titleDefaultValue|@escape:javascript}' : this.value;">
+		<input type="text" class="large" name="title" placeholder="{'Type here the title'|@translate}">
     </div>
 
     <!-- date_creation -->
diff --git a/sources/admin/themes/default/template/batch_manager_unit.tpl b/sources/admin/themes/default/template/batch_manager_unit.tpl
index d4e560a..085a9bd 100644
--- a/sources/admin/themes/default/template/batch_manager_unit.tpl
+++ b/sources/admin/themes/default/template/batch_manager_unit.tpl
@@ -29,7 +29,9 @@ jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
 });
 
 {* <!-- THUMBNAILS --> *}
-jQuery("a.preview-box").colorbox();
+jQuery("a.preview-box").colorbox( {
+	photo: true
+});
 }());
 {/footer_script}
 
diff --git a/sources/admin/themes/default/template/cat_modify.tpl b/sources/admin/themes/default/template/cat_modify.tpl
index d71ad05..013cf95 100644
--- a/sources/admin/themes/default/template/cat_modify.tpl
+++ b/sources/admin/themes/default/template/cat_modify.tpl
@@ -28,6 +28,69 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), {
     return filtered;
   }
 });
+
+jQuery(document).ready(function() {
+  jQuery(document).on('click', '.refreshRepresentative',  function(e) {
+    var $this = jQuery(this);
+    var method = 'pwg.categories.refreshRepresentative';
+
+    jQuery.ajax({
+      url: "ws.php?format=json&method="+method,
+      type:"POST",
+      data: {
+        category_id: $this.data("category_id")
+      },
+      success:function(data) {
+        var data = jQuery.parseJSON(data);
+        if (data.stat == 'ok') {
+          jQuery(".albumThumbnailImage")
+            .attr('href', data.result.url)
+            .find("img").attr('src', data.result.src)
+            .end().show();
+
+          jQuery(".albumThumbnailRandom").hide();
+        }
+        else {
+          alert("error on "+method);
+        }
+      },
+      error:function(XMLHttpRequest, textStatus, errorThrows) {
+        alert("serious error on "+method);
+      }
+    });
+
+    e.preventDefault();
+  });
+
+  jQuery(document).on('click', '.deleteRepresentative',  function(e) {
+    var $this = jQuery(this);
+    var method = 'pwg.categories.deleteRepresentative';
+
+    jQuery.ajax({
+      url: "ws.php?format=json&method="+method,
+      type:"POST",
+      data: {
+        category_id: $this.data("category_id")
+      },
+      success:function(data) {
+        var data = jQuery.parseJSON(data);
+        if (data.stat == 'ok') {
+          jQuery(".albumThumbnailImage").hide();
+          jQuery(".albumThumbnailRandom").show();
+        }
+        else {
+          alert("error on "+method);
+        }
+      },
+      error:function(XMLHttpRequest, textStatus, errorThrows) {
+        alert("serious error on "+method);
+      }
+    });
+
+    e.preventDefault();
+  });
+});
+
 {/footer_script}
 
 
@@ -35,7 +98,7 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), {
   <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
-<form action="{$F_ACTION}" method="POST" id="catModify">
+<div id="catModify">
 
 <fieldset>
   <legend>{'Informations'|@translate}</legend>
@@ -44,19 +107,18 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), {
     <tr>
       <td id="albumThumbnail">
 {if isset($representant) }
-  {if isset($representant.picture) }
-        <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt=""></a>
-  {else}
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" alt="{'Random photo'|@translate}">
-  {/if}
+        <a class="albumThumbnailImage" style="{if !isset($representant.picture)}display:none{/if}" href="{$representant.picture.url}"><img src="{$representant.picture.src}"></a>
+        <img class="albumThumbnailRandom" style="{if isset($representant.picture)}display:none{/if}" src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" alt="{'Random photo'|@translate}">
 
+<p class="albumThumbnailActions">
   {if $representant.ALLOW_SET_RANDOM }
-        <p style="text-align:center;"><input class="submit" type="submit" name="set_random_representant" value="{'Refresh'|@translate}" title="{'Find a new representant by random'|@translate}"></p>
+  <a href="#refresh" data-category_id="{$CAT_ID}" class="refreshRepresentative" title="{'Find a new representant by random'|@translate}">{'Refresh'|@translate}</a>
   {/if}
 
   {if isset($representant.ALLOW_DELETE) }
-        <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}"></p>
+  | <a href="#delete" data-category_id="{$CAT_ID}" class="deleteRepresentative" title="{'Delete Representant'|@translate}">{'Delete'|translate}</a>
   {/if}
+</p>
 {/if}
       </td>
 
@@ -90,6 +152,7 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), {
 
 </fieldset>
 
+<form action="{$F_ACTION}" method="POST">
 <fieldset>
   <legend>{'Properties'|@translate}</legend>
   <p>
@@ -137,3 +200,4 @@ categoriesCache.selectize(jQuery('[data-selectize=categories]'), {
 </fieldset>
 
 </form>
+</div> {* #catModify *}
\ No newline at end of file
diff --git a/sources/admin/themes/default/template/configuration_watermark.tpl b/sources/admin/themes/default/template/configuration_watermark.tpl
index 1134305..24e2a34 100644
--- a/sources/admin/themes/default/template/configuration_watermark.tpl
+++ b/sources/admin/themes/default/template/configuration_watermark.tpl
@@ -111,6 +111,13 @@
             <input size="3" maxlength="3" type="text" name="w[xrepeat]" value="{$watermark.xrepeat}"{if isset($ferrors.watermark.xrepeat)} class="dError"{/if}>
             {if isset($ferrors.watermark.xrepeat)}<span class="dErrorDesc" title="{$ferrors.watermark.xrepeat}">!</span>{/if}
           </label>
+
+					<br>
+					<label>{'Y Repeat'|translate}
+						<input size="3" maxlength="3" type="text" name="w[yrepeat]" value="{$watermark.yrepeat}"{if isset($ferrors.watermark.yrepeat)} class="dError"{/if}>
+						{if isset($ferrors.watermark.yrepeat)}<span class="dErrorDesc" title="{$ferrors.watermark.yrepeat}">!</span>{/if}
+					</label>
+
         </div>
       </li>
 
diff --git a/sources/admin/themes/default/template/notification_by_mail.tpl b/sources/admin/themes/default/template/notification_by_mail.tpl
index 0be49bd..9550661 100644
--- a/sources/admin/themes/default/template/notification_by_mail.tpl
+++ b/sources/admin/themes/default/template/notification_by_mail.tpl
@@ -127,6 +127,16 @@ jQuery(document).ready(function(){
       </table>
     </fieldset>
 
+{if isset($auth_key_duration)}
+    <fieldset>
+      <legend>{'Informations'|@translate}</legend>
+      <p>
+      {'Each email sent will contain its own automatic authentication key on links, valid for %s.'|translate:$auth_key_duration}
+      <br>{'For security reason, authentication keys do not work for administrators.'|translate}
+      </p>      
+    </fieldset>
+{/if}
+
     <p>
       <input type="submit" value="{'Send'|@translate}" name="send_submit">
     </p>
diff --git a/sources/admin/themes/default/template/photos_add_direct.tpl b/sources/admin/themes/default/template/photos_add_direct.tpl
index 850cb22..e9ea854 100644
--- a/sources/admin/themes/default/template/photos_add_direct.tpl
+++ b/sources/admin/themes/default/template/photos_add_direct.tpl
@@ -1,8 +1,9 @@
 {combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
+
 {combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'}
+
 {combine_script id='jquery.plupload' load='footer' require='jquery' path='themes/default/js/plugins/plupload/plupload.full.min.js'}
 {combine_script id='jquery.plupload.queue' load='footer' require='jquery' path='themes/default/js/plugins/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js'}
-{combine_script id='jquery.ui.progressbar' load='footer'}
 
 {combine_css path="themes/default/js/plugins/jquery.jgrowl.css"}
 {combine_css path="themes/default/js/plugins/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css"}
@@ -20,6 +21,8 @@
 {combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
 
+{combine_script id='piecon' load='footer' path='themes/default/js/plugins/piecon.js'}
+
 {footer_script}
 {* <!-- CATEGORIES --> *}
 var categoriesCache = new CategoriesCache({
@@ -44,6 +47,13 @@ jQuery('[data-add-album]').pwgAddAlbum({
   }
 });
 
+Piecon.setOptions({
+  color: '#ff7700',
+  background: '#bbb',
+  shadow: '#fff',
+  fallback: 'force'
+});
+
 var pwg_token = '{$pwg_token}';
 var photosUploaded_label = "{'%d photos uploaded'|translate}";
 var batch_Label = "{'Manage this set of %d photos'|translate}";
@@ -76,7 +86,7 @@ jQuery(document).ready(function(){
 		// url : '../upload.php',
 		url : 'ws.php?method=pwg.images.upload&format=json',
 		
-		chunk_size: '500kb',
+		chunk_size: '{/literal}{$chunk_size}{literal}kb',
 		
 		filters : {
 			// Maximum file size
@@ -118,6 +128,7 @@ jQuery(document).ready(function(){
       
       UploadProgress: function(up, file) {
         jQuery('#uploadingActions .progressbar').width(up.total.percent+'%');
+        Piecon.setProgress(up.total.percent);
       },
       
       BeforeUpload: function(up, file) {
@@ -173,6 +184,8 @@ jQuery(document).ready(function(){
       UploadComplete: function(up, files) {
         // Called when all files are either uploaded or failed
         //console.log('[UploadComplete]');
+        
+        Piecon.reset();
 
         jQuery(".selectAlbum, .selectFiles, #permissions, .showFieldset").hide();
 
@@ -215,7 +228,7 @@ jQuery(document).ready(function(){
 
 <div class="infos" style="display:none"></div>
 
-<p class="afterUploadActions" style="margin:10px; display:none;"><a class="batchLink"></a> | <a href="">{'Add another set of photos'|@translate}</a></p>
+<p class="afterUploadActions" style="margin:10px; display:none;"><a class="batchLink"></a> | <a href="admin.php?page=photos_add">{'Add another set of photos'|@translate}</a></p>
 
 {if count($setup_errors) > 0}
 <div class="errors">
@@ -269,10 +282,9 @@ jQuery(document).ready(function(){
       <p class="uploadInfo">{'The picture dimensions will be reduced to %dx%d pixels.'|@translate:$original_resize_maxwidth:$original_resize_maxheight}</p>
     {/if}
 
-      <p id="uploadWarningsSummary">{$upload_max_filesize_shorthand}B. {$upload_file_types}. {if isset($max_upload_resolution)}{$max_upload_resolution}Mpx{/if} <a class="icon-info-circled-1 showInfo" title="{'Learn more'|@translate}"></a></p>
+      <p id="uploadWarningsSummary">{$upload_file_types}. {if isset($max_upload_resolution)}{$max_upload_resolution}Mpx{/if} <a class="icon-info-circled-1 showInfo" title="{'Learn more'|@translate}"></a></p>
 
       <p id="uploadWarnings">
-        {'Maximum file size: %sB.'|@translate:$upload_max_filesize_shorthand}
         {'Allowed file types: %s.'|@translate:$upload_file_types}
       {if isset($max_upload_resolution)}
         {'Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'|@translate:$max_upload_resolution:$max_upload_width:$max_upload_height}
diff --git a/sources/admin/themes/default/template/picture_modify.tpl b/sources/admin/themes/default/template/picture_modify.tpl
index 76b5e14..71b3d2b 100644
--- a/sources/admin/themes/default/template/picture_modify.tpl
+++ b/sources/admin/themes/default/template/picture_modify.tpl
@@ -38,7 +38,9 @@ jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
 });
 
 {* <!-- THUMBNAILS --> *}
-jQuery("a.preview-box").colorbox();
+jQuery("a.preview-box").colorbox({
+	photo: true
+});
 }());
 {/footer_script}
 
@@ -61,6 +63,7 @@ jQuery("a.preview-box").colorbox();
             <li>{$INTRO.add_date}</li>
             <li>{$INTRO.added_by}</li>
             <li>{$INTRO.size}</li>
+            <li>{$INTRO.formats}</li>
             <li>{$INTRO.stats}</li>
             <li>{$INTRO.id}</li>
           </ul>
diff --git a/sources/admin/themes/default/template/user_list.tpl b/sources/admin/themes/default/template/user_list.tpl
index 39e3318..dedf59c 100644
--- a/sources/admin/themes/default/template/user_list.tpl
+++ b/sources/admin/themes/default/template/user_list.tpl
@@ -1,3 +1,4 @@
+{include file='include/colorbox.inc.tpl'}
 {combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
 
 {combine_script id='jquery.dataTables' load='footer' path='themes/default/js/plugins/jquery.dataTables.js'}
@@ -27,6 +28,7 @@ var selection = [{$selection}];
 var pwg_token = "{$PWG_TOKEN}";
 
 var protectedUsers = [{$protected_users}];
+var passwordProtectedUsers = [{$password_protected_users}];
 var guestUser = {$guest_user};
 
 var truefalse = {
@@ -246,6 +248,7 @@ jQuery(document).ready(function() {
           
           user.isGuest = (parseInt(userId) == guestUser);
           user.isProtected = (protectedUsers.indexOf(parseInt(userId)) != -1);
+          user.isPasswordProtected = (passwordProtectedUsers.indexOf(parseInt(userId)) != -1);
           
           user.registeredOn_string = sprintf(
             registeredOn_pattern,
@@ -258,11 +261,6 @@ jQuery(document).ready(function() {
             user.lastVisit_string = sprintf(lastVisit_pattern, user.last_visit_string, user.last_visit_since);
           }
           
-          user.updateString = sprintf(
-            "{/literal}{'User %s updated'|translate|escape:javascript}{literal}",
-            user.username
-          );
-          
           user.email = user.email || '';
           
           user.statusLabel = statusLabels[user.status];
@@ -274,7 +272,7 @@ jQuery(document).ready(function() {
             jQuery("script.userDetails").html()
 		      );
           
-          jQuery("#user"+userId).append(template(user));
+          jQuery("#user"+userId).html(template(user));
 
           /* groups select */
           jQuery('[data-selectize=groups]').selectize({
@@ -339,10 +337,19 @@ jQuery(document).ready(function() {
         console.log('technical error loading user details');
       }
     });
-  
-    return '<div id="user'+userId+'" class="userProperties"><img class="loading" src="themes/default/images/ajax-loader-small.gif"></div>';
+
+    jQuery(".user_form_popin")
+      .attr("id", "user"+userId)
+      .html('<div class="popinWait"><span><img class="loading" src="themes/default/images/ajax-loader-small.gif"> {/literal}{'Loading...'|translate|escape:'javascript'}{literal}</span></div>')
+    ;
   }
 
+jQuery(document).on('click', '.close-user-details',  function(e) {
+  jQuery('.user_form_popin').colorbox.close();
+  e.preventDefault();
+});
+
+
   /* change password */
   jQuery(document).on('click', '.changePasswordOpen',  function() {
     var userId = jQuery(this).parentsUntil('form').parent().find('input[name=user_id]').val();
@@ -474,7 +481,7 @@ jQuery(document).ready(function() {
         jQuery('#user'+userId+' .userDelete .loading').show();
       },
       success:function(data) {
-        oTable.fnDraw();
+        jQuery('.user_form_popin').colorbox.close();
         jQuery('#showAddUser .infos').html('&#x2714; User '+username+' deleted').show();
       },
       error:function(XMLHttpRequest, textStatus, errorThrows) {
@@ -520,8 +527,25 @@ jQuery(document).ready(function() {
       },
       success:function(data) {
         jQuery('#user'+userId+' .submitWait').hide();
-        jQuery('#user'+userId+' input[type=submit]').hide();
-        jQuery('#user'+userId+' .propertiesUpdateDone').show();
+
+        var html_message;
+
+        var data = jQuery.parseJSON(data);
+        if (data.stat == 'ok') {
+          var message = sprintf(
+            "{/literal}{'User %s updated'|translate|escape:javascript}{literal}",
+            data.result.users[0].username
+          );
+
+          html_message = '<span class="infos">&#x2714; '+message+'</span>';
+        }
+        else {
+          html_message = '<span class="errors">&#x2718; '+data.message+'</span>';
+        }
+
+        jQuery('#user'+userId+' .propertiesUpdateDone')
+          .html(html_message)
+          .show();
       },
       error:function(XMLHttpRequest, textStatus, errorThrows) {
         jQuery('#user'+userId+' .submitWait').hide();
@@ -537,28 +561,17 @@ jQuery(document).ready(function() {
    */
   jQuery(document).on('click', '#userList tbody td .openUserDetails',  function() {
     var nTr = this.parentNode.parentNode;
-    if (jQuery(this).hasClass('icon-cancel-circled')) {
-      /* This row is already open - close it */
-      jQuery(this)
-        .removeClass('icon-cancel-circled')
-        .addClass('icon-pencil')
-        .attr('title', "{/literal}{'Open user details'|translate|escape:'javascript'}{literal}")
-        .html("{/literal}{'edit'|translate|escape:'javascript'}{literal}")
-      ;
 
-      oTable.fnClose( nTr );
-    }
-    else {
-      /* Open this row */
-      jQuery(this)
-        .removeClass('icon-pencil')
-        .addClass('icon-cancel-circled')
-        .attr('title', "{/literal}{'Close user details'|translate|escape:'javascript'}{literal}")
-        .html("{/literal}{'close'|translate|escape:'javascript'}{literal}")
-      ;
+    jQuery.colorbox({
+      inline:true,
+      title:"{/literal}{'Edit user'|translate}{literal}",
+      href:".user_form_popin",
+      onClosed: function() {
+        oTable.fnDraw();
+      }
+    });
 
-      oTable.fnOpen( nTr, fnFormatDetails(oTable, nTr), 'details' );
-    }
+    fnFormatDetails(oTable, nTr);
   });
 
 
@@ -1040,7 +1053,7 @@ span.infos, span.errors {background-image:none; padding:2px 5px; margin:0;border
 <script type="text/template" class="userDetails">
 <form>
   <div class="userActions">
-<% if (!user.isGuest) { %>
+<% if (!user.isPasswordProtected) { %>
     <span class="changePasswordDone infos" style="display:none">&#x2714; {'Password updated'|translate}</span>
     <span class="changePassword" style="display:none">{'New password'|translate} <input type="text"> <a href="#" class="buttonLike updatePassword"><img src="themes/default/images/ajax-loader-small.gif" style="margin-bottom:-1px;margin-left:1px;display:none;"><span class="text">{'Submit'|translate}</span></a> <a href="#" class="cancel">{'Cancel'|translate}</a></span>
     <a class="icon-key changePasswordOpen" href="#">{'Change password'|translate}</a>
@@ -1151,9 +1164,16 @@ span.infos, span.errors {background-image:none; padding:2px 5px; margin:0;border
     <div style="clear:both"></div>
   </div> {* userPropertiesContainer *}
 
-  <span class="infos propertiesUpdateDone" style="display:none">&#x2714; <%- user.updateString %></span>
-   
-  <input type="submit" value="{'Update user'|translate|escape:html}" style="display:none;" data-user_id="<%- user.id %>">
+  <input type="submit" value="{'Update user'|translate|escape:html}" data-user_id="<%- user.id %>">
   <img class="submitWait" src="themes/default/images/ajax-loader-small.gif" style="display:none">
+  <a href="#close" class="icon-cancel-circled close-user-details" title="{'Close user details'|translate}">{'close'|translate}</a>
+  <span class="propertiesUpdateDone" style="display:none">
+    <span class="infos">&#x2714; ...</span>
+    <span class="errors">&#x2718; ...</span>
+  </span>
 </form>
 </script>
+
+<div style="display:none">
+  <div class="user_form_popin userProperties"></div>
+</div>
\ No newline at end of file
diff --git a/sources/admin/themes/default/theme.css b/sources/admin/themes/default/theme.css
index 4a151b9..0aa0dba 100644
--- a/sources/admin/themes/default/theme.css
+++ b/sources/admin/themes/default/theme.css
@@ -213,7 +213,7 @@ LI.menuLi {
 }
 /* */
 
-FORM#catModify TABLE { width: auto; }
+#catModify TABLE { width: auto; }
 
 #catModify p {
   line-height: 20px;
@@ -221,6 +221,11 @@ FORM#catModify TABLE { width: auto; }
   text-align: left;
 }
 
+#catModify p.albumThumbnailActions {
+  text-align:center;
+  white-space:nowrap;
+}
+
 FIELDSET.elementEdit .thumb {
 	display: block;
 	float: right;
@@ -1223,6 +1228,21 @@ a.group_perm {
 .userProperty {width:340px;float:left;margin-bottom:15px;}
 .userActions {float:right;text-align:right;}
 
+.user_form_popin {
+  width:750px;
+  height:430px;
+  padding:20px;
+}
+
+.userProperties form {
+  text-align:left;
+}
+
+.popinWait {
+  padding-top:200px;
+}
+
+
 .preview-box.icon-zoom-in {
   display:block;
   position:relative;
diff --git a/sources/admin/themes/roma/index.php b/sources/admin/themes/roma/index.php
index c8de97f..0b96c3e 100644
--- a/sources/admin/themes/roma/index.php
+++ b/sources/admin/themes/roma/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/themes/roma/theme.css b/sources/admin/themes/roma/theme.css
index c436bd2..26c2a65 100644
--- a/sources/admin/themes/roma/theme.css
+++ b/sources/admin/themes/roma/theme.css
@@ -358,4 +358,6 @@ table.qsearch_help_table td {
 	border-color: #444;
 }
 
-.font-checkbox [class*=icon-check]:before { color:#aaa; }
\ No newline at end of file
+.font-checkbox [class*=icon-check]:before { color:#aaa; }
+
+#cboxLoadedContent { background-color:#222 !important; }
\ No newline at end of file
diff --git a/sources/admin/themes_installed.php b/sources/admin/themes_installed.php
index eb16dc1..f798f21 100644
--- a/sources/admin/themes_installed.php
+++ b/sources/admin/themes_installed.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/themes_new.php b/sources/admin/themes_new.php
index 803327e..e136079 100644
--- a/sources/admin/themes_new.php
+++ b/sources/admin/themes_new.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/updates.php b/sources/admin/updates.php
index bfd6b6a..a38a0e5 100644
--- a/sources/admin/updates.php
+++ b/sources/admin/updates.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/updates_ext.php b/sources/admin/updates_ext.php
index 72b2e13..c8586f0 100644
--- a/sources/admin/updates_ext.php
+++ b/sources/admin/updates_ext.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/updates_pwg.php b/sources/admin/updates_pwg.php
index 4619ad3..023ff8e 100644
--- a/sources/admin/updates_pwg.php
+++ b/sources/admin/updates_pwg.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/user_list.php b/sources/admin/user_list.php
index 83815f6..6a7a0a2 100644
--- a/sources/admin/user_list.php
+++ b/sources/admin/user_list.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -100,6 +100,8 @@ $protected_users = array(
   $conf['webmaster_id'],
   );
 
+$password_protected_users = array($conf['guest_id']);
+
 // an admin can't delete other admin/webmaster
 if ('admin' == $user['status'])
 {
@@ -109,7 +111,12 @@ SELECT
   FROM '.USER_INFOS_TABLE.'
   WHERE status IN (\'webmaster\', \'admin\')
 ;';
-  $protected_users = array_merge($protected_users, query2array($query, null, 'user_id'));
+  $admin_ids = query2array($query, null, 'user_id');
+  
+  $protected_users = array_merge($protected_users, $admin_ids);
+
+  // we add all admin+webmaster users BUT the user herself
+  $password_protected_users = array_merge($password_protected_users, array_diff($admin_ids, array($user['id'])));
 }
 
 $template->assign(
@@ -123,6 +130,7 @@ $template->assign(
     'language_selected' => get_default_language(),
     'association_options' => $groups,
     'protected_users' => implode(',', array_unique($protected_users)),
+    'password_protected_users' => implode(',', array_unique($password_protected_users)),
     'guest_user' => $conf['guest_id'],
     )
   );
@@ -135,7 +143,7 @@ foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)
 
 $pref_status_options = $label_of_status;
 
-// a simple "admin" can set/remove statuses webmaster/admin
+// a simple "admin" can't set/remove statuses webmaster/admin
 if ('admin' == $user['status'])
 {
   unset($pref_status_options['webmaster']);
diff --git a/sources/admin/user_list_backend.php b/sources/admin/user_list_backend.php
index 1edaa13..290873c 100644
--- a/sources/admin/user_list_backend.php
+++ b/sources/admin/user_list_backend.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/admin/user_perm.php b/sources/admin/user_perm.php
index e40c064..68b8c60 100644
--- a/sources/admin/user_perm.php
+++ b/sources/admin/user_perm.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/comments.php b/sources/comments.php
index c3c4702..7b05249 100644
--- a/sources/comments.php
+++ b/sources/comments.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/doc/index.php b/sources/doc/index.php
index c8de97f..0b96c3e 100644
--- a/sources/doc/index.php
+++ b/sources/doc/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/feed.php b/sources/feed.php
index 24e9f68..6a7a808 100644
--- a/sources/feed.php
+++ b/sources/feed.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/galleries/index.php b/sources/galleries/index.php
new file mode 100644
index 0000000..0b96c3e
--- /dev/null
+++ b/sources/galleries/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/sources/i.php b/sources/i.php
index 32f99da..8b3e89b 100644
--- a/sources/i.php
+++ b/sources/i.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
 // | it under the terms of the GNU General Public License as published by  |
@@ -30,6 +30,17 @@ defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', $conf['data_locati
 
 @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php');
 
+include(PHPWG_ROOT_PATH . 'include/Logger.class.php');
+
+$logger = new Logger(array(
+  'directory' => PHPWG_ROOT_PATH . $conf['data_location'] . $conf['log_dir'],
+  'severity' => $conf['log_level'],
+  // we use an hashed filename to prevent direct file access, and we salt with
+  // the db_password instead of secret_key because the log must be usable in i.php
+  // (secret_key is in the database)
+  'filename' => 'log_' . date('Y-m-d') . '_' . sha1(date('Y-m-d') . $conf['db_password']) . '.txt',
+  ));
+
 
 function trigger_notify() {}
 function get_extension( $filename )
@@ -66,33 +77,9 @@ function mkgetdir($dir)
 
 // end fast bootstrap
 
-function ilog()
-{
-  global $conf;
-  if (!$conf['enable_i_log']) return;
-
-  $line = date("c");
-  foreach( func_get_args() as $arg)
-  {
-    $line .= ' ';
-    if (is_array($arg))
-    {
-      $line .= implode(' ', $arg);
-    }
-    else
-    {
-      $line .= $arg;
-    }
-  }
-	$file=PHPWG_ROOT_PATH.$conf['data_location'].'tmp/i.log';
-  if (false == file_put_contents($file, $line."\n", FILE_APPEND))
-	{
-		mkgetdir(dirname($file));
-	}
-}
-
 function ierror($msg, $code)
 {
+  global $logger;
   if ($code==301 || $code==302)
   {
     if (ob_get_length () !== FALSE)
@@ -101,10 +88,12 @@ function ierror($msg, $code)
     }
     // default url is on html format
     $url = html_entity_decode($msg);
+    $logger->debug($code . ' ' . $url, 'i.php', array(
+      'url' => $_SERVER['REQUEST_URI'],
+      ));
     header('Request-URI: '.$url);
     header('Content-Location: '.$url);
     header('Location: '.$url);
-    ilog('WARN', $code, $url, $_SERVER['REQUEST_URI']);
     exit;
   }
   if ($code>=400)
@@ -117,7 +106,9 @@ function ierror($msg, $code)
   }
   //todo improve
   echo $msg;
-  ilog('ERROR', $code, $msg, $_SERVER['REQUEST_URI']);
+  $logger->error($code . ' ' . $msg, 'i.php', array(
+      'url' => $_SERVER['REQUEST_URI'],
+      ));
   exit;
 }
 
@@ -322,6 +313,8 @@ function try_switch_source(DerivativeParams $params, $original_mtime)
     }
     else
     {
+      if ($use_watermark && $candidate->use_watermark)
+        continue; //a square that requires watermark should not be generated from a larger derivative with watermark, because if the watermark is not centered on the large image, it will be cropped.
       if ($candidate->sizing->max_crop!=0)
         continue; // this could be optimized
       if ($candidate_size[0] < $params->sizing->min_size[0] || $candidate_size[1] < $params->sizing->min_size[1] )
@@ -404,7 +397,7 @@ try
 }
 catch (Exception $e)
 {
-  ilog("db error", $e->getMessage());
+  $logger->error($e->getMessage(), 'i.php');
 }
 pwg_db_check_charset();
 
@@ -501,7 +494,7 @@ SELECT *
   }
   catch (Exception $e)
   {
-    ilog("db error", $e->getMessage());
+    $logger->error($e->getMessage(), 'i.php');
   }
 }
 else
@@ -582,17 +575,23 @@ if ($params->will_watermark($d_size))
   if ($image->compose($wm_image, $x, $y, $wm->opacity))
   {
     $changes++;
-    if ($wm->xrepeat)
+    if ($wm->xrepeat || $wm->yrepeat)
     {
-      // todo
-      $pad = $wm_size[0] + max(30, round($wm_size[0]/4));
+      $xpad = $wm_size[0] + max(30, round($wm_size[0]/4));
+      $ypad = $wm_size[1] + max(30, round($wm_size[1]/4));
+
       for($i=-$wm->xrepeat; $i<=$wm->xrepeat; $i++)
       {
-        if (!$i) continue;
-        $x2 = $x + $i * $pad;
-        if ($x2>=0 && $x2+$wm_size[0]<$d_size[0])
-          if (!$image->compose($wm_image, $x2, $y, $wm->opacity))
-            break;
+        for($j=-$wm->yrepeat; $j<=$wm->yrepeat; $j++)
+        {
+          if (!$i && !$j) continue;
+          $x2 = $x + $i * $xpad;
+          $y2 = $y + $j * $ypad;
+          if ($x2>=0 && $x2+$wm_size[0]<$d_size[0] &&
+              $y2>=0 && $y2+$wm_size[1]<$d_size[1] )
+            if (!$image->compose($wm_image, $x2, $y2, $wm->opacity))
+              break;
+        }
       }
     }
   }
@@ -621,10 +620,16 @@ $timing['save'] = time_step($step);
 send_derivative($expires);
 $timing['send'] = time_step($step);
 
-ilog('perf',
-  basename($page['src_path']), $o_size, $o_size[0]*$o_size[1],
-  basename($page['derivative_path']), $d_size, $d_size[0]*$d_size[1],
-  function_exists('memory_get_peak_usage') ? round( memory_get_peak_usage()/(1024*1024), 1) : '',
-  time_step($begin),
-  '|', $timing);
-?>
\ No newline at end of file
+$timing['total'] = time_step($begin);
+
+if ($logger->severity() >= Logger::DEBUG)
+{
+  $logger->debug('', 'i.php', array(
+    'src_path' => basename($page['src_path']),
+    'derivative_path' => basename($page['derivative_path']),
+    'o_size' => $o_size[0] . ' ' . $o_size[1] . ' ' . ($o_size[0]*$o_size[1]),
+    'd_size' => $d_size[0] . ' ' . $d_size[1] . ' ' . ($d_size[0]*$d_size[1]),
+    'mem_usage' => function_exists('memory_get_peak_usage') ? round( memory_get_peak_usage()/(1024*1024), 1) : '',
+    'timing' => $timing,
+    ));
+}
\ No newline at end of file
diff --git a/sources/identification.php b/sources/identification.php
index fe8a802..be22eb5 100644
--- a/sources/identification.php
+++ b/sources/identification.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/Logger.class.php b/sources/include/Logger.class.php
new file mode 100644
index 0000000..73a2934
--- /dev/null
+++ b/sources/include/Logger.class.php
@@ -0,0 +1,489 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team          http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team  http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/**
+ * Modified version of KLogger 0.2.0
+ *
+ * @author  Kenny Katzgrau <katzgrau@gmail.com>
+ *
+ * @package logger
+ */
+
+class Logger
+{
+  /**
+   * Error severity, from low to high. From BSD syslog RFC, section 4.1.1
+   * @link http://www.faqs.org/rfcs/rfc3164.html
+   */
+  const EMERGENCY = 0;  // Emergency: system is unusable
+  const ALERT     = 1;  // Alert: action must be taken immediately
+  const CRITICAL  = 2;  // Critical: critical conditions
+  const ERROR     = 3;  // Error: error conditions
+  const WARNING   = 4;  // Warning: warning conditions
+  const NOTICE    = 5;  // Notice: normal but significant condition
+  const INFO      = 6;  // Informational: informational messages
+  const DEBUG     = 7;  // Debug: debug messages
+
+  /**
+   * Custom "disable" level.
+   */
+  const OFF       = -1; // Log nothing at all
+
+  /**
+   * Internal status codes.
+   */
+  const STATUS_LOG_OPEN  = 1;
+  const STATUS_OPEN_FAILED = 2;
+  const STATUS_LOG_CLOSED  = 3;
+
+  /**
+   * Disable archive purge.
+   */
+  const ARCHIVE_NO_PURGE = -1;
+
+  /**
+   * Standard messages produced by the class.
+   * @var array
+   */
+  private static $_messages = array(
+    'writefail'   => 'The file could not be written to. Check that appropriate permissions have been set.',
+    'opensuccess' => 'The log file was opened successfully.',
+    'openfail'  => 'The file could not be opened. Check permissions.',
+  );
+
+  /**
+   * Instance options.
+   * @var array
+   */
+  private $options = array(
+    'directory' => null, // Log files directory
+    'filename' => null, // Path to the log file
+    'globPattern' => 'log_*.txt', // Pattern to select all log files with glob()
+    'severity' => self::DEBUG, // Current minimum logging threshold
+    'dateFormat' => 'Y-m-d G:i:s', // Date format
+    'archiveDays' => self::ARCHIVE_NO_PURGE, // Number of files to keep
+    );
+
+  /**
+   * Current status of the logger.
+   * @var integer
+   */
+  private $_logStatus = self::STATUS_LOG_CLOSED;
+  /**
+   * File handle for this instance's log file.
+   * @var resource
+   */
+  private $_fileHandle = null;
+
+
+  /**
+   * Class constructor.
+   *
+   * @param array $options
+   * @return void
+   */
+  public function __construct($options)
+  {
+    $this->options = array_merge($this->options, $options);
+    
+    if (is_string($this->options['severity']))
+    {
+      $this->options['severity'] = self::codeToLevel($this->options['severity']);
+    }
+
+    if ($this->options['severity'] === self::OFF)
+    {
+      return;
+    }
+
+    $this->options['directory'] = rtrim($this->options['directory'], '\\/') . DIRECTORY_SEPARATOR;
+
+    if ($this->options['filename'] == null)
+    {
+      $this->options['filename'] = 'log_' . date('Y-m-d') . '.txt';
+    }
+
+    $this->options['filePath'] = $this->options['directory'] . $this->options['filename'];
+
+    if ($this->options['archiveDays'] != self::ARCHIVE_NO_PURGE && rand() % 97 == 0)
+    {
+      $this->purge();
+    }
+  }
+  
+  /**
+   * Open the log file if not already oppenned
+   */
+  private function open()
+  {
+    if ($this->status() == self::STATUS_LOG_CLOSED)
+    {
+      if (!file_exists($this->options['directory']))
+      {
+        mkgetdir($this->options['directory'], MKGETDIR_DEFAULT|MKGETDIR_PROTECT_HTACCESS);
+      }
+
+      if (file_exists($this->options['filePath']) && !is_writable($this->options['filePath']))
+      {
+        $this->_logStatus = self::STATUS_OPEN_FAILED;
+        throw new RuntimeException(self::$_messages['writefail']);
+        return;
+      }
+
+      if (($this->_fileHandle = fopen($this->options['filePath'], 'a')) != false)
+      {
+        $this->_logStatus = self::STATUS_LOG_OPEN;
+      }
+      else
+      {
+        $this->_logStatus = self::STATUS_OPEN_FAILED;
+        throw new RuntimeException(self::$_messages['openfail']);
+      }
+    }
+  }
+
+  /**
+   * Class destructor.
+   */
+  public function __destruct()
+  {
+    if ($this->_fileHandle)
+    {
+      fclose($this->_fileHandle);
+    }
+  }
+
+  /**
+   * Returns logger status.
+   *
+   * @return int
+   */
+  public function status()
+  {
+    return $this->_logStatus;
+  }
+
+  /**
+   * Returns logger severity threshold.
+   *
+   * @return int
+   */
+  public function severity()
+  {
+    return $this->options['severity'];
+  }
+
+  /**
+   * Writes a $line to the log with a severity level of DEBUG.
+   *
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function debug($line, $cat = null, $args = array())
+  {
+    $this->log(self::DEBUG, $line, $cat, $args);
+  }
+
+  /**
+   * Writes a $line to the log with a severity level of INFO.
+   *
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function info($line, $cat = null, $args = array())
+  {
+    $this->log(self::INFO, $line, $cat, $args);
+  }
+
+  /**
+   * Writes a $line to the log with a severity level of NOTICE.
+   *
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function notice($line, $cat = null, $args = array())
+  {
+    $this->log(self::NOTICE, $line, $cat, $args);
+  }
+
+  /**
+   * Writes a $line to the log with a severity level of WARNING.
+   *
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function warn($line, $cat = null, $args = array())
+  {
+    $this->log(self::WARNING, $line, $cat, $args);
+  }
+
+  /**
+   * Writes a $line to the log with a severity level of ERROR.
+   *
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function error($line, $cat = null, $args = array())
+  {
+    $this->log(self::ERROR, $line, $cat, $args);
+  }
+
+  /**
+   * Writes a $line to the log with a severity level of ALERT.
+   *
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function alert($line, $cat = null, $args = array())
+  {
+    $this->log(self::ALERT, $line, $cat, $args);
+  }
+
+  /**
+   * Writes a $line to the log with a severity level of CRITICAL.
+   *
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function critical($line, $cat = null, $args = array())
+  {
+    $this->log(self::CRITICAL, $line, $cat, $args);
+  }
+
+  /**
+   * Writes a $line to the log with a severity level of EMERGENCY.
+   *
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function emergency($line, $cat = null, $args = array())
+  {
+    $this->log(self::EMERGENCY, $line, $cat, $args);
+  }
+
+  /**
+   * Writes a $line to the log with the given severity.
+   *
+   * @param integer $severity
+   * @param string $line
+   * @param string $cat
+   * @param array $args
+   */
+  public function log($severity, $message, $cat = null, $args = array())
+  {
+    if ($this->severity() >= $severity)
+    {
+      if (is_array($cat))
+      {
+        $args = $cat;
+        $cat = null;
+      }
+      $line = $this->formatMessage($severity, $message, $cat, $args);
+      $this->write($line);
+    }
+  }
+
+  /**
+   * Directly writes a line to the log without adding level and time.
+   *
+   * @param string $line
+   */
+  public function write($line)
+  {
+    $this->open();
+    if ($this->status() == self::STATUS_LOG_OPEN)
+    {
+      if (fwrite($this->_fileHandle, $line) === false)
+      {
+        throw new RuntimeException(self::$_messages['writefail']);
+      }
+    }
+  }
+
+  /**
+   * Purges files matching 'globPattern' older than 'archiveDays'.
+   */
+  public function purge()
+  {
+    $files = glob($this->options['directory'] . $this->options['globPattern']);
+    $limit = time() - $this->options['archiveDays'] * 86400;
+
+    foreach ($files as $file)
+    {
+      if (@filemtime($file) < $limit)
+      {
+        @unlink($file);
+      }
+    }
+  }
+
+  /**
+   * Formats the message for logging.
+   *
+   * @param  string $level
+   * @param  string $message
+   * @param  array  $context
+   * @return string
+   */
+  private function formatMessage($level, $message, $cat, $context)
+  {
+    if (!empty($context))
+    {
+      $message.= "\n" . $this->indent($this->contextToString($context));
+    }
+    $line = "[" . $this->getTimestamp() . "]\t[" . self::levelToCode($level) . "]\t";
+    if ($cat != null)
+    {
+      $line.= "[" . $cat . "]\t";
+    }
+    return $line . $message . "\n";
+  }
+
+  /**
+   * Gets the formatted Date/Time for the log entry.
+   *
+   * PHP DateTime is dumb, and you have to resort to trickery to get microseconds
+   * to work correctly, so here it is.
+   *
+   * @return string
+   */
+  private function getTimestamp()
+  {
+    $originalTime = microtime(true);
+    $micro = sprintf('%06d', ($originalTime - floor($originalTime)) * 1000000);
+    $date = new DateTime(date('Y-m-d H:i:s.'.$micro, $originalTime));
+    return $date->format($this->options['dateFormat']);
+  }
+
+  /**
+   * Takes the given context and converts it to a string.
+   *
+   * @param  array $context
+   * @return string
+   */
+  private function contextToString($context)
+  {
+    $export = '';
+    foreach ($context as $key => $value)
+    {
+      $export.= $key . ': ';
+      $export.= preg_replace(array(
+        '/=>\s+([a-zA-Z])/im',
+        '/array\(\s+\)/im',
+        '/^  |\G  /m'
+        ),
+        array(
+        '=> $1',
+        'array()',
+        '  '
+        ),
+        str_replace('array (', 'array(', var_export($value, true))
+        );
+      $export.= PHP_EOL;
+    }
+    return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));
+  }
+
+  /**
+   * Indents the given string with the given indent.
+   *
+   * @param  string $string The string to indent
+   * @param  string $indent What to use as the indent.
+   * @return string
+   */
+  private function indent($string, $indent = '  ')
+  {
+    return $indent . str_replace("\n", "\n" . $indent, $string);
+  }
+
+  /**
+   * Converts level constants to string name.
+   *
+   * @param int $level
+   * @return string
+   */
+  static function levelToCode($level)
+  {
+    switch ($level)
+    {
+      case self::EMERGENCY:
+        return 'EMERGENCY';
+      case self::ALERT:
+        return 'ALERT';
+      case self::CRITICAL:
+        return 'CRITICAL';
+      case self::NOTICE:
+        return 'NOTICE';
+      case self::INFO:
+        return 'INFO';
+      case self::WARNING:
+        return 'WARNING';
+      case self::DEBUG:
+        return 'DEBUG';
+      case self::ERROR:
+        return 'ERROR';
+      default:
+        throw new RuntimeException('Unknown severity level ' . $level);
+    }
+  }
+
+  /**
+   * Converts level names to constant.
+   *
+   * @param string $code
+   * @return int
+   */
+  static function codeToLevel($code)
+  {
+    switch (strtoupper($code))
+    {
+      case 'EMERGENCY':
+        return self::EMERGENCY;
+      case 'ALERT':
+        return self::ALERT;
+      case 'CRITICAL':
+        return self::CRITICAL;
+      case 'NOTICE':
+        return self::NOTICE;
+      case 'INFO':
+        return self::INFO;
+      case 'WARNING':
+        return self::WARNING;
+      case 'DEBUG':
+        return self::DEBUG;
+      case 'ERROR':
+        return self::ERROR;
+      default:
+        throw new RuntimeException('Unknown severity code ' . $code);
+    }
+  }
+}
+?>
\ No newline at end of file
diff --git a/sources/include/block.class.php b/sources/include/block.class.php
index cce92ec..ea11cb8 100644
--- a/sources/include/block.class.php
+++ b/sources/include/block.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
 // | it under the terms of the GNU General Public License as published by  |
diff --git a/sources/include/cache.class.php b/sources/include/cache.class.php
index 5b97cb1..4a1a4aa 100644
--- a/sources/include/cache.class.php
+++ b/sources/include/cache.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/calendar_base.class.php b/sources/include/calendar_base.class.php
index f48fae1..020265d 100644
--- a/sources/include/calendar_base.class.php
+++ b/sources/include/calendar_base.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -360,7 +360,7 @@ GROUP BY period';
     if ( !empty($tpl_var) )
     {
       $existing = $template->smarty->getVariable('chronology_navigation_bars');
-      if (! ($existing instanceof Undefined_Smarty_Variable))
+      if (! ($existing instanceof Smarty_Undefined_Variable))
       {
         $existing->value[ sizeof($existing->value)-1 ] =
           array_merge( $existing->value[ sizeof($existing->value)-1 ], $tpl_var);
diff --git a/sources/include/calendar_monthly.class.php b/sources/include/calendar_monthly.class.php
index 9ab38ae..f82849c 100644
--- a/sources/include/calendar_monthly.class.php
+++ b/sources/include/calendar_monthly.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/calendar_weekly.class.php b/sources/include/calendar_weekly.class.php
index 346f658..91ae9b7 100644
--- a/sources/include/calendar_weekly.class.php
+++ b/sources/include/calendar_weekly.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/category_cats.inc.php b/sources/include/category_cats.inc.php
index 4cab63d..9305945 100644
--- a/sources/include/category_cats.inc.php
+++ b/sources/include/category_cats.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/category_default.inc.php b/sources/include/category_default.inc.php
index 6106ccb..6962fd0 100644
--- a/sources/include/category_default.inc.php
+++ b/sources/include/category_default.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/common.inc.php b/sources/include/common.inc.php
index e3f4a16..a01fced 100644
--- a/sources/include/common.inc.php
+++ b/sources/include/common.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -26,7 +26,7 @@ defined('PHPWG_ROOT_PATH') or trigger_error('Hacking attempt!', E_USER_ERROR);
 // determine the initial instant to indicate the generation time of this page
 $t2 = microtime(true);
 
-@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+// @set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 
 //
 // addslashes to vars if magic_quotes_gpc is off this is a security
@@ -104,6 +104,9 @@ if(isset($conf['show_php_errors']) && !empty($conf['show_php_errors']))
 
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
+include(PHPWG_ROOT_PATH . 'include/template.class.php');
+include(PHPWG_ROOT_PATH . 'include/cache.class.php');
+include(PHPWG_ROOT_PATH . 'include/Logger.class.php');
 
 $persistent_cache = new PersistentFileCache();
 
@@ -122,6 +125,17 @@ pwg_db_check_charset();
 
 load_conf_from_db();
 
+$logger = new Logger(array(
+  'directory' => PHPWG_ROOT_PATH . $conf['data_location'] . $conf['log_dir'],
+  'severity' => $conf['log_level'],
+  // we use an hashed filename to prevent direct file access, and we salt with
+  // the db_password instead of secret_key because the log must be usable in i.php
+  // (secret_key is in the database)
+  'filename' => 'log_' . date('Y-m-d') . '_' . sha1(date('Y-m-d') . $conf['db_password']) . '.txt',
+  'globPattern' => 'log_*.txt',
+  'archiveDays' => $conf['log_archive_days'],
+  ));
+
 if (!$conf['check_upgrade_feed'])
 {
   if (!isset($conf['piwigo_db_version']) or $conf['piwigo_db_version'] != get_branch_from_version(PHPWG_VERSION))
@@ -187,6 +201,16 @@ if (is_a_guest())
   $user['username'] = l10n('guest');
 }
 
+// in case an auth key was provided and is no longer valid, we must wait to
+// be here, with language loaded, to prepare the message
+if (isset($page['auth_key_invalid']) and $page['auth_key_invalid'])
+{
+  $page['errors'][] =
+    l10n('Your authentication key is no longer valid.')
+    .sprintf(' <a href="%s">%s</a>', get_root_url().'identification.php', l10n('Login'))
+    ;
+}
+
 // template instance
 if (defined('IN_ADMIN') and IN_ADMIN )
 {// Admin template
diff --git a/sources/include/config_default.inc.php b/sources/include/config_default.inc.php
index 6d2dd31..87baa29 100644
--- a/sources/include/config_default.inc.php
+++ b/sources/include/config_default.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -63,6 +63,13 @@ $conf['file_ext'] = array_merge(
   array('tiff', 'tif', 'mpg','zip','avi','mp3','ogg','pdf')
   );
 
+// enable_formats: should Piwigo search for multiple formats?
+$conf['enable_formats'] = false;
+
+// format_ext : file extensions for formats, ie additional versions of a
+// photo (or nay other file). Formats are in sub-directory pwg_format.
+$conf['format_ext'] = array('cr2', 'tif', 'tiff', 'nef', 'dng', 'ai', 'psd');
+
 // top_number : number of element to display for "best rated" and "most
 // visited" categories
 $conf['top_number'] = 15;
@@ -371,6 +378,10 @@ $conf['use_exif_mapping'] = array(
 // javascript)
 $conf['allow_html_in_metadata'] = false;
 
+// decide which characters can be used as keyword separators (works in EXIF
+// and IPTC). Coma "," cannot be removed from this list.
+$conf['metadata_keyword_separator_regex'] = '/[.,;]/';
+
 // +-----------------------------------------------------------------------+
 // |                               sessions                                |
 // +-----------------------------------------------------------------------+
@@ -458,8 +469,6 @@ $conf['template_combine_files'] = true;
 // gives an empty value '' to deactivate
 $conf['show_php_errors'] = E_ALL;
 
-// enable log for i derivative script
-$conf['enable_i_log'] = false;
 
 // +-----------------------------------------------------------------------+
 // |                            authentication                             |
@@ -637,6 +646,10 @@ $conf['recent_post_dates'] = array(
 // the author shown in the RSS feed <author> element
 $conf['rss_feed_author'] = 'Piwigo notifier';
 
+// how long does the authentication key stays valid, in seconds. 3 days by
+// default. 0 to disable.
+$conf['auth_key_duration'] = 3*24*60*60;
+
 // +-----------------------------------------------------------------------+
 // | Set admin layout                                                      |
 // +-----------------------------------------------------------------------+
@@ -649,12 +662,6 @@ $conf['enable_plugins']=true;
 // Web services are allowed (true) or completely forbidden (false)
 $conf['allow_web_services'] = true;
 
-// enable log for web services
-$conf['ws_enable_log'] = false;
-
-// web services log file path
-$conf['ws_log_filepath'] = '/tmp/piwigo_ws.log';
-
 // Maximum number of images to be returned foreach call to the web service
 $conf['ws_max_images_per_page'] = 500;
 
@@ -804,8 +811,39 @@ $conf['tiff_representative_ext'] = 'png';
 // (TIFF, videos, PDF)
 $conf['upload_form_all_types'] = false;
 
+// Size of chunks, in kilobytes. Fast connections will have better
+// performances with high values, such as 5000.
+$conf['upload_form_chunk_size'] = 500;
+
 // If we try to generate a pwg_representative for a video we use ffmpeg. If
 // "ffmpeg" is not visible by the web user, you can define the full path of
 // the directory where "ffmpeg" executable is.
 $conf['ffmpeg_dir'] = '';
+
+// +-----------------------------------------------------------------------+
+// |                                 log                                   |
+// +-----------------------------------------------------------------------+
+// Logs directory, relative to $conf['data_location']
+$conf['log_dir'] = '/logs';
+
+// Log level (OFF, CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG)
+// development = DEBUG, production = ERROR
+$conf['log_level'] = 'ERROR';
+
+// Keep logs file during X days
+$conf['log_archive_days'] = 30;
+
+// +-----------------------------------------------------------------------+
+// | Proxy Settings                                                        |
+// +-----------------------------------------------------------------------+
+
+// If piwigo needs a http-proxy to connect to the internet, set this to true
+$conf['use_proxy'] = false;
+
+// Connection string of the proxy
+$conf['proxy_server'] = 'proxy.domain.org:port';
+
+// If the http-proxy requires authentication, set username and password here
+// e.g. username:password
+$conf['proxy_auth'] = '';
 ?>
diff --git a/sources/include/constants.php b/sources/include/constants.php
index 70d13d1..22bb967 100644
--- a/sources/include/constants.php
+++ b/sources/include/constants.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // Default settings
-define('PHPWG_VERSION', '2.7.4');
+define('PHPWG_VERSION', '2.8.2');
 define('PHPWG_DEFAULT_LANGUAGE', 'en_UK');
 define('PHPWG_DEFAULT_TEMPLATE', 'elegant');
 
@@ -81,6 +81,8 @@ if (!defined('USER_FEED_TABLE'))
   define('USER_FEED_TABLE', $prefixeTable.'user_feed');
 if (!defined('RATE_TABLE'))
   define('RATE_TABLE', $prefixeTable.'rate');
+if (!defined('USER_AUTH_KEYS_TABLE'))
+  define('USER_AUTH_KEYS_TABLE', $prefixeTable.'user_auth_keys');
 if (!defined('USER_CACHE_TABLE'))
   define('USER_CACHE_TABLE', $prefixeTable.'user_cache');
 if (!defined('USER_CACHE_CATEGORIES_TABLE'))
@@ -105,5 +107,7 @@ if (!defined('THEMES_TABLE'))
   define('THEMES_TABLE', $prefixeTable.'themes');
 if (!defined('LANGUAGES_TABLE'))
   define('LANGUAGES_TABLE', $prefixeTable.'languages');
+if (!defined('IMAGE_FORMAT_TABLE'))
+  define('IMAGE_FORMAT_TABLE', $prefixeTable.'image_format');
 
 ?>
diff --git a/sources/include/dblayer/functions_mysql.inc.php b/sources/include/dblayer/functions_mysql.inc.php
index a1853b2..6a17368 100644
--- a/sources/include/dblayer/functions_mysql.inc.php
+++ b/sources/include/dblayer/functions_mysql.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -53,7 +53,7 @@ function pwg_db_check_charset()
   {
     $db_charset = DB_CHARSET;
   }
-  pwg_query('SET NAMES "'.$db_charset.'"');
+  mysql_set_charset($db_charset);
 }
 
 function pwg_db_check_version()
diff --git a/sources/include/dblayer/functions_mysqli.inc.php b/sources/include/dblayer/functions_mysqli.inc.php
index 390cf2e..5b40cfe 100644
--- a/sources/include/dblayer/functions_mysqli.inc.php
+++ b/sources/include/dblayer/functions_mysqli.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -80,12 +80,14 @@ function pwg_db_connect($host, $user, $password, $database)
  */
 function pwg_db_check_charset() 
 {
+  global $mysqli;
+
   $db_charset = 'utf8';
   if (defined('DB_CHARSET') and DB_CHARSET != '')
   {
     $db_charset = DB_CHARSET;
   }
-  pwg_query('SET NAMES "'.$db_charset.'"');
+  $mysqli->set_charset($db_charset);
 }
 
 /**
@@ -901,4 +903,4 @@ function query2array($query, $key_name=null, $value_name=null)
   return $data;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/sources/include/derivative.inc.php b/sources/include/derivative.inc.php
index a6e0642..8b65e8a 100644
--- a/sources/include/derivative.inc.php
+++ b/sources/include/derivative.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
 // | it under the terms of the GNU General Public License as published by  |
diff --git a/sources/include/derivative_params.inc.php b/sources/include/derivative_params.inc.php
index cb1f22e..2fcd404 100644
--- a/sources/include/derivative_params.inc.php
+++ b/sources/include/derivative_params.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
 // | it under the terms of the GNU General Public License as published by  |
diff --git a/sources/include/derivative_std_params.inc.php b/sources/include/derivative_std_params.inc.php
index 375eb18..9fed9c1 100644
--- a/sources/include/derivative_std_params.inc.php
+++ b/sources/include/derivative_std_params.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
 // | it under the terms of the GNU General Public License as published by  |
@@ -52,6 +52,8 @@ final class WatermarkParams
   /** @var int */
   public $xrepeat = 0;
   /** @var int */
+  public $yrepeat = 0;
+  /** @var int */
   public $opacity = 100;
 }
 
@@ -201,8 +203,6 @@ final class ImageStdParams
    */
   static function save()
   {
-    global $conf;
-
     $ser = serialize( array(
       'd' => self::$type_map,
       'q' => self::$quality,
diff --git a/sources/include/filter.inc.php b/sources/include/filter.inc.php
index 05665a0..2d05238 100644
--- a/sources/include/filter.inc.php
+++ b/sources/include/filter.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions.inc.php b/sources/include/functions.inc.php
index 4ba5eb5..0187478 100644
--- a/sources/include/functions.inc.php
+++ b/sources/include/functions.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -36,8 +36,6 @@ include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/derivative_params.inc.php');
 include_once( PHPWG_ROOT_PATH .'include/derivative_std_params.inc.php');
 include_once( PHPWG_ROOT_PATH .'include/derivative.inc.php');
-include_once( PHPWG_ROOT_PATH .'include/template.class.php');
-include_once( PHPWG_ROOT_PATH .'include/cache.class.php');
 
 
 /**
@@ -409,7 +407,7 @@ SELECT id, name
  * @param string $image_type
  * @return bool
  */
-function pwg_log($image_id = null, $image_type = null)
+function pwg_log($image_id = null, $image_type = null, $format_id = null)
 {
   global $conf, $user, $page;
 
@@ -436,6 +434,17 @@ function pwg_log($image_id = null, $image_type = null)
     $tags_string = implode(',', $page['tag_ids']);
   }
 
+  $ip = $_SERVER['REMOTE_ADDR'];
+  // In case of "too long" ipv6 address, we take only the 15 first chars.
+  //
+  // It would be "cleaner" to increase length of history.IP to 50 chars, but
+  // the alter table is very long on such a big table. We should plan this
+  // for a future version, once history table is kept "smaller".
+  if (strpos($ip,':') !== false and strlen($ip) > 15)
+  {
+    $ip = substr($ip, 0, 15);
+  }
+
   $query = '
 INSERT INTO '.HISTORY_TABLE.'
   (
@@ -447,6 +456,8 @@ INSERT INTO '.HISTORY_TABLE.'
     category_id,
     image_id,
     image_type,
+    format_id,
+    auth_key_id,
     tag_ids
   )
   VALUES
@@ -454,11 +465,13 @@ INSERT INTO '.HISTORY_TABLE.'
     CURRENT_DATE,
     CURRENT_TIME,
     '.$user['id'].',
-    \''.$_SERVER['REMOTE_ADDR'].'\',
+    \''.$ip.'\',
     '.(isset($page['section']) ? "'".$page['section']."'" : 'NULL').',
     '.(isset($page['category']['id']) ? $page['category']['id'] : 'NULL').',
     '.(isset($image_id) ? $image_id : 'NULL').',
     '.(isset($image_type) ? "'".$image_type."'" : 'NULL').',
+    '.(isset($format_id) ? $format_id : 'NULL').',
+    '.(isset($page['auth_key_id']) ? $page['auth_key_id'] : 'NULL').',
     '.(isset($tags_string) ? "'".$tags_string."'" : 'NULL').'
   )
 ;';
@@ -954,6 +967,21 @@ function original_to_representative($path, $representative_ext)
   return substr_replace($path, $representative_ext, $pos+1);
 }
 
+/**
+ * Transforms an original path to its format
+ *
+ * @param string $path
+ * @param string $format_ext
+ * @return string
+ */
+function original_to_format($path, $format_ext)
+{
+  $pos = strrpos($path, '/');
+  $path = substr_replace($path, 'pwg_format/', $pos+1, 0);
+  $pos = strrpos($path, '.');
+  return substr_replace($path, $format_ext, $pos+1);
+}
+
 /**
  * get the full path of an image
  *
@@ -1142,9 +1170,7 @@ function l10n_args($key_args, $sep = "\n")
  */
 function get_themeconf($key)
 {
-  global $template;
-
-  return $template->get_themeconf($key);
+  return $GLOBALS['template']->get_themeconf($key);
 }
 
 /**
@@ -1279,6 +1305,27 @@ DELETE FROM '.CONFIG_TABLE.'
   }
 }
 
+/**
+ * Return a default value for a configuration parameter.
+ * @since 2.8
+ *
+ * @param string $param the configuration value to be extracted (if it exists)
+ * @param mixed $default_value the default value for the configuration value if it does not exist.
+ *
+ * @return mixed The configuration value if the variable exists, otherwise the default.
+ */
+function conf_get_param($param, $default_value=null)
+{
+  global $conf;
+  
+  if (isset($conf[$param]))
+  {
+    return $conf[$param];
+  }
+  return $default_value;
+}
+
+
 /**
  * Apply *unserialize* on a value only if it is a string
  * @since 2.7
@@ -1633,7 +1680,7 @@ function convert_charset($str, $source_charset, $dest_charset)
   }
   if (function_exists('iconv'))
   {
-    return iconv($source_charset, $dest_charset, $str);
+    return iconv($source_charset, $dest_charset.'//TRANSLIT', $str);
   }
   if (function_exists('mb_convert_encoding'))
   {
@@ -2094,4 +2141,4 @@ function safe_version_compare($a, $b, $op=null)
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/sources/include/functions_calendar.inc.php b/sources/include/functions_calendar.inc.php
index 850ccdc..829d6d1 100644
--- a/sources/include/functions_calendar.inc.php
+++ b/sources/include/functions_calendar.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_category.inc.php b/sources/include/functions_category.inc.php
index 826ff92..76c9fba 100644
--- a/sources/include/functions_category.inc.php
+++ b/sources/include/functions_category.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -335,7 +335,7 @@ SELECT DISTINCT(id)
   }
   $query.= '
 ;';
-  return array_from_query($query, 'id');
+  return query2array($query, null, 'id');
 }
 
 /**
@@ -491,6 +491,7 @@ SELECT image_id
 function get_computed_categories(&$userdata, $filter_days=null)
 {
   $query = 'SELECT c.id AS cat_id, id_uppercat';
+  $query.= ', global_rank';
   // Count by date_available to avoid count null
   $query .= ',
   MAX(date_available) AS date_last, COUNT(date_available) AS nb_images
@@ -533,6 +534,11 @@ FROM '.CATEGORIES_TABLE.' as c
     $cats[$row['cat_id']] = $row;
   }
 
+  // it is important to logically sort the albums because some operations
+  // (like removal) rely on this logical order. Child album doesn't always
+  // have a bigger id than its parent (if it was moved afterwards).
+  uasort($cats, 'global_rank_compare');
+
   foreach ($cats as $cat)
   {
     if ( !isset( $cat['id_uppercat'] ) )
@@ -541,7 +547,7 @@ FROM '.CATEGORIES_TABLE.' as c
     // Piwigo before 2.5.3 may have generated inconsistent permissions, ie
     // private album A1/A2 permitted to user U1 but private album A1 not
     // permitted to U1.
-    // 
+    //
     // TODO 2.7: add an upgrade script to repair permissions and remove this
     // test
     if ( !isset($cats[ $cat['id_uppercat'] ]))
diff --git a/sources/include/functions_comment.inc.php b/sources/include/functions_comment.inc.php
index 2dcc4fc..0e6a571 100644
--- a/sources/include/functions_comment.inc.php
+++ b/sources/include/functions_comment.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_cookie.inc.php b/sources/include/functions_cookie.inc.php
index 4e547e1..2c61eec 100644
--- a/sources/include/functions_cookie.inc.php
+++ b/sources/include/functions_cookie.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_filter.inc.php b/sources/include/functions_filter.inc.php
index 47d0ffd..ded932e 100644
--- a/sources/include/functions_filter.inc.php
+++ b/sources/include/functions_filter.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_html.inc.php b/sources/include/functions_html.inc.php
index 8668e68..5af5c18 100644
--- a/sources/include/functions_html.inc.php
+++ b/sources/include/functions_html.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -103,10 +103,17 @@ function get_cat_display_name($cat_informations, $url='')
 function get_cat_display_name_cache($uppercats,
                                     $url = '',
                                     $single_link = false,
-                                    $link_class = null)
+                                    $link_class = null,
+                                    $auth_key=null)
 {
   global $cache, $conf;
 
+  $add_url_params = array();
+  if (isset($auth_key))
+  {
+    $add_url_params['auth'] = $auth_key;
+  }
+
   if (!isset($cache['cat_names']))
   {
     $query = '
@@ -119,7 +126,7 @@ SELECT id, name, permalink
   $output = '';
   if ($single_link)
   {
-    $single_url = get_root_url().$url.array_pop(explode(',', $uppercats));
+    $single_url = add_url_params(get_root_url().$url.array_pop(explode(',', $uppercats)), $add_url_params);
     $output.= '<a href="'.$single_url.'"';
     if (isset($link_class))
     {
@@ -155,10 +162,13 @@ SELECT id, name, permalink
     {
       $output.= '
 <a href="'
-      .make_index_url(
+      .add_url_params(
+        make_index_url(
           array(
             'category' => $cat,
             )
+          ),
+        $add_url_params
         )
       .'">'.$cat['name'].'</a>';
     }
@@ -263,15 +273,16 @@ function tag_alpha_compare($a, $b)
  */
 function access_denied()
 {
-  global $user;
+  global $user, $conf;
 
   $login_url =
       get_root_url().'identification.php?redirect='
       .urlencode(urlencode($_SERVER['REQUEST_URI']));
 
-  set_status_header(401);
   if ( isset($user) and !is_a_guest() )
   {
+    set_status_header(401);
+
     echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
     echo '<div style="text-align:center;">'.l10n('You are not authorized to access the requested page').'<br>';
     echo '<a href="'.get_root_url().'identification.php">'.l10n('Identification').'</a>&nbsp;';
@@ -279,6 +290,10 @@ function access_denied()
     echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size
     exit();
   }
+  elseif (!$conf['guest_access'] and is_a_guest())
+  {
+    redirect_http($login_url);
+  }
   else
   {
     redirect_html($login_url);
@@ -638,4 +653,4 @@ function flush_page_messages()
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/sources/include/functions_mail.inc.php b/sources/include/functions_mail.inc.php
index ed10817..9032d83 100644
--- a/sources/include/functions_mail.inc.php
+++ b/sources/include/functions_mail.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -514,6 +514,8 @@ SELECT DISTINCT language
     // get subset of users in this group for a specific language
     $query = '
 SELECT
+    ui.user_id,
+    ui.status,
     u.'.$conf['user_fields']['username'].' AS name,
     u.'.$conf['user_fields']['email'].' AS email
   FROM '.USER_GROUP_TABLE.' AS ug
@@ -534,13 +536,33 @@ SELECT
 
     switch_lang_to($language);
 
-    $return&= pwg_mail(null,
-      array_merge(
-        $args,
-        array('Bcc' => $users)
-        ),
-      $tpl
-      );
+    foreach ($users as $u)
+    {
+      $authkey = create_user_auth_key($u['user_id'], $u['status']);
+      
+      $user_tpl = $tpl;
+
+      if ($authkey !== false)
+      {
+        $user_tpl['assign']['LINK'] = add_url_params($tpl['assign']['LINK'], array('auth' => $authkey['auth_key']));
+
+        if (isset($user_tpl['assign']['IMG']['link']))
+        {
+          $user_tpl['assign']['IMG']['link'] = add_url_params(
+            $user_tpl['assign']['IMG']['link'],
+            array('auth' => $authkey['auth_key'])
+            );
+        }
+      }
+
+      $user_args = $args;
+      if ($authkey !== false)
+      {
+        $user_args['auth_key'] = $authkey['auth_key'];
+      }
+
+      $return &= pwg_mail($u['email'], $user_args, $user_tpl);
+    }
 
     switch_lang_back();
   }
@@ -563,6 +585,7 @@ SELECT
  *       o theme: theme to use [default value $conf_mail['mail_theme']]
  *       o mail_title: main title of the mail [default value $conf['gallery_title']]
  *       o mail_subtitle: subtitle of the mail [default value subject]
+ *       o auth_key: authentication key to add on footer link [default value null]
  * @param array $tpl - use these options to define a custom content template file
  *       o filename
  *       o dirname (optional)
@@ -695,6 +718,10 @@ function pwg_mail($to, $args=array(), $tpl=array())
   {
     // key compose of indexes witch allow to cache mail data
     $cache_key = $content_type.'-'.$lang_info['code'];
+    if (!empty($args['auth_key']))
+    {
+      $cache_key.= '-'.$args['auth_key'];
+    }
 
     if (!isset($conf_mail[$cache_key]))
     {
@@ -709,9 +736,15 @@ function pwg_mail($to, $args=array(), $tpl=array())
       $template->set_filename('mail_header', 'header.tpl');
       $template->set_filename('mail_footer', 'footer.tpl');
 
+      $add_url_params = array();
+      if (!empty($args['auth_key']))
+      {
+        $add_url_params['auth'] = $args['auth_key'];
+      }
+
       $template->assign(
         array(
-          'GALLERY_URL' => get_gallery_home_url(),
+          'GALLERY_URL' => add_url_params(get_gallery_home_url(), $add_url_params),
           'GALLERY_TITLE' => isset($page['gallery_title']) ? $page['gallery_title'] : $conf['gallery_title'],
           'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
           'PHPWG_URL' => defined('PHPWG_URL') ? PHPWG_URL : '',
diff --git a/sources/include/functions_metadata.inc.php b/sources/include/functions_metadata.inc.php
index ab3d6a7..3d35900 100644
--- a/sources/include/functions_metadata.inc.php
+++ b/sources/include/functions_metadata.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_notification.inc.php b/sources/include/functions_notification.inc.php
index bc4d1a3..6e063d1 100644
--- a/sources/include/functions_notification.inc.php
+++ b/sources/include/functions_notification.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -395,27 +395,45 @@ function add_news_line(&$news, $count, $singular_key, $plural_key, $url='', $add
  * @param bool $add_url add html link around news
  * @return array
  */
-function news($start=null, $end=null, $exclude_img_cats=false, $add_url=false)
+function news($start=null, $end=null, $exclude_img_cats=false, $add_url=false, $auth_key=null)
 {
   $news = array();
 
-  if (!$exclude_img_cats)
+  $add_url_params = array();
+  if (isset($auth_key))
   {
-    add_news_line( $news,
-      nb_new_elements($start, $end), '%d new photo', '%d new photos',
-      make_index_url(array('section'=>'recent_pics')), $add_url );
+    $add_url_params['auth'] = $auth_key;
   }
 
   if (!$exclude_img_cats)
   {
-    add_news_line( $news,
-      nb_updated_categories($start, $end), '%d album updated', '%d albums updated',
-      make_index_url(array('section'=>'recent_cats')), $add_url );
+    add_news_line(
+      $news,
+      nb_new_elements($start, $end),
+      '%d new photo',
+      '%d new photos',
+      add_url_params(make_index_url(array('section'=>'recent_pics')), $add_url_params),
+      $add_url
+      );
+    
+    add_news_line(
+      $news,
+      nb_updated_categories($start, $end),
+      '%d album updated',
+      '%d albums updated',
+      add_url_params(make_index_url(array('section'=>'recent_cats')), $add_url_params),
+      $add_url
+      );
   }
 
-  add_news_line( $news,
-      nb_new_comments($start, $end), '%d new comment', '%d new comments',
-      get_root_url().'comments.php', $add_url );
+  add_news_line(
+    $news,
+    nb_new_comments($start, $end),
+    '%d new comment',
+    '%d new comments',
+    add_url_params(get_root_url().'comments.php', $add_url_params),
+    $add_url
+    );
 
   if (is_admin())
   {
@@ -527,17 +545,23 @@ function get_recent_post_dates_array($args)
  * @param array $date_detail returned value of get_recent_post_dates()
  * @return string
  */
-function get_html_description_recent_post_date($date_detail)
+function get_html_description_recent_post_date($date_detail, $auth_key=null)
 {
   global $conf;
 
+  $add_url_params = array();
+  if (isset($auth_key))
+  {
+    $add_url_params['auth'] = $auth_key;
+  }
+
   $description = '<ul>';
 
   $description .=
         '<li>'
         .l10n_dec('%d new photo', '%d new photos', $date_detail['nb_elements'])
         .' ('
-        .'<a href="'.make_index_url(array('section'=>'recent_pics')).'">'
+        .'<a href="'.add_url_params(make_index_url(array('section'=>'recent_pics')), $add_url_params).'">'
           .l10n('Recent photos').'</a>'
         .')'
         .'</li><br>';
@@ -546,11 +570,16 @@ function get_html_description_recent_post_date($date_detail)
   {
     $tn_src = DerivativeImage::thumb_url($element);
     $description .= '<a href="'.
-                    make_picture_url(array(
-                        'image_id' => $element['id'],
-                        'image_file' => $element['file'],
-                      ))
-                    .'"><img src="'.$tn_src.'"></a>';
+      add_url_params(
+        make_picture_url(
+          array(
+            'image_id' => $element['id'],
+            'image_file' => $element['file'],
+            )
+          ),
+        $add_url_params
+        )
+      .'"><img src="'.$tn_src.'"></a>';
   }
   $description .= '...<br>';
 
@@ -564,7 +593,7 @@ function get_html_description_recent_post_date($date_detail)
   {
     $description .=
           '<li>'
-          .get_cat_display_name_cache($cat['uppercats'])
+          .get_cat_display_name_cache($cat['uppercats'],'', false, null, $auth_key)
           .' ('.
           l10n_dec('%d new photo', '%d new photos', $cat['img_count']).')'
           .'</li>';
diff --git a/sources/include/functions_picture.inc.php b/sources/include/functions_picture.inc.php
index ae3f944..9e923b0 100644
--- a/sources/include/functions_picture.inc.php
+++ b/sources/include/functions_picture.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_plugins.inc.php b/sources/include/functions_plugins.inc.php
index 8700a59..429167b 100644
--- a/sources/include/functions_plugins.inc.php
+++ b/sources/include/functions_plugins.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_rate.inc.php b/sources/include/functions_rate.inc.php
index 45d3e9e..3b27f5c 100644
--- a/sources/include/functions_rate.inc.php
+++ b/sources/include/functions_rate.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_search.inc.php b/sources/include/functions_search.inc.php
index 688a043..d8df4ee 100644
--- a/sources/include/functions_search.inc.php
+++ b/sources/include/functions_search.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -90,7 +90,7 @@ function get_sql_search_clause($search)
     }
   }
 
-  if (isset($search['fields']['allwords']))
+  if (isset($search['fields']['allwords']) and count($search['fields']['allwords']['fields']) > 0)
   {
     $fields = array('file', 'name', 'comment');
 
@@ -98,7 +98,7 @@ function get_sql_search_clause($search)
     {
       $fields = array_intersect($fields, $search['fields']['allwords']['fields']);
     }
-    
+
     // in the OR mode, request bust be :
     // ((field1 LIKE '%word1%' OR field2 LIKE '%word1%')
     // OR (field1 LIKE '%word2%' OR field2 LIKE '%word2%'))
@@ -199,7 +199,10 @@ function get_sql_search_clause($search)
  */
 function get_regular_search_results($search, $images_where='')
 {
-  global $conf;
+  global $conf, $logger;
+
+  $logger->debug(__FUNCTION__, 'search', $search);
+  
   $forbidden = get_sql_condition_FandF(
         array
           (
@@ -213,12 +216,35 @@ function get_regular_search_results($search, $images_where='')
   $items = array();
   $tag_items = array();
 
+  if (isset($search['fields']['search_in_tags']))
+  {
+    $word_clauses = array();
+    foreach ($search['fields']['allwords']['words'] as $word)
+    {
+      $word_clauses[] = "name LIKE '%".$word."%'";
+    }
+
+    $query = '
+SELECT
+    id
+  FROM '.TAGS_TABLE.'
+  WHERE '.implode(' OR ', $word_clauses).'
+;';
+    $tag_ids = query2array($query, null, 'id');
+
+    $search_in_tags_items = get_image_ids_for_tags($tag_ids, 'OR');
+
+    $logger->debug(__FUNCTION__.' '.count($search_in_tags_items).' items in $search_in_tags_items');
+  }
+  
   if (isset($search['fields']['tags']))
   {
     $tag_items = get_image_ids_for_tags(
       $search['fields']['tags']['words'],
       $search['fields']['tags']['mode']
       );
+    
+    $logger->debug(__FUNCTION__.' '.count($tag_items).' items in $tag_items');
   }
 
   $search_clause = get_sql_search_clause($search);
@@ -237,6 +263,18 @@ SELECT DISTINCT(id)
     $query .= $forbidden.'
   '.$conf['order_by'];
     $items = array_from_query($query, 'id');
+    
+    $logger->debug(__FUNCTION__.' '.count($items).' items in $items');
+  }
+
+  if (isset($search_in_tags_items))
+  {
+    $items = array_unique(
+      array_merge(
+        $items,
+        $search_in_tags_items
+        )
+      );
   }
 
   if ( !empty($tag_items) )
@@ -244,7 +282,7 @@ SELECT DISTINCT(id)
     switch ($search['mode'])
     {
       case 'AND':
-        if (empty($search_clause))
+        if (empty($search_clause) and !isset($search_in_tags_items))
         {
           $items = $tag_items;
         }
@@ -254,7 +292,6 @@ SELECT DISTINCT(id)
         }
         break;
       case 'OR':
-        $before_count = count($items);
         $items = array_unique(
           array_merge(
             $items,
@@ -938,6 +975,14 @@ function qsearch_get_images(QExpression $expr, QResults $qsr)
       case 'file':
         $clauses[] = $file_like;
         break;
+      case 'author':
+        if ( strlen($token->term) )
+          $clauses = array_merge($clauses, qsearch_get_text_token_search_sql($token, array('author')));
+        elseif ($token->modifier & QST_WILDCARD)
+          $clauses[] = 'author IS NOT NULL';
+        else
+          $clauses[] = 'author IS NULL';
+        break;
       case 'width':
       case 'height':
         $clauses[] = $token->scope->get_sql($scope_id, $token);
@@ -1178,6 +1223,7 @@ function get_quick_search_results_no_cache($q, $options)
   $scopes[] = new QSearchScope('tag', array('tags'));
   $scopes[] = new QSearchScope('photo', array('photos'));
   $scopes[] = new QSearchScope('file', array('filename'));
+  $scopes[] = new QSearchScope('author', array(), true);
   $scopes[] = new QNumericRangeScope('width', array());
   $scopes[] = new QNumericRangeScope('height', array());
   $scopes[] = new QNumericRangeScope('ratio', array(), false, 0.001);
diff --git a/sources/include/functions_session.inc.php b/sources/include/functions_session.inc.php
index aaa07fd..e75f22e 100644
--- a/sources/include/functions_session.inc.php
+++ b/sources/include/functions_session.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -62,32 +62,27 @@ if (isset($conf['session_save_handler'])
  */
 function generate_key($size)
 {
-  if (
-    is_callable('openssl_random_pseudo_bytes')
-    and !(version_compare(PHP_VERSION, '5.3.4') < 0 and defined('PHP_WINDOWS_VERSION_MAJOR'))
-    )
+  include_once(PHPWG_ROOT_PATH.'include/random_compat/random.php');
+
+  try
   {
-    return substr(
-      str_replace(
-        array('+', '/'),
-        '',
-        base64_encode(openssl_random_pseudo_bytes($size))
-        ),
-      0,
-      $size
-      );
+    $bytes = random_bytes($size+10);
   }
-  else
+  catch (Exception $ex)
   {
-    $alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    $l = strlen($alphabet)-1;
-    $key = '';
-    for ($i=0; $i<$size; $i++)
-    {
-      $key.= $alphabet[mt_rand(0, $l)];
-    }
-    return $key;
+    include_once(PHPWG_ROOT_PATH.'include/srand.php');
+    $bytes = secure_random_bytes($size+10);
   }
+
+  return substr(
+    str_replace(
+      array('+', '/'),
+      '',
+      base64_encode($bytes)
+      ),
+    0,
+    $size
+    );
 }
 
 /**
@@ -260,4 +255,20 @@ function pwg_unset_session_var($var)
   return true;
 }
 
-?>
\ No newline at end of file
+/**
+ * delete all sessions for a given user (certainly deleted)
+ *
+ * @since 2.8
+ * @param int $user_id
+ * @return null
+ */
+function delete_user_sessions($user_id)
+{
+  $query = '
+DELETE
+  FROM '.SESSIONS_TABLE.'
+  WHERE data LIKE \'%pwg_uid|i:'.(int)$user_id.';%\'
+;';
+  pwg_query($query);
+}
+?>
diff --git a/sources/include/functions_tag.inc.php b/sources/include/functions_tag.inc.php
index 9047449..752a2be 100644
--- a/sources/include/functions_tag.inc.php
+++ b/sources/include/functions_tag.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/functions_url.inc.php b/sources/include/functions_url.inc.php
index 5a471bc..ea329b4 100644
--- a/sources/include/functions_url.inc.php
+++ b/sources/include/functions_url.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -62,14 +62,21 @@ function get_absolute_root_url($with_scheme=true)
     {
       $url .= 'http://';
     }
-    $url .= $_SERVER['HTTP_HOST'];
-    if ( (!$is_https && $_SERVER['SERVER_PORT'] != 80)
-          ||($is_https && $_SERVER['SERVER_PORT'] != 443))
+    if (isset($_SERVER['HTTP_X_FORWARDED_HOST']))
     {
-      $url_port = ':'.$_SERVER['SERVER_PORT'];
-      if (strrchr($url, ':') != $url_port)
+      $url .= $_SERVER['HTTP_X_FORWARDED_HOST'];
+    }
+    else
+    {
+      $url .= $_SERVER['HTTP_HOST'];
+      if ( (!$is_https && $_SERVER['SERVER_PORT'] != 80)
+            ||($is_https && $_SERVER['SERVER_PORT'] != 443))
       {
-        $url .= $url_port;
+        $url_port = ':'.$_SERVER['SERVER_PORT'];
+        if (strrchr($url, ':') != $url_port)
+        {
+          $url .= $url_port;
+        }
       }
     }
   }
@@ -372,7 +379,7 @@ function make_section_in_url($params)
             $section_string.= '/'.$tag['id'];
             break;
           case 'tag':
-            if (isset($tag['url_name']) and !is_numeric($tag['url_name']) )
+            if (isset($tag['url_name']))
             {
               $section_string.= '/'.$tag['url_name'];
               break;
@@ -817,4 +824,4 @@ function url_is_remote($url)
   return false;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/sources/include/functions_user.inc.php b/sources/include/functions_user.inc.php
index 91bac83..de8f87c 100644
--- a/sources/include/functions_user.inc.php
+++ b/sources/include/functions_user.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -219,14 +219,12 @@ SELECT id
       mass_inserts(USER_GROUP_TABLE, array('user_id', 'group_id'), $inserts);
     }
 
-    $override = null;
-    if ($notify_admin and $conf['browser_language'])
+    $override = array();
+    if ($language = get_browser_language())
     {
-      if (!get_browser_language($override['language']))
-      {
-        $override=null;
-      }
+      $override['language'] = $language;
     }
+    
     create_user_infos($user_id, $override);
 
     if ($notify_admin and $conf['email_admin_on_new_user'])
@@ -809,18 +807,16 @@ function get_default_language()
  * Tries to find the browser language among available languages.
  * @todo : try to match 'fr_CA' before 'fr'
  *
- * @param string &$lang
- * @return bool
+ * @return string
  */
-function get_browser_language(&$lang)
+function get_browser_language()
 {
   $browser_language = substr(@$_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
   foreach (get_languages() as $language_code => $language_name)
   {
     if (substr($language_code, 0, 2) == $browser_language)
     {
-      $lang = $language_code;
-      return true;
+      return $language_code;
     }
   }
   return false;
@@ -952,7 +948,10 @@ function log_user($user_id, $remember_me)
   if ( session_id()!="" )
   { // we regenerate the session for security reasons
     // see http://www.acros.si/papers/session_fixation.pdf
-    session_regenerate_id(true);
+    if (version_compare(PHP_VERSION, '7') <= 0)
+    {
+      session_regenerate_id(true);
+    }
   }
   else
   {
@@ -1120,7 +1119,7 @@ SELECT '.$conf['user_fields']['id'].' AS id,
   WHERE '.$conf['user_fields']['username'].' = \''.pwg_db_real_escape_string($username).'\'
 ;';
   $row = pwg_db_fetch_assoc(pwg_query($query));
-  if ($conf['password_verify']($password, $row['password'], $row['id']))
+  if (isset($row['id']) and $conf['password_verify']($password, $row['password'], $row['id']))
   {
     log_user($row['id'], $remember_me);
     trigger_notify('login_success', stripslashes($username));
@@ -1466,4 +1465,153 @@ function get_recent_photos_sql($db_field)
     .pwg_db_get_recent_period_expression($user['recent_period'])
     .','.pwg_db_get_recent_period_expression(1,$user['last_photo_date']).')';
 }
-?>
\ No newline at end of file
+
+/**
+ * Performs auto-connection if authentication key is valid.
+ *
+ * @since 2.8
+ *
+ * @return bool
+ */
+function auth_key_login($auth_key)
+{
+  global $conf, $user, $page;
+
+  if (!preg_match('/^[a-z0-9]{30}$/i', $auth_key))
+  {
+    return false;
+  }
+
+  $query = '
+SELECT
+    *,
+    '.$conf['user_fields']['username'].' AS username,
+    NOW() AS dbnow
+  FROM '.USER_AUTH_KEYS_TABLE.' AS uak
+    JOIN '.USER_INFOS_TABLE.' AS ui ON uak.user_id = ui.user_id
+    JOIN '.USERS_TABLE.' AS u ON u.'.$conf['user_fields']['id'].' = ui.user_id
+  WHERE auth_key = \''.$auth_key.'\'
+;';
+  $keys = query2array($query);
+
+  if (count($keys) == 0)
+  {
+    return false;
+  }
+  
+  $key = $keys[0];
+
+  // is the key still valid?
+  if (strtotime($key['expired_on']) < strtotime($key['dbnow']))
+  {
+    $page['auth_key_invalid'] = true;
+    return false;
+  }
+
+  // admin/webmaster/guest can't get connected with authentication keys
+  if (!in_array($key['status'], array('normal','generic')))
+  {
+    return false;
+  }
+
+  $user['id'] = $key['user_id'];
+  log_user($user['id'], false);
+  trigger_notify('login_success', $key['username']);
+
+  // to be registered in history table by pwg_log function
+  $page['auth_key_id'] = $key['auth_key_id'];
+
+  return true;
+}
+
+/**
+ * Creates an authentication key.
+ *
+ * @since 2.8
+ * @param int $user_id
+ * @return array
+ */
+function create_user_auth_key($user_id, $user_status=null)
+{
+  global $conf;
+
+  if (0 == $conf['auth_key_duration'])
+  {
+    return false;
+  }
+
+  if (!isset($user_status))
+  {
+    // we have to find the user status
+    $query = '
+SELECT
+    status
+  FROM '.USER_INFOS_TABLE.'
+  WHERE user_id = '.$user_id.'
+;';
+    $user_infos = query2array($query);
+
+    if (count($user_infos) == 0)
+    {
+      return false;
+    }
+
+    $user_status = $user_infos[0]['status'];
+  }
+
+  if (!in_array($user_status, array('normal','generic')))
+  {
+    return false;
+  }
+  
+  $candidate = generate_key(30);
+  
+  $query = '
+SELECT
+    COUNT(*),
+    NOW(),
+    ADDDATE(NOW(), INTERVAL '.$conf['auth_key_duration'].' SECOND)
+  FROM '.USER_AUTH_KEYS_TABLE.'
+  WHERE auth_key = \''.$candidate.'\'
+;';
+  list($counter, $now, $expiration) = pwg_db_fetch_row(pwg_query($query));
+  if (0 == $counter)
+  {
+    $key = array(
+      'auth_key' => $candidate,
+      'user_id' => $user_id,
+      'created_on' => $now,
+      'duration' => $conf['auth_key_duration'],
+      'expired_on' => $expiration,
+      );
+    
+    single_insert(USER_AUTH_KEYS_TABLE, $key);
+
+    $key['auth_key_id'] = pwg_db_insert_id();
+    
+    return $key;
+  }
+  else
+  {
+    return create_user_auth_key($user_id, $user_status);
+  }
+}
+
+/**
+ * Deactivates authentication keys
+ *
+ * @since 2.8
+ * @param int $user_id
+ * @return null
+ */
+function deactivate_user_auth_keys($user_id)
+{
+  $query = '
+UPDATE '.USER_AUTH_KEYS_TABLE.'
+  SET expired_on = NOW()
+  WHERE user_id = '.$user_id.'
+    AND expired_on > NOW()
+;';
+  pwg_query($query);
+}
+?>
diff --git a/sources/include/index.php b/sources/include/index.php
index c8de97f..0b96c3e 100644
--- a/sources/include/index.php
+++ b/sources/include/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/inflectors/en.php b/sources/include/inflectors/en.php
index 6357144..ae8e937 100644
--- a/sources/include/inflectors/en.php
+++ b/sources/include/inflectors/en.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/inflectors/fr.php b/sources/include/inflectors/fr.php
index f634d2a..28edbce 100644
--- a/sources/include/inflectors/fr.php
+++ b/sources/include/inflectors/fr.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/menubar.inc.php b/sources/include/menubar.inc.php
index 3d39cd8..9fe2cea 100644
--- a/sources/include/menubar.inc.php
+++ b/sources/include/menubar.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/no_photo_yet.inc.php b/sources/include/no_photo_yet.inc.php
index 61daf35..15d12dc 100644
--- a/sources/include/no_photo_yet.inc.php
+++ b/sources/include/no_photo_yet.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/page_header.php b/sources/include/page_header.php
index 6710f20..8a62fc4 100644
--- a/sources/include/page_header.php
+++ b/sources/include/page_header.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/page_tail.php b/sources/include/page_tail.php
index f47dc2d..82420ff 100644
--- a/sources/include/page_tail.php
+++ b/sources/include/page_tail.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/passwordhash.class.php b/sources/include/passwordhash.class.php
index 84447b2..8b8b113 100644
--- a/sources/include/passwordhash.class.php
+++ b/sources/include/passwordhash.class.php
@@ -1,18 +1,18 @@
 <?php
-#
-# Portable PHP password hashing framework.
-#
-# Version 0.3 / genuine.
+/**
+ * Portable PHP password hashing framework.
+ * @package phpass
+ * @since 2.5.0
+ * @version 0.3 / WordPress
+ * @link http://www.openwall.com/phpass/
+ */
+
 #
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
 # the public domain.  Revised in subsequent years, still public domain.
 #
 # There's absolutely no warranty.
 #
-# The homepage URL for this framework is:
-#
-#	http://www.openwall.com/phpass/
-#
 # Please be sure to update the Version line if you edit this file in any way.
 # It is suggested that you leave the main version number intact, but indicate
 # your project name (after the slash) and add your own revision information.
@@ -24,13 +24,25 @@
 # Obviously, since this code is in the public domain, the above are not
 # requirements (there can be none), but merely suggestions.
 #
+
+/**
+ * Portable PHP password hashing framework.
+ *
+ * @package phpass
+ * @version 0.3 / WordPress
+ * @link http://www.openwall.com/phpass/
+ * @since 2.5.0
+ */
 class PasswordHash {
 	var $itoa64;
 	var $iteration_count_log2;
 	var $portable_hashes;
 	var $random_state;
 
-	function PasswordHash($iteration_count_log2, $portable_hashes)
+	/**
+	 * PHP5 constructor.
+	 */
+	function __construct( $iteration_count_log2, $portable_hashes )
 	{
 		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
@@ -40,15 +52,20 @@ class PasswordHash {
 
 		$this->portable_hashes = $portable_hashes;
 
-		$this->random_state = microtime();
-		if (function_exists('getmypid'))
-			$this->random_state .= getmypid();
+		$this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compatibility reasons
+	}
+
+	/**
+	 * PHP4 constructor.
+	 */
+	public function PasswordHash( $iteration_count_log2, $portable_hashes ) {
+		self::__construct( $iteration_count_log2, $portable_hashes );
 	}
 
 	function get_random_bytes($count)
 	{
 		$output = '';
-		if (@is_readable('/dev/urandom') &&
+		if ( @is_readable('/dev/urandom') &&
 		    ($fh = @fopen('/dev/urandom', 'rb'))) {
 			$output = fread($fh, $count);
 			fclose($fh);
@@ -207,6 +224,10 @@ class PasswordHash {
 
 	function HashPassword($password)
 	{
+		if ( strlen( $password ) > 4096 ) {
+			return '*';
+		}
+
 		$random = '';
 
 		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
@@ -242,12 +263,14 @@ class PasswordHash {
 
 	function CheckPassword($password, $stored_hash)
 	{
+		if ( strlen( $password ) > 4096 ) {
+			return false;
+		}
+
 		$hash = $this->crypt_private($password, $stored_hash);
 		if ($hash[0] == '*')
 			$hash = crypt($password, $stored_hash);
 
-		return $hash == $stored_hash;
+		return $hash === $stored_hash;
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/sources/include/php_compat/index.php b/sources/include/php_compat/index.php
index c8de97f..0b96c3e 100644
--- a/sources/include/php_compat/index.php
+++ b/sources/include/php_compat/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/picture_comment.inc.php b/sources/include/picture_comment.inc.php
index fd9a7b7..20a72e5 100644
--- a/sources/include/picture_comment.inc.php
+++ b/sources/include/picture_comment.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/picture_metadata.inc.php b/sources/include/picture_metadata.inc.php
index 0df50df..f43fa5a 100644
--- a/sources/include/picture_metadata.inc.php
+++ b/sources/include/picture_metadata.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/picture_rate.inc.php b/sources/include/picture_rate.inc.php
index c3119bd..9c024ec 100644
--- a/sources/include/picture_rate.inc.php
+++ b/sources/include/picture_rate.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/random_compat/byte_safe_strings.php b/sources/include/random_compat/byte_safe_strings.php
new file mode 100644
index 0000000..dec5d30
--- /dev/null
+++ b/sources/include/random_compat/byte_safe_strings.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!function_exists('RandomCompat_strlen')) {
+    if (
+        defined('MB_OVERLOAD_STRING') &&
+        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+    ) {
+        /**
+         * strlen() implementation that isn't brittle to mbstring.func_overload
+         *
+         * This version uses mb_strlen() in '8bit' mode to treat strings as raw
+         * binary rather than UTF-8, ISO-8859-1, etc
+         *
+         * @param string $binary_string
+         *
+         * @throws TypeError
+         *
+         * @return int
+         */
+        function RandomCompat_strlen($binary_string)
+        {
+            if (!is_string($binary_string)) {
+                throw new TypeError(
+                    'RandomCompat_strlen() expects a string'
+                );
+            }
+
+            return mb_strlen($binary_string, '8bit');
+        }
+
+    } else {
+        /**
+         * strlen() implementation that isn't brittle to mbstring.func_overload
+         *
+         * This version just used the default strlen()
+         *
+         * @param string $binary_string
+         *
+         * @throws TypeError
+         *
+         * @return int
+         */
+        function RandomCompat_strlen($binary_string)
+        {
+            if (!is_string($binary_string)) {
+                throw new TypeError(
+                    'RandomCompat_strlen() expects a string'
+                );
+            }
+            return strlen($binary_string);
+        }
+    }
+}
+
+if (!function_exists('RandomCompat_substr')) {
+
+    if (
+        defined('MB_OVERLOAD_STRING')
+        &&
+        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+    ) {
+        /**
+         * substr() implementation that isn't brittle to mbstring.func_overload
+         *
+         * This version uses mb_substr() in '8bit' mode to treat strings as raw
+         * binary rather than UTF-8, ISO-8859-1, etc
+         *
+         * @param string $binary_string
+         * @param int $start
+         * @param int $length (optional)
+         *
+         * @throws TypeError
+         *
+         * @return string
+         */
+        function RandomCompat_substr($binary_string, $start, $length = null)
+        {
+            if (!is_string($binary_string)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): First argument should be a string'
+                );
+            }
+
+            if (!is_int($start)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): Second argument should be an integer'
+                );
+            }
+
+            if ($length === null) {
+                /**
+                 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
+                 * PHP 5.3, so we have to find the length ourselves.
+                 */
+                $length = RandomCompat_strlen($length) - $start;
+            } elseif (!is_int($length)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): Third argument should be an integer, or omitted'
+                );
+            }
+
+            // Consistency with PHP's behavior
+            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
+                return '';
+            }
+            if ($start > RandomCompat_strlen($binary_string)) {
+                return false;
+            }
+
+            return mb_substr($binary_string, $start, $length, '8bit');
+        }
+
+    } else {
+
+        /**
+         * substr() implementation that isn't brittle to mbstring.func_overload
+         *
+         * This version just uses the default substr()
+         *
+         * @param string $binary_string
+         * @param int $start
+         * @param int $length (optional)
+         *
+         * @throws TypeError
+         *
+         * @return string
+         */
+        function RandomCompat_substr($binary_string, $start, $length = null)
+        {
+            if (!is_string($binary_string)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): First argument should be a string'
+                );
+            }
+
+            if (!is_int($start)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): Second argument should be an integer'
+                );
+            }
+
+            if ($length !== null) {
+                if (!is_int($length)) {
+                    throw new TypeError(
+                        'RandomCompat_substr(): Third argument should be an integer, or omitted'
+                    );
+                }
+
+                return substr($binary_string, $start, $length);
+            }
+
+            return substr($binary_string, $start);
+        }
+    }
+}
diff --git a/sources/include/random_compat/cast_to_int.php b/sources/include/random_compat/cast_to_int.php
new file mode 100644
index 0000000..f441c5d
--- /dev/null
+++ b/sources/include/random_compat/cast_to_int.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!function_exists('RandomCompat_intval')) {
+    
+    /**
+     * Cast to an integer if we can, safely.
+     * 
+     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
+     * lose precision, so the <= and => operators might accidentally let a float
+     * through.
+     * 
+     * @param int|float $number    The number we want to convert to an int
+     * @param boolean   $fail_open Set to true to not throw an exception
+     * 
+     * @return int (or float if $fail_open)
+     *
+     * @throws TypeError
+     */
+    function RandomCompat_intval($number, $fail_open = false)
+    {
+        if (is_numeric($number)) {
+            $number += 0;
+        }
+
+        if (
+            is_float($number)
+            &&
+            $number > ~PHP_INT_MAX
+            &&
+            $number < PHP_INT_MAX
+        ) {
+            $number = (int) $number;
+        }
+
+        if (is_int($number) || $fail_open) {
+            return $number;
+        }
+
+        throw new TypeError(
+            'Expected an integer.'
+        );
+    }
+}
diff --git a/sources/include/random_compat/error_polyfill.php b/sources/include/random_compat/error_polyfill.php
new file mode 100644
index 0000000..57cfefd
--- /dev/null
+++ b/sources/include/random_compat/error_polyfill.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!class_exists('Error', false)) {
+    // We can't really avoid making this extend Exception in PHP 5.
+    class Error extends Exception
+    {
+        
+    }
+}
+
+if (!class_exists('TypeError', false)) {
+    class TypeError extends Error
+    {
+        
+    }
+}
diff --git a/sources/include/random_compat/random.php b/sources/include/random_compat/random.php
new file mode 100644
index 0000000..a880259
--- /dev/null
+++ b/sources/include/random_compat/random.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * @version 2.0.2
+ * @released 2016-04-03
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!defined('PHP_VERSION_ID')) {
+    // This constant was introduced in PHP 5.2.7
+    $RandomCompatversion = explode('.', PHP_VERSION);
+    define(
+        'PHP_VERSION_ID',
+        $RandomCompatversion[0] * 10000
+        + $RandomCompatversion[1] * 100
+        + $RandomCompatversion[2]
+    );
+    $RandomCompatversion = null;
+}
+
+if (PHP_VERSION_ID < 70000) {
+
+    if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+        define('RANDOM_COMPAT_READ_BUFFER', 8);
+    }
+
+    $RandomCompatDIR = dirname(__FILE__);
+
+    require_once $RandomCompatDIR.'/byte_safe_strings.php';
+    require_once $RandomCompatDIR.'/cast_to_int.php';
+    require_once $RandomCompatDIR.'/error_polyfill.php';
+
+    if (!function_exists('random_bytes')) {
+        /**
+         * PHP 5.2.0 - 5.6.x way to implement random_bytes()
+         *
+         * We use conditional statements here to define the function in accordance
+         * to the operating environment. It's a micro-optimization.
+         *
+         * In order of preference:
+         *   1. Use libsodium if available.
+         *   2. fread() /dev/urandom if available (never on Windows)
+         *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
+         *   4. COM('CAPICOM.Utilities.1')->GetRandom()
+         *   5. openssl_random_pseudo_bytes() (absolute last resort)
+         *
+         * See ERRATA.md for our reasoning behind this particular order
+         */
+        if (extension_loaded('libsodium')) {
+            // See random_bytes_libsodium.php
+            if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) {
+                require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
+            } elseif (method_exists('Sodium', 'randombytes_buf')) {
+                require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php';
+            }
+        }
+
+        /**
+         * Reading directly from /dev/urandom:
+         */
+        if (DIRECTORY_SEPARATOR === '/') {
+            // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
+            // way to exclude Windows.
+            $RandomCompatUrandom = true;
+            $RandomCompat_basedir = ini_get('open_basedir');
+
+            if (!empty($RandomCompat_basedir)) {
+                $RandomCompat_open_basedir = explode(
+                    PATH_SEPARATOR,
+                    strtolower($RandomCompat_basedir)
+                );
+                $RandomCompatUrandom = (array() !== array_intersect(
+                    array('/dev', '/dev/', '/dev/urandom'),
+                    $RandomCompat_open_basedir
+                ));
+                $RandomCompat_open_basedir = null;
+            }
+
+            if (
+                !function_exists('random_bytes')
+                &&
+                $RandomCompatUrandom
+                &&
+                @is_readable('/dev/urandom')
+            ) {
+                // Error suppression on is_readable() in case of an open_basedir
+                // or safe_mode failure. All we care about is whether or not we
+                // can read it at this point. If the PHP environment is going to
+                // panic over trying to see if the file can be read in the first
+                // place, that is not helpful to us here.
+
+                // See random_bytes_dev_urandom.php
+                require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
+            }
+            // Unset variables after use
+            $RandomCompat_basedir = null;
+        } else {
+            $RandomCompatUrandom = false;
+        }
+
+        /**
+         * mcrypt_create_iv()
+         */
+        if (
+            !function_exists('random_bytes')
+            &&
+            PHP_VERSION_ID >= 50307
+            &&
+            extension_loaded('mcrypt')
+            &&
+            (DIRECTORY_SEPARATOR !== '/' || $RandomCompatUrandom)
+        ) {
+            // Prevent this code from hanging indefinitely on non-Windows;
+            // see https://bugs.php.net/bug.php?id=69833
+            if (
+                DIRECTORY_SEPARATOR !== '/' || 
+                (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
+            ) {
+                // See random_bytes_mcrypt.php
+                require_once $RandomCompatDIR.'/random_bytes_mcrypt.php';
+            }
+        }
+        $RandomCompatUrandom = null;
+
+        if (
+            !function_exists('random_bytes')
+            &&
+            extension_loaded('com_dotnet')
+            &&
+            class_exists('COM')
+        ) {
+            $RandomCompat_disabled_classes = preg_split(
+                '#\s*,\s*#',
+                strtolower(ini_get('disable_classes'))
+            );
+
+            if (!in_array('com', $RandomCompat_disabled_classes)) {
+                try {
+                    $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
+                    if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+                        // See random_bytes_com_dotnet.php
+                        require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
+                    }
+                } catch (com_exception $e) {
+                    // Don't try to use it.
+                }
+            }
+            $RandomCompat_disabled_classes = null;
+            $RandomCompatCOMtest = null;
+        }
+
+        /**
+         * throw new Exception
+         */
+        if (!function_exists('random_bytes')) {
+            /**
+             * We don't have any more options, so let's throw an exception right now
+             * and hope the developer won't let it fail silently.
+             */
+            function random_bytes($length)
+            {
+                throw new Exception(
+                    'There is no suitable CSPRNG installed on your system'
+                );
+            }
+        }
+    }
+
+    if (!function_exists('random_int')) {
+        require_once $RandomCompatDIR.'/random_int.php';
+    }
+
+    $RandomCompatDIR = null;
+}
diff --git a/sources/include/random_compat/random_bytes_com_dotnet.php b/sources/include/random_compat/random_bytes_com_dotnet.php
new file mode 100644
index 0000000..3422825
--- /dev/null
+++ b/sources/include/random_compat/random_bytes_com_dotnet.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Windows with PHP < 5.3.0 will not have the function
+ * openssl_random_pseudo_bytes() available, so let's use
+ * CAPICOM to work around this deficiency.
+ * 
+ * @param int $bytes
+ * 
+ * @throws Exception
+ * 
+ * @return string
+ */
+function random_bytes($bytes)
+{
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
+        throw new TypeError(
+            'random_bytes(): $bytes must be an integer'
+        );
+    }
+
+    if ($bytes < 1) {
+        throw new Error(
+            'Length must be greater than 0'
+        );
+    }
+
+    $buf = '';
+    $util = new COM('CAPICOM.Utilities.1');
+    $execCount = 0;
+
+    /**
+     * Let's not let it loop forever. If we run N times and fail to
+     * get N bytes of random data, then CAPICOM has failed us.
+     */
+    do {
+        $buf .= base64_decode($util->GetRandom($bytes, 0));
+        if (RandomCompat_strlen($buf) >= $bytes) {
+            /**
+             * Return our random entropy buffer here:
+             */
+            return RandomCompat_substr($buf, 0, $bytes);
+        }
+        ++$execCount; 
+    } while ($execCount < $bytes);
+
+    /**
+     * If we reach here, PHP has failed us.
+     */
+    throw new Exception(
+        'Could not gather sufficient random data'
+    );
+}
diff --git a/sources/include/random_compat/random_bytes_dev_urandom.php b/sources/include/random_compat/random_bytes_dev_urandom.php
new file mode 100644
index 0000000..db93b07
--- /dev/null
+++ b/sources/include/random_compat/random_bytes_dev_urandom.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+    define('RANDOM_COMPAT_READ_BUFFER', 8);
+}
+
+/**
+ * Unless open_basedir is enabled, use /dev/urandom for
+ * random numbers in accordance with best practices
+ * 
+ * Why we use /dev/urandom and not /dev/random
+ * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
+ * 
+ * @param int $bytes
+ * 
+ * @throws Exception
+ * 
+ * @return string
+ */
+function random_bytes($bytes)
+{
+    static $fp = null;
+    /**
+     * This block should only be run once
+     */
+    if (empty($fp)) {
+        /**
+         * We use /dev/urandom if it is a char device.
+         * We never fall back to /dev/random
+         */
+        $fp = fopen('/dev/urandom', 'rb');
+        if (!empty($fp)) {
+            $st = fstat($fp);
+            if (($st['mode'] & 0170000) !== 020000) {
+                fclose($fp);
+                $fp = false;
+            }
+        }
+
+        if (!empty($fp)) {
+            /**
+             * stream_set_read_buffer() does not exist in HHVM
+             * 
+             * If we don't set the stream's read buffer to 0, PHP will
+             * internally buffer 8192 bytes, which can waste entropy
+             * 
+             * stream_set_read_buffer returns 0 on success
+             */
+            if (function_exists('stream_set_read_buffer')) {
+                stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+            }
+            if (function_exists('stream_set_chunk_size')) {
+                stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+            }
+        }
+    }
+
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
+        throw new TypeError(
+            'random_bytes(): $bytes must be an integer'
+        );
+    }
+
+    if ($bytes < 1) {
+        throw new Error(
+            'Length must be greater than 0'
+        );
+    }
+
+    /**
+     * This if() block only runs if we managed to open a file handle
+     * 
+     * It does not belong in an else {} block, because the above 
+     * if (empty($fp)) line is logic that should only be run once per
+     * page load.
+     */
+    if (!empty($fp)) {
+        $remaining = $bytes;
+        $buf = '';
+
+        /**
+         * We use fread() in a loop to protect against partial reads
+         */
+        do {
+            $read = fread($fp, $remaining); 
+            if ($read === false) {
+                /**
+                 * We cannot safely read from the file. Exit the
+                 * do-while loop and trigger the exception condition
+                 */
+                $buf = false;
+                break;
+            }
+            /**
+             * Decrease the number of bytes returned from remaining
+             */
+            $remaining -= RandomCompat_strlen($read);
+            $buf .= $read;
+        } while ($remaining > 0);
+        
+        /**
+         * Is our result valid?
+         */
+        if ($buf !== false) {
+            if (RandomCompat_strlen($buf) === $bytes) {
+                /**
+                 * Return our random entropy buffer here:
+                 */
+                return $buf;
+            }
+        }
+    }
+
+    /**
+     * If we reach here, PHP has failed us.
+     */
+    throw new Exception(
+        'Error reading from source device'
+    );
+}
diff --git a/sources/include/random_compat/random_bytes_libsodium.php b/sources/include/random_compat/random_bytes_libsodium.php
new file mode 100644
index 0000000..f802d4e
--- /dev/null
+++ b/sources/include/random_compat/random_bytes_libsodium.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * If the libsodium PHP extension is loaded, we'll use it above any other
+ * solution.
+ *
+ * libsodium-php project:
+ * @ref https://github.com/jedisct1/libsodium-php
+ *
+ * @param int $bytes
+ *
+ * @throws Exception
+ *
+ * @return string
+ */
+function random_bytes($bytes)
+{
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
+        throw new TypeError(
+            'random_bytes(): $bytes must be an integer'
+        );
+    }
+
+    if ($bytes < 1) {
+        throw new Error(
+            'Length must be greater than 0'
+        );
+    }
+
+    /**
+     * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+     * generated in one invocation.
+     */
+    if ($bytes > 2147483647) {
+        $buf = '';
+        for ($i = 0; $i < $bytes; $i += 1073741824) {
+            $n = ($bytes - $i) > 1073741824
+                ? 1073741824
+                : $bytes - $i;
+            $buf .= \Sodium\randombytes_buf($n);
+        }
+    } else {
+        $buf = \Sodium\randombytes_buf($bytes);
+    }
+
+    if ($buf !== false) {
+        if (RandomCompat_strlen($buf) === $bytes) {
+            return $buf;
+        }
+    }
+
+    /**
+     * If we reach here, PHP has failed us.
+     */
+    throw new Exception(
+        'Could not gather sufficient random data'
+    );
+}
diff --git a/sources/include/random_compat/random_bytes_libsodium_legacy.php b/sources/include/random_compat/random_bytes_libsodium_legacy.php
new file mode 100644
index 0000000..44fddbf
--- /dev/null
+++ b/sources/include/random_compat/random_bytes_libsodium_legacy.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * If the libsodium PHP extension is loaded, we'll use it above any other
+ * solution.
+ *
+ * libsodium-php project:
+ * @ref https://github.com/jedisct1/libsodium-php
+ *
+ * @param int $bytes
+ *
+ * @throws Exception
+ *
+ * @return string
+ */
+function random_bytes($bytes)
+{
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
+        throw new TypeError(
+            'random_bytes(): $bytes must be an integer'
+        );
+    }
+
+    if ($bytes < 1) {
+        throw new Error(
+            'Length must be greater than 0'
+        );
+    }
+
+    /**
+     * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+     * generated in one invocation.
+     */
+    if ($bytes > 2147483647) {
+        $buf = '';
+        for ($i = 0; $i < $bytes; $i += 1073741824) {
+            $n = ($bytes - $i) > 1073741824
+                ? 1073741824
+                : $bytes - $i;
+            $buf .= Sodium::randombytes_buf($n);
+        }
+    } else {
+        $buf = Sodium::randombytes_buf($bytes);
+    }
+
+    if ($buf !== false) {
+        if (RandomCompat_strlen($buf) === $bytes) {
+            return $buf;
+        }
+    }
+
+    /**
+     * If we reach here, PHP has failed us.
+     */
+    throw new Exception(
+        'Could not gather sufficient random data'
+    );
+}
diff --git a/sources/include/random_compat/random_bytes_mcrypt.php b/sources/include/random_compat/random_bytes_mcrypt.php
new file mode 100644
index 0000000..7ac9d91
--- /dev/null
+++ b/sources/include/random_compat/random_bytes_mcrypt.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+/**
+ * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
+ * 
+ * @ref https://bugs.php.net/bug.php?id=55169
+ * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
+ * 
+ * @param int $bytes
+ * 
+ * @throws Exception
+ * 
+ * @return string
+ */
+function random_bytes($bytes)
+{
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
+        throw new TypeError(
+            'random_bytes(): $bytes must be an integer'
+        );
+    }
+
+    if ($bytes < 1) {
+        throw new Error(
+            'Length must be greater than 0'
+        );
+    }
+
+    $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
+    if (
+        $buf !== false
+        &&
+        RandomCompat_strlen($buf) === $bytes
+    ) {
+        /**
+         * Return our random entropy buffer here:
+         */
+        return $buf;
+    }
+
+    /**
+     * If we reach here, PHP has failed us.
+     */
+    throw new Exception(
+        'Could not gather sufficient random data'
+    );
+}
diff --git a/sources/include/random_compat/random_int.php b/sources/include/random_compat/random_int.php
new file mode 100644
index 0000000..fd3ef87
--- /dev/null
+++ b/sources/include/random_compat/random_int.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Fetch a random integer between $min and $max inclusive
+ * 
+ * @param int $min
+ * @param int $max
+ * 
+ * @throws Exception
+ * 
+ * @return int
+ */
+function random_int($min, $max)
+{
+    /**
+     * Type and input logic checks
+     * 
+     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
+     * lose precision, so the <= and => operators might accidentally let a float
+     * through.
+     */
+    
+    try {
+        $min = RandomCompat_intval($min);
+    } catch (TypeError $ex) {
+        throw new TypeError(
+            'random_int(): $min must be an integer'
+        );
+    }
+
+    try {
+        $max = RandomCompat_intval($max);
+    } catch (TypeError $ex) {
+        throw new TypeError(
+            'random_int(): $max must be an integer'
+        );
+    }
+    
+    /**
+     * Now that we've verified our weak typing system has given us an integer,
+     * let's validate the logic then we can move forward with generating random
+     * integers along a given range.
+     */
+    if ($min > $max) {
+        throw new Error(
+            'Minimum value must be less than or equal to the maximum value'
+        );
+    }
+
+    if ($max === $min) {
+        return $min;
+    }
+
+    /**
+     * Initialize variables to 0
+     * 
+     * We want to store:
+     * $bytes => the number of random bytes we need
+     * $mask => an integer bitmask (for use with the &) operator
+     *          so we can minimize the number of discards
+     */
+    $attempts = $bits = $bytes = $mask = $valueShift = 0;
+
+    /**
+     * At this point, $range is a positive number greater than 0. It might
+     * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
+     * a float and we will lose some precision.
+     */
+    $range = $max - $min;
+
+    /**
+     * Test for integer overflow:
+     */
+    if (!is_int($range)) {
+
+        /**
+         * Still safely calculate wider ranges.
+         * Provided by @CodesInChaos, @oittaa
+         * 
+         * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
+         * 
+         * We use ~0 as a mask in this case because it generates all 1s
+         * 
+         * @ref https://eval.in/400356 (32-bit)
+         * @ref http://3v4l.org/XX9r5  (64-bit)
+         */
+        $bytes = PHP_INT_SIZE;
+        $mask = ~0;
+
+    } else {
+
+        /**
+         * $bits is effectively ceil(log($range, 2)) without dealing with 
+         * type juggling
+         */
+        while ($range > 0) {
+            if ($bits % 8 === 0) {
+               ++$bytes;
+            }
+            ++$bits;
+            $range >>= 1;
+            $mask = $mask << 1 | 1;
+        }
+        $valueShift = $min;
+    }
+
+    /**
+     * Now that we have our parameters set up, let's begin generating
+     * random integers until one falls between $min and $max
+     */
+    do {
+        /**
+         * The rejection probability is at most 0.5, so this corresponds
+         * to a failure probability of 2^-128 for a working RNG
+         */
+        if ($attempts > 128) {
+            throw new Exception(
+                'random_int: RNG is broken - too many rejections'
+            );
+        }
+
+        /**
+         * Let's grab the necessary number of random bytes
+         */
+        $randomByteString = random_bytes($bytes);
+        if ($randomByteString === false) {
+            throw new Exception(
+                'Random number generator failure'
+            );
+        }
+
+        /**
+         * Let's turn $randomByteString into an integer
+         * 
+         * This uses bitwise operators (<< and |) to build an integer
+         * out of the values extracted from ord()
+         * 
+         * Example: [9F] | [6D] | [32] | [0C] =>
+         *   159 + 27904 + 3276800 + 201326592 =>
+         *   204631455
+         */
+        $val = 0;
+        for ($i = 0; $i < $bytes; ++$i) {
+            $val |= ord($randomByteString[$i]) << ($i * 8);
+        }
+
+        /**
+         * Apply mask
+         */
+        $val &= $mask;
+        $val += $valueShift;
+
+        ++$attempts;
+        /**
+         * If $val overflows to a floating point number,
+         * ... or is larger than $max,
+         * ... or smaller than $min,
+         * then try again.
+         */
+    } while (!is_int($val) || $val > $max || $val < $min);
+
+    return (int) $val;
+}
diff --git a/sources/include/section_init.inc.php b/sources/include/section_init.inc.php
index c2c3ee6..e2e0c07 100644
--- a/sources/include/section_init.inc.php
+++ b/sources/include/section_init.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/smarty/.gitattributes b/sources/include/smarty/.gitattributes
new file mode 100644
index 0000000..412eeda
--- /dev/null
+++ b/sources/include/smarty/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/sources/include/smarty/.gitignore b/sources/include/smarty/.gitignore
new file mode 100644
index 0000000..0ff15aa
--- /dev/null
+++ b/sources/include/smarty/.gitignore
@@ -0,0 +1,221 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+.idea/
+
+# Smarty
+lexer/*.php
+lexer/*.out
diff --git a/sources/include/smarty/.travis.yml b/sources/include/smarty/.travis.yml
new file mode 100644
index 0000000..fbf081b
--- /dev/null
+++ b/sources/include/smarty/.travis.yml
@@ -0,0 +1,25 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+before_script:
+    - travis_retry composer self-update
+    - travis_retry composer --prefer-source --dev install
+
+install:
+   - git clone --depth=50 --branch=master git://github.com/smarty-php/smarty-phpunit.git
+
+script:
+   - cd smarty-phpunit
+   - phpunit ./
+
diff --git a/sources/include/smarty/COMPOSER_RELEASE_NOTES.txt b/sources/include/smarty/COMPOSER_RELEASE_NOTES.txt
new file mode 100644
index 0000000..c943d9f
--- /dev/null
+++ b/sources/include/smarty/COMPOSER_RELEASE_NOTES.txt
@@ -0,0 +1,29 @@
+
+
+Starting with Smarty 3.1.21 Composer has been configured to load the packages from github.
+
+*******************************************************************************
+*                                                                             *
+*  NOTE: Because of this change you must clear your local composer cache with *
+*                 the "composer clearcache" command                           *
+*                                                                             *
+*******************************************************************************
+
+To get the latest stable version use
+    "require": {
+        "smarty/smarty": "~3.1"
+    }
+in your composer.json file.
+
+To get the trunk version use
+    "require": {
+        "smarty/smarty": "~3.1@dev"
+    }
+
+The "smarty/smarty" package will start at libs/....   subfolder.
+
+To retrieve the development and documentation folders add
+    "require-dev": {
+        "smarty/smarty-dev": "~3.1@dev"
+    }
+
diff --git a/sources/include/smarty/INHERITANCE_RELEASE_NOTES.txt b/sources/include/smarty/INHERITANCE_RELEASE_NOTES.txt
new file mode 100644
index 0000000..8b2c64a
--- /dev/null
+++ b/sources/include/smarty/INHERITANCE_RELEASE_NOTES.txt
@@ -0,0 +1,67 @@
+Starting with version 3.1.28 template inheritance is no longer a compile time process.
+All {block} tag parent/child relations are resolved at run time.
+This does resolve all known existing restrictions (see below).
+
+The $smarty::$inheritance_merge_compiled_includes property has been removed.
+Any access to it is ignored.
+
+This does enable some new features:
+
+Any code outside root {block} tags in child templates is now executed but any output will be ignored.
+
+   {extends 'foo.tpl'}
+   {$bar = 'on'}           // assigns variable $bar seen in parent templates
+   {block 'buh'}{/block}
+
+   {extends 'foo.tpl'}
+   {$bar}           // the output of variable bar is ignored
+   {block 'buh'}{/block}
+
+{block} tags can be dynamically en/disabled by conditions.
+
+   {block 'root'}
+      {if $foo}
+         {block 'v1'}
+             ....
+         {/block}
+      {else}
+         {block 'v1'}
+             ....
+         {/block}
+      {/if}
+   {/block}
+
+
+
+THE FOLLOWING RESTRICTIONS ARE NO LONGER EXISTING:
+In Smarty 3.1 template inheritance is a compile time process. All the extending of {block} tags
+is done at compile time and the parent and child templates are compiled in a single compiled template.
+{include} subtemplate could also {block} tags. Such subtemplate could not compiled by it's own because
+it could be used in other context where the {block} extended with a different result. For that reasion
+the compiled code of {include} subtemplates gets also merged in compiled inheritance template.
+
+Merging the code into a single compile template has some drawbacks.
+1. You could not use variable file names in {include} Smarty would use the {include} of compilation time.
+2. You could not use individual compile_id in {include}
+3. Seperate caching of subtemplate was not possible
+4. Any change of the template directory structure between calls was not necessarily seen.
+
+Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out
+that a couple of users did use some of above and now got exceptions.
+
+To resolve this starting with 3.1.16 there is a new configuration parameter $inheritance_merge_compiled_includes.
+For most backward compatibility its default setting is true.
+With this setting all {include} subtemplate will be merge into the compiled inheritance template, but the above cases
+could be rejected by exception.
+
+
+If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged. 
+You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option.
+{include file='foo.bar' inline}
+
+1. In case of a variable file name like {include file=$foo inline} you must use the variable in a compile_id  $smarty->compile_id = $foo;
+2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the 
+   global compile_id as well  $smarty->compile_id = $bar;
+3. If call templates with different template_dir configurations and a parent could same named child template from different folders
+   you must make the folder name part of the compile_id.
+
diff --git a/sources/include/smarty/NEW_FEATURES.txt b/sources/include/smarty/NEW_FEATURES.txt
new file mode 100644
index 0000000..1a51c71
--- /dev/null
+++ b/sources/include/smarty/NEW_FEATURES.txt
@@ -0,0 +1,133 @@
+
+
+This file contains a brief description of new features which have been added to Smarty 3.1
+
+Smarty 3.1.28
+
+    OPCACHE
+    =======
+    Smarty does now invalidate automatically updated and cleared compiled or cached template files in OPCACHE.
+    Correct operation is no longer dependent on OPCACHE configuration settings.
+
+    Template inheritance
+    ====================
+    Template inheritance is now processed in run time.
+    See the INHERITANCE_RELEASE_NOTES
+
+    Modifier regex_replace
+    ======================
+    An optional limit parameter was added
+
+    fetch() and display()
+    =====================
+    The fetch() and display() methods of the template object accept now optionally the same parameter
+    as the corresponding Smarty methods to get the content of another template.
+    Example:
+        $template->display();           Does display template of template object
+        $template->display('foo.tpl');  Does display template 'foo.bar' 
+
+    File: resource
+    ==============
+    Multiple template_dir entries can now be selected  by a comma separated list of indices.
+    The template_dir array is searched in the order of the indices. (Could be used to change the default search order)
+    Example:
+        $smarty->display('[1],[0]foo.bar');
+        
+    Filter support
+    ==============
+    Optional filter names
+      An optional filter name was added to $smarty->registerFilter(). It can be used to unregister a filter by name.
+      - $smarty->registerFilter('output', $callback, 'name');
+        $smarty->unregister('output', 'name');
+
+    Closures
+      $smarty->registerFilter() does now accept closures.
+      - $smarty->registerFilter('pre', function($source) {return $source;});
+      If no optional filter name was specified it gets the default name 'closure'.
+      If you register multiple closures register each with a unique filter name.
+      - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_1');
+      - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_2');
+      
+
+Smarty 3.1.22
+
+    Namespace support within templates
+    ==================================
+    Within templates you can now use namespace specifications on:
+     - Constants                like    foo\bar\FOO
+     - Class names              like    foo\bar\Baz::FOO, foo\bar\Baz::$foo, foo\bar\Baz::foo()
+     - PHP function names       like    foo\bar\baz()
+
+    Security
+    ========
+    - disable special $smarty variable -
+    The Smarty_Security class has the new property $disabled_special_smarty_vars.
+    It's an array which can be loaded with the $smarty special variable names like
+    'template_object', 'template', 'current_dir' and others which will be disabled.
+    Note: That this security check is performed at compile time.
+
+    - limit template nesting -
+    Property $max_template_nesting of Smarty_Security does set the maximum template nesting level.
+    The main template is level 1. The nesting level is checked at run time. When the maximum will be exceeded
+    an Exception will be thrown. The default setting is 0 which does disable this check.
+
+    - trusted static methods -
+   The Smarty_Security class has the new property $trusted_static_methods to restrict access to static methods.
+   It's an nested array of trusted class and method names.
+         Format:
+         array (
+                    'class_1' => array('method_1', 'method_2'), // allowed methods
+                    'class_2' => array(),                       // all methods of class allowed
+               )
+   To disable access for all methods of all classes set $trusted_static_methods = null;
+   The default value is an empty array() which does enables all methods of all classes, but for backward compatibility
+   the setting of $static_classes will be checked.
+   Note: That this security check is performed at compile time.
+
+    - trusted static properties -
+   The Smarty_Security class has the new property $trusted_static_properties to restrict access to static properties.
+   It's an nested array of trusted class and property names.
+         Format:
+         array (
+                    'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+                    'class_2' => array(),                   // all properties of class allowed
+                }
+   To disable access for all properties of all classes set $trusted_static_properties = null;
+   The default value is an empty array() which does enables all properties of all classes, but for backward compatibility
+   the setting of $static_classes will be checked.
+   Note: That this security check is performed at compile time.
+
+    - trusted constants .
+   The Smarty_Security class has the new property $trusted_constants to restrict access to constants.
+   It's an array of trusted constant names.
+         Format:
+         array (
+                    'SMARTY_DIR' , // allowed constant
+                }
+   If the array is empty (default) the usage of constants  can be controlled with the
+   Smarty_Security::$allow_constants property (default true)
+
+
+
+    Compiled Templates
+    ==================
+    Smarty does now automatically detects a change of the $merge_compiled_includes and $escape_html
+    property and creates different compiled templates files depending on the setting.
+
+    Same applies to config files and the $config_overwrite, $config_booleanize and
+    $config_read_hidden properties.
+
+    Debugging
+    =========
+    The layout of the debug window has been changed for better readability
+    
+    New class constants
+        Smarty::DEBUG_OFF
+        Smarty::DEBUG_ON
+        Smarty::DEBUG_INDIVIDUAL
+    have been introduced for setting the $debugging property.
+
+    Smarty::DEBUG_INDIVIDUAL will create for each display() and fetch() call an individual debug window.
+
+    .
+    
diff --git a/sources/include/smarty/README b/sources/include/smarty/README
index bf03403..08b397c 100644
--- a/sources/include/smarty/README
+++ b/sources/include/smarty/README
@@ -1,4 +1,4 @@
-Smarty 3.1.13
+Smarty 3.x
 
 Author: Monte Ohrt <monte at ohrt dot com >
 Author: Uwe Tews
@@ -120,7 +120,7 @@ $smarty->unregisterObject($object_name)
 $smarty->unregisterFilter($type, $function_name)
 $smarty->unregisterResource($resource_type)
 
-$smarty->compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+$smarty->compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
 $smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
 $smarty->testInstall()
 
@@ -460,12 +460,13 @@ included template.
 PLUGINS
 =======
 
-Smarty3 are following the same coding rules as in Smarty2. 
-The only difference is that the template object is passed as additional third parameter.
+Smarty 3 plugins follow the same coding rules as in Smarty 2. 
+The main difference is that the template object is now passed in place of the smarty object. 
+The smarty object can be still be accessed through $template->smarty.
 
-smarty_plugintype_name (array $params, object $smarty, object $template)
+smarty_plugintype_name (array $params, Smarty_Internal_Template $template)
 
-The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty2 internals.
+The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty 2 internals.
 
 
 TEMPLATE INHERITANCE:
diff --git a/sources/include/smarty/README.md b/sources/include/smarty/README.md
new file mode 100644
index 0000000..5783eb3
--- /dev/null
+++ b/sources/include/smarty/README.md
@@ -0,0 +1,65 @@
+#Smarty 3 template engine
+##Distribution repository
+
+> Smarty 3.1.28 introduces run time template inheritance
+
+> Read the NEW_FEATURES and INHERITANCE_RELEASE_NOTES file for recent extensions to Smarty 3.1 functionality
+
+Smarty versions 3.1.11 or later are now on github and can be installed with Composer.
+
+
+The "smarty/smarty" package will start at libs/....   subfolder.
+
+To get the latest stable version of Smarty 3.1 use
+
+```json
+"require": {
+    "smarty/smarty": "~3.1"
+}
+```
+
+in your composer.json file.
+
+To get the trunk version use
+
+```json
+"require": {
+    "smarty/smarty": "~3.1@dev"
+}
+```
+
+For a specific version use something like
+
+```json
+"require": {
+    "smarty/smarty": "3.1.19"
+}
+```
+
+PHPUnit test can be installed by corresponding composer entries like
+
+```json
+"require": {
+    "smarty/smarty-phpunit": "3.1.19"
+}
+```
+
+Similar applies for the lexer/parser generator
+
+```json
+"require": {
+    "smarty/smarty-lexer": "3.1.19"
+}
+```
+
+Or you could use
+
+```json
+"require": {
+    "smarty/smarty-dev": "3.1.19"
+}
+```
+
+Which is a wrapper to install all 3 packages
+
+Composer can also be used for Smarty2 versions 2.6.24 to 2.6.28
diff --git a/sources/include/smarty/SMARTY_3.1_NOTES.txt b/sources/include/smarty/SMARTY_3.1_NOTES.txt
index e56e56f..57709f0 100644
--- a/sources/include/smarty/SMARTY_3.1_NOTES.txt
+++ b/sources/include/smarty/SMARTY_3.1_NOTES.txt
@@ -199,7 +199,7 @@ Relative paths are available with {include file="..."} and
 $smarty->fetch('./foo.tpl') cannot be relative to a template, an
 exception is thrown.
 
-  Adressing a specific $template_dir
+  Addressing a specific $template_dir
 
 Smarty 3.1 introduces the $template_dir index notation.
 $smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"}
diff --git a/sources/include/smarty/change_log.txt b/sources/include/smarty/change_log.txt
index 69642e2..dadc5d1 100644
--- a/sources/include/smarty/change_log.txt
+++ b/sources/include/smarty/change_log.txt
@@ -1,9 +1,720 @@
-===== Smarty-3.1.13  =====
+ ===== 3.1.29 ===== (21.12.2015)
+ 21.12.2015
+  - optimization improve speed of filetime checks on extends and extendsall resource
+  
+ 20.12.2015
+  - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123
+  - update compilation of Smarty special variables
+  - bugfix add addition check for OS type on normalizaition of file path https://github.com/smarty-php/smarty/issues/134
+  - bugfix the source uid of the extendsall resource must contain $template_dir settings https://github.com/smarty-php/smarty/issues/123
+  
+ 19.12.2015
+  - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138
+  - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139
+  - remove no longer used code
+  - improvement make sure that compiled and cache templates never can contain a trailing '?>?
+    
+ 18.12.2015
+  - bugfix regression when modifier parameter was follow by math https://github.com/smarty-php/smarty/issues/132
+  
+ 17.12.2015
+  - bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135
+  - bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827)
+  - bugfix text content consisting of just a single '0' like in {if true}0{/if} was suppressed (forum topic 25834)
+  
+ 16.12.2015
+  - bugfix {foreach} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128
+  - bugfix direct access $smarty->template_dir = 'foo'; should call Smarty::setTemplateDir() https://github.com/smarty-php/smarty/issues/121
+  
+ 15.12.2015
+  - bugfix  {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122
+  - bugfix  a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828)
+
+ 14.12.2015
+  - bugfix  {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120
+  - bugfix  multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118
+ 
+ ===== 3.1.28 ===== (13.12.2015)
+ 13.12.2015
+  - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
+  - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)
+  - bugfix Debug Console could display incorrect data when using subtemplates
+  
+ 09.12.2015
+  - bugfix Smarty did fail under PHP 7.0.0 with use_include_path = true;
+  
+ 09.12.2015
+  - bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111
+ 
+ 08.12.2015
+  - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114
+  
+ 05.12.2015
+  -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111
+  
+ 25.11.2015
+  -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798)
+
+ 02.11.2015
+  - bugfix {include} with variable file name like {include file="foo_`$bar`.tpl"} did fail in 3.1.28-dev https://github.com/smarty-php/smarty/issues/102
+
+ 01.11.2015
+  - update config file processing
+  
+ 31.10.2015
+  - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751)
+
+ 29.10.2015
+  - improve template scope handling
+
+ 24.10.2015
+  - more optimizations of template processing
+  - bugfix Error when using {include} within {capture} https://github.com/smarty-php/smarty/issues/100
+
+ 21.10.2015
+  - move some code into runtime extensions
+
+ 18.10.2015
+  - optimize filepath normalization
+  - rework of template inheritance
+  - speed and size optimizations
+  - bugfix under HHVM temporary cache file must only be created when caches template was updated
+  - fix compiled code for new {block} assign attribute
+  - update code generated by template function call handler
+
+ 18.09.2015
+  - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92
+  
+ 17.09.2015
+  - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90
+
+ 16.09.2015
+  - update compiler by moving no longer needed properties, code optimizations and other
+
+ 14.09.2015
+  - optimize autoloader
+  - optimize subtemplate handling
+  - update template inheritance processing
+  - move code of {call} processing back into Smarty_Internal_Template class
+  - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557)
+  - bugfix unintended multiple debug windows (forum topic 25699)
+  
+ 30.08.2015
+  - size optimization move some runtime functions into extension
+  - optimize inline template processing
+  - optimization merge inheritance child and parent templates into one compiled template file
+
+ 29.08.2015
+  - improvement convert template inheritance into runtime processing
+  - bugfix {$smarty.block.parent} did always reference the root parent block https://github.com/smarty-php/smarty/issues/68
+
+ 23.08.2015
+  - introduce Smarty::$resource_cache_mode and cache template object of {include} inside loop
+  - load seldom used Smarty API methods dynamically to reduce memory footprint
+  - cache template object of {include} if same template is included several times
+  - convert debug console processing to object
+  - use output buffers for better performance and less memory usage
+  - optimize nocache hash processing
+  - remove not really needed properties
+  - optimize rendering
+  - move caching to Smarty::_cache
+  - remove properties with redundant content
+  - optimize Smarty::templateExists()
+  - optimize use_include_path processing
+  - relocate properties for size optimization
+  - remove redundant code
+  - bugfix compiling super globals like {$smarty.get.foo} did fail in the master branch https://github.com/smarty-php/smarty/issues/77
+
+ 06.08.2015
+  - avoid possible circular object references caused by parser/lexer objects
+  - rewrite compileAll... utility methods
+  - commit several  internal improvements
+  - bugfix Smarty failed when compile_id did contain "|"
+
+ 03.08.2015
+  - rework clear cache methods
+  - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing
+  - improve getIncludePath() to return directory if no file was given
+
+ 02.08.2015
+  - optimization and code cleanup of {foreach} and {section} compiler
+  - rework {capture} compiler
+
+ 01.08.2015
+  - update DateTime object can be instance of DateTimeImmutable since PHP5.5 https://github.com/smarty-php/smarty/pull/75
+  - improvement show resource type and start of template source instead of uid on eval: and string: resource (forum topic 25630)
+
+ 31.07.2015
+  - optimize {foreach} and {section} compiler
+
+ 29.07.2015
+  - optimize {section} compiler for speed and size of compiled code
+
+ 28.07.2015
+  - update for PHP 7 compatibility
+
+ 26.07.2015
+  - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797
+
+ 25.07.2015
+  - bugfix parser did hang on text starting <?something https://github.com/smarty-php/smarty/issues/74
+
+ 20.07.2015
+  - bugfix config files got recompiled on each request
+  - improvement invalidate PHP 5.5 opcache for recompiled and cached templates  https://github.com/smarty-php/smarty/issues/72
+
+ 12.07.2015
+  - optimize {extends} compilation
+
+ 10.07.2015
+  - bugfix force file: resource in demo resource.extendsall.php
+
+ 08.07.2015
+  - bugfix convert each word of class names to ucfirst in in compiler. (forum topic 25588)
+
+ 07.07.2015
+  - improvement allow fetch() or display() called on a template object to get output from other template
+     like $template->fetch('foo.tpl') https://github.com/smarty-php/smarty/issues/70
+  - improvement Added $limit parameter to regex_replace modifier #71
+  - new feature multiple indices on file: resource
+
+ 06.07.2015
+  - optimize {block} compilation
+  - optimization get rid of __get and __set in source object
+
+ 01.07.2015
+  - optimize compile check handling
+  - update {foreach} compiler
+  - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66
+  - optimize source resources
+
+ 28.06.2015
+  - move $smarty->enableSecurity() into Smarty_Security class
+  - optimize security isTrustedResourceDir()
+  - move auto load filter methods into extension
+  - move $smarty->getTemplateVars() into extension
+  - move getStreamVariable() into extension
+  - move $smarty->append() and $smarty->appendByRef() into extension
+  - optimize autoloader
+  - optimize file path normalization
+  - bugfix PATH_SEPARATOR was replaced by mistake in autoloader
+  - remove redundant code
+
+ 27.06.2015
+  - bugfix resolve naming conflict between custom Smarty delimiter '<%' and PHP ASP tags https://github.com/smarty-php/smarty/issues/64
+  - update $smarty->_realpath for relative path not starting with './'
+  - update Smarty security with new realpath handling
+  - update {include_php} with new realpath handling
+  - move $smarty->loadPlugin() into extension
+  - minor compiler optimizations
+  - bugfix allow function plugins with name ending with 'close' https://github.com/smarty-php/smarty/issues/52
+  - rework of $smarty->clearCompiledTemplate() and move it to its own extension
+
+ 19.06.2015
+  - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59
+
+ ===== 3.1.27===== (18.06.2015)
+ 18.06.2015
+  - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ ===== 3.1.26===== (18.06.2015)
+ 18.06.2015
+  - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ 17.06.2015
+  - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55
+
+ ===== 3.1.25===== (15.06.2015)
+ 15.06.2015
+  - optimization of smarty_cachereource_keyvaluestore.php code
+
+ 14.06.2015
+  - bugfix a relative sub template path could fail if template_dir path did contain /../ https://github.com/smarty-php/smarty/issues/50
+  - optimization rework of path normalization
+  - bugfix an output tag with variable, modifier followed by an operator like {$foo|modifier+1} did fail https://github.com/smarty-php/smarty/issues/53
+
+ 13.06.2015
+  - bugfix a custom cache resource using smarty_cachereource_keyvaluestore.php did fail if php.ini mbstring.func_overload = 2 (forum topic 25568)
+
+ 11.06.2015
+  - bugfix the lexer could hang on very large quoted strings (forum topic 25570)
+
+ 08.06.2015
+  - bugfix using {$foo} as array index like $bar.{$foo} or in double quoted string like "some {$foo} thing" failed https://github.com/smarty-php/smarty/issues/49
+
+ 04.06.2015
+  - bugfix possible error message on unset() while compiling {block} tags https://github.com/smarty-php/smarty/issues/46
+
+ 01.06.2015
+  - bugfix <?xml ... ?> including template variables broken  since 3.1.22 https://github.com/smarty-php/smarty/issues/47
+  
+ 27.05.2015
+  - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43
+  
+ 24.05.2015
+  - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42
+
+ ===== 3.1.24===== (23.05.2015)
+ 23.05.2015
+  - improvement on php_handling to allow very large PHP sections, better error handling
+  - improvement allow extreme large comment sections (forum 25538)
+  
+ 21.05.2015
+  - bugfix broken PHP 5.2 compatibility when compiling <?php tags https://github.com/smarty-php/smarty/issues/40
+  - bugfix named {foreach} comparison like $smarty.foreach.foobar.index > 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41
+  
+ 19.05.2015
+  - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39
+  - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220)
+  - bugfix compiler could run into the pcre.backtrack_limit on larger comment or {php} tag sections (forum 25538)
+
+ 18.05.2015
+  - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher
+    compilation speed 
+
+ 16.05.2015
+  - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement reduce number of lexer tokens on operators and if conditions
+  - improvement higher compilation speed by modified lexer/parser generator at "smarty/smarty-lexer"
+ 
+ 13.05.2015
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement of debugging:
+      - use fresh Smarty object to display the debug console because of possible problems when the Smarty
+        was extended or Smarty properties had been modified in the class source
+      - display Smarty version number
+      - Truncate lenght of Origin display and extend strin value display to 80 character
+  - bugfix in Smarty_Security  'nl2br' should be a trusted modifier, not PHP function (code.google issue 223)
+  
+ 12.05.2015
+  - bugfix {$smarty.constant.TEST} did fail  on undefined constant https://github.com/smarty-php/smarty/issues/28
+  - bugfix access to undefined config variable like {#undef#} did fail https://github.com/smarty-php/smarty/issues/29
+  - bugfix in nested {foreach} saved item attributes got overwritten https://github.com/smarty-php/smarty/issues/33
+
+ ===== 3.1.23 ===== (12.05.2015)
+ 12.05.2015
+  - bugfix of smaller performance issue introduce in 3.1.22 when caching is enabled
+  - bugfix missig entry for smarty-temmplate-config in autoloader
+   
+ ===== 3.1.22 ===== tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
+ 10.05.2015
+  - bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true
+  - bugfix cache lock was not handled correctly after timeout when $cache_locking == true
+  - improvement added constants for $debugging
+
+ 07.05.2015
+  - improvement of the debugging console. Read NEW_FEATURES.txt
+  - optimization of resource class loading
+
+ 06.05.2015
+  - bugfix in 3.1.22-dev cache resource must not be loaded for subtemplates
+  - bugfix/improvement in 3.1.22-dev cache locking did not work as expected
+  
+ 05.05.2015
+  - optimization on cache update when main template is modified
+  - optimization move <?php ?> handling from parser to new compiler module
+
+ 05.05.2015
+  - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23
+ 
+ 04.05.2015
+  - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22)
+  - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24)
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) 2nd fix
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508)
+ 
+ 23.04.2015 
+  - bugfix a nocache template variable used as parameter at {insert} was by mistake cached
+  
+ 20.04.2015
+  - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name
+  
+ 27.03.2015
+  - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015)
+  - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471)
+
+ 20.03.2015
+  - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452}
+  - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers)
+  
+ 16.03.2015
+ - bugfix  problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452}
+ - bugfix  Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457}
+ - bugfix  {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18
+ 
+ 
+ 15.03.2015
+ - bugfix  $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452}
+ 
+ 14.03.2015
+ - bugfix  {nocache}  {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable.
+ 
+ - bugfix  template functions defined with {function} in an included subtemplate could not be called in nocache
+           mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452}
+ 
+ 10.03.2015
+ - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode.
+ 
+ 12.02.2015
+ - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error
+ 
+ 11.02.2015
+ - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16)
+ 
+ 22.01.2015
+ - new feature security can now control access to static methods and properties
+                see also NEW_FEATURES.txt
+
+ 21.01.2015
+ - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397)
+ - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class 
+ 
+ 04.01.2015
+ - push last weeks changes to github
+
+ - different optimizations
+ - improvement automatically create different versions of compiled templates and config files depending
+   on property settings.
+ - optimization restructure template processing by moving code into classes it better belongs to
+ - optimization restructure config file processing
+
+ 31.12.2014
+ - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. 
+   Function mb_split could be overloaded depending on php.ini mbstring.func_overload
+   
+   
+ 29.12.2014
+ - new feature security can now limit the template nesting level by property $max_template_nesting
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 29.12.2014
+ - new feature security can now disable special $smarty variables listed in property $disabled_special_smarty_vars
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 27.12.2014
+  - bugfix clear internal _is_file_cache when plugins_dir was modified
+
+ 13.12.2014
+  - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed
+ 
+ 11.12.2014
+  - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014
+  
+ 09.12.2014
+  - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342)
+  - bugfix call of template function by a variable name did not work after latest changes (forum 25342)
+  
+ 23.11.2014
+  - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326)
+
+ 13.11.2014
+  - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible
+
+ 12.11.2014
+ - new feature added support of namespaces to template code
+
+ 08.11.2014 - 10.11.2014
+ - bugfix subtemplate called in nocache mode could be called with wrong compile_id when it did change on one of the calling templates
+ - improvement add code of template functions called in nocache mode dynamically to cache file (related to bugfix of 01.11.2014)
+ - bugfix Debug Console did not include all data from merged compiled subtemplates
+
+ 04.11.2014
+ - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour)
+               $smarty->debugging = 2; => individual Debug Console window by template name
+ 
+ 03.11.2014
+ - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301)
+ - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console
+    (ATTENTION: parameter order has changed to be able to specify maximum recursion)
+ - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true 
+ - improvement The template variables are no longer displayed as objects on the Debug Console
+ - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console
+ - addition of some hooks for future extension of Debug Console
+
+ 01.11.2014
+ - bugfix and enhancement on subtemplate {include} and template {function} tags.
+   * Calling a template which has a nocache section could fail if it was called from a cached and a not cached subtemplate.
+   * Calling the same subtemplate cached and not cached with the $smarty->merge_compiled_includes enabled could cause problems
+   * Many smaller related changes
+
+ 30.10.2014
+ - bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301)
+
+ 26.10.2014
+ - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text
+ - bugfix merge_compiled_includes option failed when caching  enables and same subtemplate was included cached and not cached
+ 
+ ===== 3.1.21 ===== (18.10.2014)
+ 18.10.2014
+  - composer moved to github
+
+ 17.10.2014
+ - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen)
+
+ 16.10.2014
+ - bugfix composer.json update
+
+ 15.10.2014
+ - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350)
+
+ 14.10.2014
+ - bugfix any tag placed within "<script language=php>" will throw a security exception to close all thinkable holes
+ - bugfix classmap in root composer.json should start at "libs/..."
+ - improvement cache is_file(file_exists) results of loadPlugin() to avoid unnecessary calls during compilation (Issue 201}
+
+ 12.10.2014
+ - bugfix a comment like "<script{*foo*} language=php>" bypassed $php_handling checking (Thue Kristensen)
+ - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
+ - bugfix "<script language=php>" with $php_handling PHP_PASSTHRU was executed in {nocache} sections
+
+ ===== 3.1.20 ===== (09.10.2014)
+ 08.10.2014
+ - bugfix security mode of "<script language=php>" must be controlled by $php_handling property (Thue Kristensen)
+ 
+ 01.10.2014
+ - bugfix template resource of inheritance blocks could get invalid if the default resource type is not 'file'(Issue 202)
+ - bugfix existing child {block} tag must override parent {block} tag append / prepend setting (topic 25259)
+ 
+ 02.08.2014
+ - bugfix modifier wordwrap did output break string wrong if first word was exceeding length with cut = true (topic 25193)
+ 
+ 24.07.2014
+ - bugfix cache clear when cache folder does not exist
+
+ 16.07.2014
+ - enhancement remove BOM automatically from template source (topic 25161)
+ 
+ 04.07.2014
+ - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
+ 
+ ===== 3.1.19 ===== (30.06.2014)
+ 20.06.2014
+ - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
+ 
+ 17.06.2014
+ - bugfix large template text of some charsets could cause parsing errors (topic 24630)
+ 
+ 08.06.2014
+ - bugfix registered objects did not work after spelling fixes of 06.06.2014
+ - bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024)
+ - bugfix UNC WINDOWS PATH like "\\psf\path\to\dir" did not work as template directory (Issue 192)
+ - bugfix {html_image} security check did fail on files relative to basedir (Issue 191)
+ 
+ 06.06.2014
+ - fixed PHPUnit outputFilterTrimWhitespaceTests.php assertion of test result
+ - fixed spelling, PHPDoc , minor errors, code cleanup
+ 
+ 02.06.2014
+ - using multiple cwd with relative template dirs could result in identical compiled file names. (issue 194 and topic 25099)
+ 
+ 19.04.2014
+ - bugfix calling createTemplate(template, data) with empty data array caused notice of array to string conversion (Issue 189)
+ - bugfix clearCompiledTemplate() did not delete files on WINDOWS when a compile_id was specified
+ 
+ 18.04.2014
+ - revert bugfix of 5.4.2014 because %-e date format is not supported on all operating systems
+
+ ===== 3.1.18 ===== (07.04.2014)
+ 06.04.2014 
+ - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)
+ - bugfix update of composer file (Issue 168 and 184)
+
+ 05.04.2014
+ - bugfix default date format leads to extra spaces when displaying dates with single digit days (Issue 165)
+ 
+ 26.03.2014
+ - bugfix Smart_Resource_Custom should not lowercase the resource name (Issue 183)
+ 
+ 24.03.2014
+ - bugfix using a {foreach} property like @iteration could fail when used in inheritance parent templates (Issue 182)
+ 
+ 20.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+ 
+ 18.03.2014
+ - revert change of 17.03.2014
+ 
+17.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+ 
+ 15.03.2014
+ - bugfix Smarty_CacheResource_Keyvaluestore did use different keys on read/writes and clearCache() calls (Issue 169)
+
+ 13.03.2014
+ - bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id  (forum topic 24868 and 24867)
+ 
+ ===== 3.1.17 =====
+ 08.03.2014
+ - bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177)
+ 
+ 17.02.2014
+ - bugfix Smarty failed when executing PHP on HHVM (Hip Hop 2.4) because uniqid('',true) does return string with ',' (forum topic 20343)
+ 
+ 16.02.2014
+ - bugfix a '//' or '\\' in template_dir path could produce wrong path on relative filepath in {include} (Issue 175)
+ 
+ 05.02.2014
+ - bugfix shared.literal_compiler_param.php did throw an exception when literal did contain a '-' (smarty-developers group)
+ 
+ 27.01.2014
+ - bugfix $smarty->debugging = true; did show the variable of the $smarty object not the variables used in display() call (forum topic 24764)
+ - bugfix clearCompiledTemplate(), clearAll() and clear() should use realpath to avoid possible exception from RecursiveDirectoryIterator (Issue 171)
+ 
+ 26.01.2014
+ - bugfix  undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762)
+ 
+ 18.01.2014
+ - bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group)
+ 
+ 11.01.2014
+ - bugfix "* }" (spaces before right delimiter) was interpreted by mistake as comment end tag (Issue 170)
+ - internals  content cache should be clear when updating cache file
+ 
+ 08.01.2014
+ - bugfix Smarty_CacheResource_Custom did not handle template resource type specifications on clearCache() calls (Issue 169)
+ - bugfix SmartyBC.class.php should use require_once to load Smarty.class.php (forum topic 24683)
+ 
+ ===== 3.1.16 =====
+ 15.12.2013
+ - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161)
+   Read 3.1.16_RELEASE_NOTES for more details
+ - enhancement additional debug output at $smarty->_parserdebug = true;
+ 
+ 07.11.2013
+ - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)
+ - bugfix compiler could fail if PHP mbstring.func_overload is enabled  (Issue 164)
+ 
+ 28.10.2013
+ - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163)
+ - bugfix notice "Trying to get property of non-object" removed (Issue 163)
+ - bugfix correction of modifier capitalize fix from 3.10.2013  (issue 159)
+ - bugfix multiple {block}s with same name in parent did not work (forum topic 24631) 
+ 
+ 20.10.2013
+ - bugfix a variable file name at {extends} tag did fail (forum topic 24618)
+ 
+ 14.10.2013
+ - bugfix yesterdays fix could result in an undefined variable
+ 
+ 13.10.2013
+ - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161)
+.- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161) 
+
+ 04.10.2013
+ - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of 
+   template inheritance of 24.08.2013   (forum topic 24585)
+   
+03.10.2013
+ - bugfix loops using modifier capitalize did eat up memory (issue 159)
+ 
+ ===== Smarty 3.1.15 =====
+01.10.2013
+ - use current delimiters in compiler error messages (issue 157)
+ - improvement on performance when using error handler and multiple template folders (issue 152)
+
+17.09.2013
+ - improvement added patch for additional SmartyCompilerException properties for better access to scource information (forum topic 24559)
+
+16.09.2013
+ - bugfix recompiled templates did not show on first request with zend opcache cache (forum topic 24320)
+ 
+13.09.2013
+ - bugfix html_select_time defaulting error for the Meridian dropdown (forum topic 24549)
+
+09.09.2012
+- bugfix incorrect compiled code with array(object,method) callback at registered Variable Filter (forum topic 24542)
+
+27.08.2013
+- bugfix delimiter followed by linebreak did not work as auto literal after update from 24.08.2013 (forum topic 24518)
+
+24.08.2013
+- bugfix and enhancement
+  Because several recent problems with template inheritance the {block} tag compiler has been rewriten
+   - Error messages shown now the correct child template file and line number
+   - The compiler could fail on some larger UTF-8 text block (forum topic 24455)
+   - The {strip} tag can now be placed outside {block} tags in child templates (forum topic 24289)
+- change SmartyException::$escape  is now false by default
+- change PHP traceback has been remove for SmartyException and SmartyCompilerException
+   
+14.08.2013
+- bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493)
+
+13.08.2013
+- bugfix the internal resource cache did not observe config_dir changes (forum topic 24493)
+
+12.08.2013
+- bugfix internal $tmpx variables must be unique over all inheritance templates (Issue 149)
+
+10.08.2013
+- bugfix a newline was eaten when a <?xml ... ?> was passed by a Smarty variable and caching was enabled (forum topic 24482)
+
+29.07.2013
+- bugfix headers already send warning thrown when using 'SMARTY_DEBUG=on' from URL (Issue 148)
+
+27.07.2013
+- enhancement allow access to properties of registered opjects for Smarty2 BC (forum topic 24344)
+
+26.07.2013
+- bugfix template inheritance nesting problem (forum topic 24387)
+
+15.7.2013
+- update code generated by PSR-2 standards fixer which introduced PHP 5.4 incompatibilities of 14.7.2013
+
+14.7.2013
+- bugfix increase of internal maximum parser stacksize to allow more complex tag code {forum topic 24426}
+- update for PHP 5.4 compatibility
+- reformat source to PSR-2 standard
+
+12.7.2013
+- bugfix Do not remove '//' from file path at normalization (Issue 142)
+
+2.7.2013
+- bugfix trimwhitespace would replace captured items in wrong order (forum topic 24387)
+
+===== Smarty-3.1.14 =====
+27.06.2013
+- bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389)
+
+17.06.2013
+- fixed spelling in sources and documentation (from smarty-developers forum Veres Lajos)
+- enhancement added constant SMARTY::CLEAR_EXPIRED for the change of 26.05.2013 (forum topic 24310)
+- bugfix added smarty_security.php to composer.json (Issue 135)
+
+26.05.2013
+- enhancement an expire_time of -1 in clearCache() and clearAllCache() will delete outdated cache files
+  by their individual cache_lifetime used at creation (forum topic 24310)
+
+21.05.2013
+- bugfix modifier strip_tags:true was compiled into wrong code (Forum Topic 24287)
+- bugfix /n after ?> in Smarty.class.php did start output buffering (Issue 138)
+
+25.04.2013
+- bugfix escape and wordrap modifier could be compiled into wrong code when used in {nocache}{/nocache}
+  section but caching is disabled  (Forum Topic 24260)
+  
+05.04.2013
+- bugfix post filter must not run when compiling inheritance child blocks (Forum Topic 24094)
+- bugfix after the fix for Issue #130 compiler exceptions got double escaped (Forum Topic 24199)
+
+28.02.2013
+- bugfix nocache blocks could be lost when using CACHING_LIFETIME_SAVED (Issue #133)
+- bugfix Compile ID gets nulled when compiling child blocks (Issue #134)
+
+
+24.01.2013
+- bugfix wrong tag type in smarty_internal_templatecompilerbase.php could cause wrong plugin search order (Forum Topic 24028)
+
+===== Smarty-3.1.13 =====
 13.01.2013
 - enhancement allow to disable exception message escaping by SmartyException::$escape = false;  (Issue #130)
 
 09.01.2013
-- bugfix compilation did fail when a prefilter did modify an {extends} tag (Forum Topic 23966)
+- bugfix compilation did fail when a prefilter did modify an {extends} tag c
 - bugfix template inheritance could fail if nested {block} tags in childs did contain {$smarty.block.child} (Issue #127)
 - bugfix template inheritance could fail if {block} tags in childs did have similar name as used plugins (Issue #128)
 - added abstract method declaration doCompile() in Smarty_Internal_TemplateCompilerBase (Forum Topic 23969)
@@ -417,7 +1128,7 @@
 03/09/2011
 - bugfix createTemplate() must default to cache_id and compile_id of Smarty object
 - bugfix Smarty_CacheResource_KeyValueStore must include $source->uid in cache filepath to keep templates with same
-  name but different folders seperated
+  name but different folders separated
 - added cacheresource.apc.php example in demo folder
 
 02/09/2011
@@ -470,7 +1181,7 @@
 
 15/07/2011
 - bugfix individual cache_lifetime of {include} did not work correctly inside {block} tags
-- added caches for Smarty_Template_Source and Smarty_Template_Compiled to reduce I/O for multiple cache_id rendering
+- added caches for Smarty_Internal_TemplateSource and Smarty_Internal_TemplateCompiled to reduce I/O for multiple cache_id rendering
 
 14/07/2011
 - made Smarty::loadPlugin() respect the include_path if required
@@ -608,7 +1319,7 @@
 - changed ./ and ../ behaviour
 
 14/02/2011
-- added {block ... hide} option to supress block if no child is defined
+- added {block ... hide} option to suppress block if no child is defined
 
 13/02/2011
 - update handling of recursive subtemplate calls
@@ -722,7 +1433,7 @@
 - bugfix on compiler object destruction. compiler_object property was by mistake unset.
 
 09/03/2011
--bugfix a variable filter should run before modifers on an output tag (see change of 23/07/2010)
+-bugfix a variable filter should run before modifiers on an output tag (see change of 23/07/2010)
 
 08/03/2011
 - bugfix loading config file without section should load only defaults
@@ -1026,10 +1737,10 @@ request_use_auto_globals
 - bugfix passing scope attributes in doublequoted strings did not work at {include} {assign} and {append}
 
 25/07/2010
-- another bugfix of change from 23/07/2010 when compiling modifer
+- another bugfix of change from 23/07/2010 when compiling modifier
 
 24/07/2010
-- bugfix of change from 23/07/2010 when compiling modifer
+- bugfix of change from 23/07/2010 when compiling modifier
 
 23/07/2010
 - changed execution order. A variable filter does now run before modifiers on output of variables
@@ -1336,7 +2047,7 @@ request_use_auto_globals
 - bugfix on {if} tags 
 
 01/12/2010
-- changed back modifer handling in parser. Some restrictions still apply:
+- changed back modifier handling in parser. Some restrictions still apply:
     if modifiers are used in side {if...} expression or in mathematical expressions 
     parentheses must be used.
 - bugfix the {function..} tag did not accept the name attribute in double quotes
@@ -1948,7 +2659,7 @@ NOTICE: existing compiled template and cache files must be deleted
 - fixed exceptions in function plugins
 - fixed notice error in Smarty.class.php
 - allow chained objects to span multiple lines
-- fixed error in modifers 
+- fixed error in modifiers 
 
 03/20/2009
 - moved /plugins folder into /libs folder
@@ -1956,7 +2667,7 @@ NOTICE: existing compiled template and cache files must be deleted
 - autoappend a directory separator if the xxxxx_dir definition have no trailing one
 
 03/19/2009
-- allow array definition as modifer parameter
+- allow array definition as modifier parameter
 - changed modifier to use multi byte string funktions. 
 
 03/17/2009
diff --git a/sources/include/smarty/composer.json b/sources/include/smarty/composer.json
new file mode 100644
index 0000000..2a1a43a
--- /dev/null
+++ b/sources/include/smarty/composer.json
@@ -0,0 +1,43 @@
+{
+    "name": "smarty/smarty",
+    "type": "library",
+    "description": "Smarty - the compiling PHP template engine",
+    "keywords": ["templating"],
+    "homepage": "http://www.smarty.net",
+    "license": "LGPL-3.0",
+    "authors": [
+        {
+            "name": "Monte Ohrt",
+            "email": "monte@ohrt.com"
+        },
+        {
+            "name": "Uwe Tews",
+            "email": "uwe.tews@googlemail.com"
+        },
+        {
+            "name": "Rodney Rehm",
+            "email": "rodney.rehm@medialize.de"
+        }
+    ],
+    "support": {
+        "irc": "irc://irc.freenode.org/smarty",
+        "issues": "https://github.com/smarty-php/smarty/issues",
+        "forum": "http://www.smarty.net/forums/"
+    },
+    "require": {
+        "php": ">=5.2"
+    },
+    "autoload": {
+        "classmap": [
+            "libs/Smarty.class.php",
+            "libs/SmartyBC.class.php",
+            "libs/sysplugins/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.1.x-dev"
+        }
+    }
+
+}
diff --git a/sources/include/smarty/lexer/smarty_internal_configfilelexer.plex b/sources/include/smarty/lexer/smarty_internal_configfilelexer.plex
new file mode 100644
index 0000000..9a45a5f
--- /dev/null
+++ b/sources/include/smarty/lexer/smarty_internal_configfilelexer.plex
@@ -0,0 +1,318 @@
+<?php
+/**
+* Smarty Internal Plugin Configfilelexer
+*
+* This is the lexer to break the config file source into tokens 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews 
+*/
+/**
+* Smarty_Internal_Configfilelexer
+*
+* This is the config file lexer.
+* It is generated from the smarty_internal_configfilelexer.plex file
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class Smarty_Internal_Configfilelexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+    /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    private $compiler = null;
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+    private $yy_global_pattern2 = null;
+    private $yy_global_pattern3 = null;
+    private $yy_global_pattern4 = null;
+    private $yy_global_pattern5 = null;
+    private $yy_global_pattern6 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        // set instance object
+        self::instance($this);
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
+
+    public static function &instance($new_instance = null)
+    {
+        static $instance = null;
+        if (isset($new_instance) && is_object($new_instance)) {
+            $instance = $new_instance;
+        }
+        return $instance;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+
+/*!lex2php
+%input $this->data
+%counter $this->counter
+%token $this->token
+%value $this->value
+%line $this->line
+commentstart = /#|;/
+openB = /\[/
+closeB = /\]/
+section = /.*?(?=[\.=\[\]\r\n])/
+equal = /=/
+whitespace = /[ \t\r]+/
+dot = /\./
+id = /[0-9]*[a-zA-Z_]\w*/
+newline = /\n/
+single_quoted_string = /'[^'\\]*(?:\\.[^'\\]*)*'(?=[ \t\r]*[\n#;])/
+double_quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"(?=[ \t\r]*[\n#;])/
+tripple_quotes = /"""/
+tripple_quotes_end = /"""(?=[ \t\r]*[\n#;])/
+text = /[\S\s]/
+float = /\d+\.\d+(?=[ \t\r]*[\n#;])/
+int = /\d+(?=[ \t\r]*[\n#;])/
+maybe_bool = /[a-zA-Z]+(?=[ \t\r]*[\n#;])/
+naked_string = /[^\n]+?(?=[ \t\r]*\n)/
+*/
+
+/*!lex2php
+%statename START
+
+commentstart {
+    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+}
+openB {
+    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+}
+closeB {
+    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+}
+equal {
+    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+}
+whitespace {
+    return false;
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+}
+id {
+    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+}
+text {
+    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+}
+
+*/
+
+/*!lex2php
+%statename VALUE
+
+whitespace {
+    return false;
+}
+float {
+    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+    $this->yypopstate();
+}
+int {
+    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+    $this->yypopstate();
+}
+tripple_quotes {
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+}
+single_quoted_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+double_quoted_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+maybe_bool {
+    if (!$this->configBooleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
+        $this->yypopstate();
+        $this->yypushstate(self::NAKED_STRING_VALUE);
+        return true; //reprocess in new state
+    } else {
+        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+        $this->yypopstate();
+    }
+}
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->value = "";
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename NAKED_STRING_VALUE
+
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename COMMENT
+
+whitespace {
+    return false;
+}
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename SECTION
+
+dot {
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+}
+section {
+    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+    $this->yypopstate();
+}
+
+*/
+/*!lex2php
+%statename TRIPPLE
+
+tripple_quotes_end {
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+}
+text {
+  $to = strlen($this->data);
+  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  } else {
+    $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+  }  
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+}
+*/
+
+}
diff --git a/sources/include/smarty/lexer/smarty_internal_configfileparser.y b/sources/include/smarty/lexer/smarty_internal_configfileparser.y
new file mode 100644
index 0000000..ac96177
--- /dev/null
+++ b/sources/include/smarty/lexer/smarty_internal_configfileparser.y
@@ -0,0 +1,362 @@
+/**
+* Smarty Internal Plugin Configfileparser
+*
+* This is the config file parser
+* 
+* 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews
+*/
+%name TPC_
+%declare_class {
+/**
+* Smarty Internal Plugin Configfileparse
+*
+* This is the config file parser.
+* It is generated from the smarty_internal_configfileparser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class Smarty_Internal_Configfileparser
+}
+%include_class
+{
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+    /**
+     * @var
+     */
+    public $yymajor;
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Configfilelexer
+     */
+    private $lex;
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    public $compiler = null;
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = Array('\\' => '\\',
+                                           '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        // set instance object
+        self::instance($this);
+        $this->lex = $lex;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    /**
+     * @param null $new_instance
+     *
+     * @return null
+     */
+    public static function &instance($new_instance = null)
+    {
+        static $instance = null;
+        if (isset($new_instance) && is_object($new_instance)) {
+            $instance = $new_instance;
+        }
+        return $instance;
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = "";
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }
+
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }
+
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(Array $var, Array &$target_array)
+    {
+        $key = $var["key"];
+        $value = $var["value"];
+
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(Array $vars)
+    {
+        if (!isset($this->compiler->config_data['vars'])) {
+            $this->compiler->config_data['vars'] = Array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, Array $vars)
+    {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+}
+
+%token_prefix TPC_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+}
+
+%stack_overflow
+{
+    $this->internalError = true;
+    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
+}
+
+// Complete config file
+start(res) ::= global_vars sections. {
+    res = null;
+}
+
+// Global vars
+global_vars(res) ::= var_list(vl). {
+    $this->add_global_vars(vl);
+    res = null;
+}
+
+// Sections
+sections(res) ::= sections section. {
+    res = null;
+}
+
+sections(res) ::= . {
+    res = null;
+}
+
+section(res) ::= OPENB SECTION(i) CLOSEB newline var_list(vars). {
+    $this->add_section_vars(i, vars);
+    res = null;
+}
+
+section(res) ::= OPENB DOT SECTION(i) CLOSEB newline var_list(vars). {
+    if ($this->configReadHidden) {
+        $this->add_section_vars(i, vars);
+    }
+    res = null;
+}
+
+// Var list
+var_list(res) ::= var_list(vl) newline. {
+    res = vl;
+}
+
+var_list(res) ::= var_list(vl) var(v). {
+    res = array_merge(vl, Array(v));
+}
+
+var_list(res) ::= . {
+    res = Array();
+}
+
+
+// Var
+var(res) ::= ID(id) EQUAL value(v). {
+    res = Array("key" => id, "value" => v);
+}
+
+
+value(res) ::= FLOAT(i). {
+    res = (float) i;
+}
+
+value(res) ::= INT(i). {
+    res = (int) i;
+}
+
+value(res) ::= BOOL(i). {
+    res = $this->parse_bool(i);
+}
+
+value(res) ::= SINGLE_QUOTED_STRING(i). {
+    res = self::parse_single_quoted_string(i);
+}
+
+value(res) ::= DOUBLE_QUOTED_STRING(i). {
+    res = self::parse_double_quoted_string(i);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_TEXT(c) TRIPPLE_QUOTES_END(ii). {
+    res = self::parse_tripple_double_quoted_string(c);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_QUOTES_END(ii). {
+    res = '';
+}
+
+value(res) ::= NAKED_STRING(i). {
+    res = i;
+}
+
+// NOTE: this is not a valid rule
+// It is added hier to produce a usefull error message on a missing '=';
+value(res) ::= OTHER(i). {
+    res = i;
+}
+
+
+// Newline and comments
+newline(res) ::= NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NAKED_STRING NEWLINE. {
+    res = null;
+}
diff --git a/sources/include/smarty/lexer/smarty_internal_templatelexer.plex b/sources/include/smarty/lexer/smarty_internal_templatelexer.plex
new file mode 100644
index 0000000..721b528
--- /dev/null
+++ b/sources/include/smarty/lexer/smarty_internal_templatelexer.plex
@@ -0,0 +1,672 @@
+<?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty_Internal_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Templatelexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
+    public $taglineno;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    public $phpType = '';
+
+    /**
+     * escaped left delimiter
+     *
+     * @var string
+     */
+    public $ldel = '';
+
+    /**
+     * escaped left delimiter length
+     *
+     * @var int
+     */
+    public $ldel_length = 0;
+
+    /**
+     * escaped right delimiter
+     *
+     * @var string
+     */
+    public $rdel = '';
+
+    /**
+     * escaped right delimiter length
+     *
+     * @var int
+     */
+    public $rdel_length = 0;
+
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * PHP start tag string
+     *
+     * @var string
+     */
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+    * XML flag true while processing xml
+    *
+    * @var bool
+    */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+   public $smarty_token_names = array(        // Text for parser error messages
+                                               'NOT'             => '(!,not)',
+                                               'OPENP'           => '(',
+                                               'CLOSEP'          => ')',
+                                               'OPENB'           => '[',
+                                               'CLOSEB'          => ']',
+                                               'PTR'             => '->',
+                                               'APTR'            => '=>',
+                                               'EQUAL'           => '=',
+                                               'NUMBER'          => 'number',
+                                               'UNIMATH'         => '+" , "-',
+                                               'MATH'            => '*" , "/" , "%',
+                                               'INCDEC'          => '++" , "--',
+                                               'SPACE'           => ' ',
+                                               'DOLLAR'          => '$',
+                                               'SEMICOLON'       => ';',
+                                               'COLON'           => ':',
+                                               'DOUBLECOLON'     => '::',
+                                               'AT'              => '@',
+                                               'HATCH'           => '#',
+                                               'QUOTE'           => '"',
+                                               'BACKTICK'        => '`',
+                                               'VERT'            => '"|" modifier',
+                                               'DOT'             => '.',
+                                               'COMMA'           => '","',
+                                               'QMARK'           => '"?"',
+                                               'ID'              => 'id, name',
+                                               'TEXT'            => 'text',
+                                               'LDELSLASH'       => '{/..} closing tag',
+                                               'LDEL'            => '{...} Smarty tag',
+                                               'COMMENT'         => 'comment',
+                                               'AS'              => 'as',
+                                               'TO'              => 'to',
+                                               'PHP'             => '"<?php", "<%", "{php}" tag',
+                                               'LOGOP'           => '"<", "==" ... logical operator',
+                                               'TLOGOP'           => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'           => '"is even" ... if condition',
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->data = $data;
+        $this->counter = 0;
+        if (preg_match('~^\xEF\xBB\xBF~i', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->ldel = preg_quote($this->smarty->left_delimiter, '~');
+        $this->ldel_length = strlen($this->smarty->left_delimiter);
+        $this->rdel = preg_quote($this->smarty->right_delimiter, '~');
+        $this->rdel_length = strlen($this->smarty->right_delimiter);
+        $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
+        $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
+    }
+
+   public function PrintTrace()
+   {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+   }
+
+   /*
+    * Check if this tag is autoliteral
+    */
+   public function isAutoLiteral ()
+   {
+       return $this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false;
+   }
+
+     /*!lex2php
+     %input $this->data
+     %counter $this->counter
+     %token $this->token
+     %value $this->value
+     %line $this->line
+     linebreak = ~[\t ]*[\r\n]+[\t ]*~
+     text = ~[\S\s]~
+     textdoublequoted = ~([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=(SMARTYldel|\$|`\$|"))~
+     namespace = ~([0-9]*[a-zA-Z_]\w*)?(\\[0-9]*[a-zA-Z_]\w*)+~
+     all = ~[\S\s]+~
+     emptyjava = ~[{][}]~
+     phptag = ~(SMARTYldel\s*php(.*?)SMARTYrdel)|(SMARTYldel\s*[/]phpSMARTYrdel)~
+     phpstart = ~(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*["']?\s*php\s*["']?\s*>)|([?][>])|([%][>])~
+     slash = ~[/]~
+     ldel = ~SMARTYldel\s*~
+     rdel = ~\s*SMARTYrdel~
+     nocacherdel = ~(\s+nocache)?\s*SMARTYrdel~
+     notblockid = ~(?:(?!block)[0-9]*[a-zA-Z_]\w*)~
+     smartyblockchildparent = ~[\$]smarty\.block\.(child|parent)~
+     integer = ~\d+~
+     hex =  ~0[xX][0-9a-fA-F]+~
+     math = ~\s*([*]{1,2}|[%/^&]|[<>]{2})\s*~
+     comment = ~SMARTYldel[*]~
+     incdec = ~([+]|[-]){2}~
+     unimath = ~\s*([+]|[-])\s*~
+     openP = ~\s*[(]\s*~
+     closeP = ~\s*[)]~
+     openB = ~\[\s*~
+     closeB = ~\s*\]~
+     dollar = ~[$]~
+     dot = ~[.]~
+     comma = ~\s*[,]\s*~
+     doublecolon = ~[:]{2}~
+     colon = ~\s*[:]\s*~
+     at = ~[@]~
+     hatch = ~[#]~
+     semicolon = ~\s*[;]\s*~
+     equal = ~\s*[=]\s*~
+     space = ~\s+~
+     ptr = ~\s*[-][>]\s*~
+     aptr = ~\s*[=][>]\s*~
+     singlequotestring = ~'[^'\\]*(?:\\.[^'\\]*)*'~
+     backtick = ~[`]~
+     vert = ~[|]~
+     qmark = ~\s*[?]\s*~
+     constant = ~([_]+[A-Z0-9][0-9A-Z_]*|[A-Z][0-9A-Z_]*)(?![0-9A-Z_]*[a-z])~
+     attr = ~\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\s*[=]\s*~
+     id = ~[0-9]*[a-zA-Z_]\w*~
+     literal = ~literal~
+     strip = ~strip~
+     lop = ~\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\s*~
+     tlop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor|(is\s+(not\s+)?(odd|even|div)\s+by))\s+~
+     scond = ~\s+is\s+(not\s+)?(odd|even)~
+     isin = ~\s+is\s+in\s+~
+     as = ~\s+as\s+~
+     to = ~\s+to\s+~
+     step = ~\s+step\s+~
+     block = ~block~
+     if = ~(if|elseif|else if|while)\s+~
+     for = ~for\s+~
+     foreach = ~foreach(?![^\s])~
+     setfilter = ~setfilter\s+~
+     instanceof = ~\s+instanceof\s+~
+     not = ~([!]\s*)|(not\s+)~
+     typecast = ~[(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\s*~
+     double_quote = ~["]~
+     single_quote = ~[']~
+     */
+     /*!lex2php
+     %statename TEXT
+     emptyjava {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     comment {
+        preg_match("~[*]{$this->rdel}~",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1] + strlen($match[0][0]);
+        } else {
+            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
+        }
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        return false;
+     }
+     phptag {
+       $obj = new Smarty_Internal_Compile_Private_Php();
+       $obj->parsePhp($this);
+     }
+     ldel literal rdel {
+       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+       } else {
+         $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+         $this->yypushstate(self::LITERAL);
+        }
+     }
+     ldel {
+       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+       } else {
+          $this->yypushstate(self::TAG);
+          return true;
+       }
+     }
+     rdel {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     phpstart {
+       $obj = new Smarty_Internal_Compile_Private_Php();
+       $obj->parsePhp($this);
+     }
+     text {
+       $to = strlen($this->data);
+       preg_match("~($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*[\"']?\s*php\s*[\"']?\s*>)|([?][>])|([%][>])~i",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+     /*!lex2php
+     %statename TAG
+     ldel if {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel for {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel foreach {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel setfilter {
+          $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     ldel id nocacherdel {
+          $this->yypopstate();
+          $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+          $this->taglineno = $this->line;
+     }
+     ldel slash notblockid rdel {
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+         $this->taglineno = $this->line;
+     }
+     ldel dollar id nocacherdel {
+         if ($this->_yy_stack[count($this->_yy_stack)-1] == self::TEXT) {
+            $this->yypopstate();
+            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+         } else {
+            $this->value = $this->smarty->left_delimiter;
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+         }
+     }
+     ldel slash {
+         $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+         $this->yybegin(self::TAGBODY);
+         $this->taglineno = $this->line;
+     }
+     ldel {
+          $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+          $this->yybegin(self::TAGBODY);
+          $this->taglineno = $this->line;
+     }
+     */
+     /*!lex2php
+     %statename TAGBODY
+     rdel {
+       $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+       $this->yypopstate();
+     }
+     ldel {
+        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+           $this->yypushstate(self::TAG);
+           return true;
+        }
+     }
+    double_quote {
+       $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+       $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+     }
+     singlequotestring {
+       $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+     }
+     smartyblockchildparent {
+          $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+          $this->taglineno = $this->line;
+     }
+     dollar id {
+       $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
+     dollar {
+       $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+     }
+     isin {
+       $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+     }
+     as {
+       $this->token = Smarty_Internal_Templateparser::TP_AS;
+     }
+     to {
+       $this->token = Smarty_Internal_Templateparser::TP_TO;
+     }
+     step {
+       $this->token = Smarty_Internal_Templateparser::TP_STEP;
+     }
+     instanceof {
+       $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+     }
+     lop {
+       $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+     }
+     tlop {
+       $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+     }
+     scond {
+       $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+     }
+     not{
+       $this->token = Smarty_Internal_Templateparser::TP_NOT;
+     }
+     typecast {
+       $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+     }
+     openP {
+       $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+     }
+     closeP {
+       $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+     }
+     openB {
+       $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+     }
+     closeB {
+       $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+     }
+     ptr {
+       $this->token = Smarty_Internal_Templateparser::TP_PTR;
+     }
+     aptr {
+       $this->token = Smarty_Internal_Templateparser::TP_APTR;
+     }
+     equal {
+       $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+     }
+     incdec {
+       $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+     }
+     unimath {
+       $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+     }
+     math {
+       $this->token = Smarty_Internal_Templateparser::TP_MATH;
+     }
+     at {
+       $this->token = Smarty_Internal_Templateparser::TP_AT;
+     }
+     hatch {
+       $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+     }
+     attr {
+       // resolve conflicts with shorttag and right_delimiter starting with '='
+       if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
+          preg_match("~\s+~",$this->value,$match);
+          $this->value = $match[0];
+          $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+       } else {
+          $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+       }
+     }
+     namespace {
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+     }
+     id {
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+     }
+     integer {
+       $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+     }
+     backtick {
+       $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+       $this->yypopstate();
+     }
+     vert {
+       $this->token = Smarty_Internal_Templateparser::TP_VERT;
+     }
+     dot {
+       $this->token = Smarty_Internal_Templateparser::TP_DOT;
+     }
+     comma {
+       $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+     }
+     semicolon {
+       $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+     }
+     doublecolon {
+       $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+     }
+     colon {
+       $this->token = Smarty_Internal_Templateparser::TP_COLON;
+     }
+     qmark {
+       $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+     }
+     hex {
+       $this->token = Smarty_Internal_Templateparser::TP_HEX;
+     }
+     space {
+       $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+     }
+     text {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+
+     /*!lex2php
+     %statename LITERAL
+     ldel literal rdel {
+       $this->literal_cnt++;
+       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+     }
+     ldel slash literal rdel {
+       if ($this->literal_cnt) {
+         $this->literal_cnt--;
+         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+       } else {
+         $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+         $this->yypopstate();
+       }
+     }
+     text {
+       $to = strlen($this->data);
+       preg_match("~{$this->ldel}[/]?literal{$this->rdel}~i",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       } else {
+         $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+     }
+     */
+     /*!lex2php
+     %statename DOUBLEQUOTEDSTRING
+     ldel literal rdel {
+         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel slash literal rdel {
+         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel slash {
+       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+       } else {
+          $this->yypushstate(self::TAG);
+          return true;
+       }
+     }
+     ldel id {
+       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+       } else {
+          $this->yypushstate(self::TAG);
+          return true;
+       }
+     }
+     ldel {
+       if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+          $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+       } else {
+          $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+          $this->taglineno = $this->line;
+          $this->yypushstate(self::TAGBODY);
+       }
+     }
+     double_quote {
+       $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+       $this->yypopstate();
+     }
+     backtick dollar {
+       $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+       $this->value = substr($this->value,0,-1);
+       $this->yypushstate(self::TAGBODY);
+       $this->taglineno = $this->line;
+     }
+     dollar id {
+       $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
+     dollar {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     textdoublequoted {
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     text {
+       $to = strlen($this->data);
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+  }
+
+     
\ No newline at end of file
diff --git a/sources/include/smarty/lexer/smarty_internal_templateparser.y b/sources/include/smarty/lexer/smarty_internal_templateparser.y
new file mode 100644
index 0000000..c64e34a
--- /dev/null
+++ b/sources/include/smarty/lexer/smarty_internal_templateparser.y
@@ -0,0 +1,1352 @@
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+%stack_size 500
+%name TP_
+%declare_class {
+/**
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the smarty_internal_templateparser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
+class Smarty_Internal_Templateparser
+}
+%include_class
+{
+    const Err1 = "Security error: Call to private object member not allowed";
+    const Err2 = "Security error: Call to dynamic object member not allowed";
+    const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+
+    /**
+     * counter for prefix code
+     *
+     * @var int
+     */
+    public static $prefix_number = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
+    public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
+    public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var Smarty_Internal_ParseTree
+     */
+    public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var Smarty_Internal_ParseTree
+     */
+    public $current_buffer;
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Templatelexer
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var Smarty_Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * security object
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Templatelexer        $lex
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->template = $this->compiler->template;
+        $this->smarty = $this->template->smarty;
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
+        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
+    }
+
+    /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
+    }
+
+   /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Smarty_Internal_ParseTree_Tag
+     */
+    public function mergePrefixCode($code)
+    {
+        $tmp ='';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
+        $this->compiler->prefix_code=array();
+        $tmp .= $code;
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp,true));
+    }
+
+}
+
+%token_prefix TP_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+}
+
+%stack_overflow
+{
+    $this->internalError = true;
+    $this->compiler->trigger_template_error("Stack overflow in template parser");
+}
+
+%left VERT.
+%left COLON.
+
+    //
+    // complete template
+    //
+start(res)       ::= template. {
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    res = $this->root_buffer->to_smarty_php($this);
+}
+
+    //
+    // loop over template elements
+    //
+                      // single template element
+template       ::= template_element(e). {
+    if (e != null) {
+        $this->current_buffer->append_subtree($this, e);
+    }
+}
+
+                      // loop of elements
+template       ::= template template_element(e). {
+    if (e != null) {
+        // because of possible code injection
+        $this->current_buffer->append_subtree($this, e);
+    }
+}
+
+                      // empty template
+template       ::= . 
+
+//
+// template elements
+//
+                      // Smarty tag
+template_element(res)::= smartytag(st). {
+     if ($this->compiler->has_code) {
+         res = $this->mergePrefixCode(st);
+     } else {
+         res = null;
+     }
+    $this->compiler->has_variable_string = false;
+    $this->block_nesting_level = count($this->compiler->_tag_stack);
+} 
+
+                      // Literal
+template_element(res) ::= literal(l). {
+    res = new Smarty_Internal_ParseTree_Text(l);
+}
+                      // php tags
+template_element(res)::= PHP(o). {
+    $code = $this->compiler->compileTag('private_php',array(array('code' => o), array('type' => $this->lex->phpType )),array());
+    if ($this->compiler->has_code && !empty($code)) {
+        $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
+        res = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp.$code,true));
+    } else {
+        res = null;
+    }
+}
+
+                      // nocache code
+template_element(res)::= NOCACHE(c). {
+        $this->compiler->tag_nocache = true;
+        $save = $this->template->compiled->has_nocache_code;
+        res = new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode("<?php echo '{c}';?>\n", $this->compiler, true));
+        $this->template->compiled->has_nocache_code = $save;
+}
+                      // template text
+template_element(res)::= text_content(t). {
+        res = $this->compiler->processText(t);
+}
+
+text_content(res) ::= TEXT(o). {
+    res = o;
+}
+
+text_content(res) ::= text_content(t) TEXT(o). {
+    res = t . o;
+}
+
+                      // strip on
+template_element ::= STRIPON(d). {
+    $this->strip = true;
+}
+                      // strip off
+template_element ::= STRIPOFF(d). {
+    $this->strip = false;
+}
+
+                    // Litteral
+literal(res) ::= LITERALSTART LITERALEND. {
+    res = '';
+}
+
+literal(res) ::= LITERALSTART literal_elements(l) LITERALEND. {
+    res = l;
+}
+ 
+literal_elements(res) ::= literal_elements(l1) literal_element(l2). {
+    res = l1.l2;
+}
+
+literal_elements(res) ::= . {
+    res = '';
+}
+
+literal_element(res) ::= literal(l). {
+    res = l;
+}
+
+literal_element(res) ::= LITERAL(l). {
+    res = l;
+}
+
+smartytag(res)   ::= tag(t) RDEL. {
+    res  = t;
+}
+//
+// output tags start here
+//
+smartytag(res)   ::= SIMPELOUTPUT(i). {
+    $var = trim(substr(i, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        res = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
+    } else {
+        res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+    }
+}
+
+                  // output with optional attributes
+tag(res)   ::= LDEL variable(e). {
+    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
+}
+
+tag(res)   ::= LDEL variable(e) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
+}
+tag(res)   ::= LDEL value(e). {
+    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
+}
+tag(res)   ::= LDEL value(e) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
+}
+
+tag(res)   ::= LDEL expr(e). {
+    res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>e));
+}
+
+tag(res)   ::= LDEL expr(e) attributes(a). {
+    res = $this->compiler->compileTag('private_print_expression',a,array('value'=>e));
+}
+
+//
+// Smarty tags start here
+//
+
+                  // assign new style
+tag(res)   ::= LDEL DOLLARID(i) EQUAL value(e). {
+    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')));
+}
+                  
+tag(res)   ::= LDEL DOLLARID(i) EQUAL expr(e). {
+    res = $this->compiler->compileTag('assign',array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')));
+}
+                 
+tag(res)   ::= LDEL DOLLARID(i) EQUAL expr(e) attributes(a). {
+    res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>'\''.substr(i,1).'\'')),a));
+}                  
+
+tag(res)   ::= LDEL varindexed(vi) EQUAL expr(e) attributes(a). {
+    res = $this->compiler->compileTag('assign',array_merge(array(array('value'=>e),array('var'=>vi['var'])),a),array('smarty_internal_index'=>vi['smarty_internal_index']));
+}
+
+// simple tag like {name}
+smartytag(res)::= SIMPLETAG(t). {
+    $tag = trim(substr(t, $this->lex->ldel_length, -$this->lex->rdel_length));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        res = null;;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                res = $this->compiler->compileTag($match[1],array("'nocache'"));
+            } else {
+                res = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+}
+
+                  // tag with optional Smarty2 style attributes
+tag(res)   ::= LDEL ID(i) attributes(a). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i));
+        } else {
+            res = $this->compiler->compileTag(i,a);
+        }
+}
+tag(res)   ::= LDEL ID(i). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>i));
+        } else {
+            res = $this->compiler->compileTag(i,array());
+        }
+}
+
+
+                  // tag with modifier and optional Smarty2 style attributes
+tag(res)   ::= LDEL ID(i) modifierlist(l)attributes(a). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i, 'modifierlist'=>l));
+        } else {
+            res = '<?php ob_start();?>'.$this->compiler->compileTag(i,a).'<?php echo ';
+            res .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>l,'value'=>'ob_get_clean()')).';?>';
+        }
+}
+
+                  // registered object tag
+tag(res)   ::= LDEL ID(i) PTR ID(m) attributes(a). {
+    res = $this->compiler->compileTag(i,a,array('object_method'=>m));
+}
+
+                  // registered object tag with modifiers
+tag(res)   ::= LDEL ID(i) PTR ID(me) modifierlist(l) attributes(a). {
+    res = '<?php ob_start();?>'.$this->compiler->compileTag(i,a,array('object_method'=>me)).'<?php echo ';
+    res .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>l,'value'=>'ob_get_clean()')).';?>';
+}
+
+                  // {if}, {elseif} and {while} tag
+tag(res)   ::= LDELIF(i) expr(ie). {
+    $tag = trim(substr(i,$this->lex->ldel_length)); 
+    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) expr(ie) attributes(a). {
+    $tag = trim(substr(i,$this->lex->ldel_length));
+    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) statement(ie). {
+    $tag = trim(substr(i,$this->lex->ldel_length));
+    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) statement(ie)  attributes(a). {
+    $tag = trim(substr(i,$this->lex->ldel_length));
+    res = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+}
+
+                  // {for} tag
+tag(res)   ::= LDELFOR statements(st) SEMICOLON expr(ie) SEMICOLON varindexed(v2) foraction(e2) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('ifexp'=>ie),array('var'=>v2),array('step'=>e2))),1);
+}
+
+  foraction(res)   ::= EQUAL expr(e). {
+    res = '='.e;
+}
+
+  foraction(res)   ::= INCDEC(e). {
+    res = e;
+}
+
+tag(res)   ::= LDELFOR statement(st) TO expr(v) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v))),0);
+}
+
+tag(res)   ::= LDELFOR statement(st) TO expr(v) STEP expr(v2) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v),array('step'=>v2))),0);
+}
+
+                  // {foreach} tag
+tag(res)   ::= LDELFOREACH attributes(a). {
+    res = $this->compiler->compileTag('foreach',a);
+}
+
+                  // {foreach $array as $var} tag
+tag(res)   ::= LDELFOREACH SPACE value(v1) AS varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>v1),array('item'=>v0))));
+}
+
+tag(res)   ::= LDELFOREACH SPACE value(v1) AS varvar(v2) APTR varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>v1),array('item'=>v0),array('key'=>v2))));
+}
+
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0))));
+}
+
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v1) APTR varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0),array('key'=>v1))));
+}
+
+                  // {setfilter}
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p). {
+    res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array(m),p))));
+}
+
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p) modifierlist(l). {
+    res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array(m),p)),l)));
+}
+
+                  // {$smarty.block.child} or {$smarty.block.parent}
+tag(res)   ::= LDEL SMARTYBLOCKCHILDPARENT(i). {
+    $j = strrpos(i,'.');
+    if (i[$j+1] == 'c') {
+        // {$smarty.block.child}
+        res = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
+    } else {
+        // {$smarty.block.parent}
+        res = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
+    }
+}
+
+                  
+                  // end of block tag  {/....}                  
+smartytag(res)::= CLOSETAG(t). {
+    $tag = trim(substr(t, $this->lex->ldel_length, -$this->lex->rdel_length), ' /');
+    if ($tag == 'strip') {
+        $this->strip = false;
+        res = null;
+    } else {
+       res = $this->compiler->compileTag($tag.'close',array());
+    }
+ }
+tag(res)   ::= LDELSLASH ID(i). {
+    res = $this->compiler->compileTag(i.'close',array());
+}
+
+tag(res)   ::= LDELSLASH ID(i) modifierlist(l). {
+    res = $this->compiler->compileTag(i.'close',array(),array('modifier_list'=>l));
+}
+
+                  // end of block object tag  {/....}                 
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m). {
+    res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m));
+}
+
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m) modifierlist(l). {
+    res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m, 'modifier_list'=>l));
+}
+
+//
+//Attributes of Smarty tags 
+//
+                  // list of attributes
+attributes(res)  ::= attributes(a1) attribute(a2). {
+    res = a1;
+    res[] = a2;
+}
+
+                  // single attribute
+attributes(res)  ::= attribute(a). {
+    res = array(a);
+}
+
+                  // no attributes
+attributes(res)  ::= . {
+    res = array();
+}
+                  
+                  // attribute
+attribute(res)   ::= SPACE ID(v) EQUAL ID(id). {
+    if (defined(id)) {
+        if ($this->security) {
+            $this->security->isTrustedConstant(id, $this->compiler);
+        }
+        res = array(v=>id);
+    } else {
+        res = array(v=>'\''.id.'\'');
+    }
+}
+
+attribute(res)   ::= ATTR(v) expr(e). {
+    res = array(trim(v," =\n\r\t")=>e);
+}
+
+attribute(res)   ::= ATTR(v) value(e). {
+    res = array(trim(v," =\n\r\t")=>e);
+}
+
+attribute(res)   ::= SPACE ID(v). {
+    res = '\''.v.'\'';
+}
+
+attribute(res)   ::= SPACE expr(e). {
+    res = e;
+}
+
+attribute(res)   ::= SPACE value(v). {
+    res = v;
+}
+
+attribute(res)   ::= SPACE INTEGER(i) EQUAL expr(e). {
+    res = array(i=>e);
+}
+
+                  
+
+//
+// statement
+//
+statements(res)   ::= statement(s). {
+    res = array(s);
+}
+
+statements(res)   ::= statements(s1) COMMA statement(s). {
+    s1[]=s;
+    res = s1;
+}
+
+statement(res)    ::= DOLLARID(i) EQUAL INTEGER(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+statement(res)    ::= DOLLARID(i) EQUAL expr(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+
+statement(res)    ::= varindexed(vi) EQUAL expr(e). {
+    res = array('var' => vi, 'value'=>e);
+}
+
+statement(res)    ::= OPENP statement(st) CLOSEP. {
+    res = st;
+}
+
+
+//
+// expressions
+//
+
+                  // single value
+expr(res)        ::= value(v). {
+    res = v;
+}
+
+                 // ternary
+expr(res)        ::= ternary(v). {
+    res = v;
+}
+
+                 // resources/streams
+expr(res)        ::= DOLLARID(i) COLON ID(i2). {
+    res = '$_smarty_tpl->getStreamVariable(\''.substr(i,1).'://' . i2 . '\')';
+}
+
+                  // arithmetic expression
+expr(res)        ::= expr(e) MATH(m) value(v). {
+    res = e . trim(m) . v;
+}
+
+expr(res)        ::= expr(e) UNIMATH(m) value(v). {
+    res = e . trim(m) . v;
+}
+ 
+                  // array
+expr(res)       ::= array(a). {
+    res = a;
+}
+
+                  // modifier
+expr(res)        ::= expr(e) modifierlist(l). {
+    res = $this->compiler->compileTag('private_modifier',array(),array('value'=>e,'modifierlist'=>l));
+}
+
+// if expression
+                    // simple expression
+expr(res)        ::= expr(e1) lop(c) expr(e2). {
+    res = (isset(c['pre']) ? c['pre'] : '') . e1.c['op'].e2 . (isset(c['pre']) ? ')' : '');
+}
+expr(res)        ::= expr(e1) scond(c). {
+    res = c . e1 . ')';
+}
+
+expr(res)        ::= expr(e1) ISIN array(a).  {
+    res = 'in_array('.e1.','.a.')';
+}
+
+expr(res)        ::= expr(e1) ISIN value(v).  {
+    res = 'in_array('.e1.',(array)'.v.')';
+}
+
+expr(res)        ::= variable(v1) INSTANCEOF(i) ns1(v2). {
+      res = v1.i.v2;
+}
+
+expr(res)        ::= variable(v1) INSTANCEOF(i) variable(v2). {
+      res = v1.i.v2;
+}
+
+
+//
+// ternary
+//
+ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK DOLLARID(e1) COLON  expr(e2). {
+    res = v.' ? '. $this->compiler->compileVariable('\''.substr(e1,1).'\'') . ' : '.e2;
+}
+
+ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK  expr(e1) COLON  expr(e2). {
+    res = v.' ? '.e1.' : '.e2;
+}
+
+                 // value
+value(res)       ::= variable(v). {
+    res = v;
+}
+
+                  // +/- value
+value(res)        ::= UNIMATH(m) value(v). {
+    res = m.v;
+}
+
+                  // logical negation
+value(res)       ::= NOT value(v). {
+    res = '!'.v;
+}
+
+value(res)       ::= TYPECAST(t) value(v). {
+    res = t.v;
+}
+
+value(res)       ::= variable(v) INCDEC(o). {
+    res = v.o;
+}
+
+                 // numeric
+value(res)       ::= HEX(n). {
+    res = n;
+}
+
+value(res)       ::= INTEGER(n). {
+    res = n;
+}
+
+value(res)       ::= INTEGER(n1) DOT INTEGER(n2). {
+    res = n1.'.'.n2;
+}
+
+value(res)       ::= INTEGER(n1) DOT. {
+    res = n1.'.';
+}
+
+value(res)       ::= DOT INTEGER(n1). {
+    res = '.'.n1;
+}
+
+                 // ID, true, false, null
+value(res)       ::= ID(id). {
+    if (defined(id)) {
+        if ($this->security) {
+             $this->security->isTrustedConstant(id, $this->compiler);
+        }
+        res = id;
+    } else {
+        res = '\''.id.'\'';
+    }
+}
+
+                  // function call
+value(res)       ::= function(f). {
+    res = f;
+}
+
+                  // expression
+value(res)       ::= OPENP expr(e) CLOSEP. {
+    res = "(". e .")";
+}
+
+                  // singele quoted string
+value(res)       ::= SINGLEQUOTESTRING(t). {
+    res = t;
+}
+
+                  // double quoted string
+value(res)       ::= doublequoted_with_quotes(s). {
+    res = s;
+}
+
+
+value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
+    self::$prefix_number++;
+    if (vi['var'] == '\'smarty\'') {
+        $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.' = '. $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).';?>';
+     } else {
+        $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.' = '. $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>';
+    }
+    res = '$_tmp'.self::$prefix_number.'::'.r[0].r[1];
+}
+
+                  // Smarty tag
+value(res)       ::= smartytag(st). {
+   self::$prefix_number++;
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', st);
+    $this->compiler->prefix_code[] = $this->compiler->appendCode($tmp, '<?php $_tmp'.self::$prefix_number.'=ob_get_clean();?>');
+    res = '$_tmp'.self::$prefix_number;
+}
+
+value(res)       ::= value(v) modifierlist(l). {
+    res = $this->compiler->compileTag('private_modifier',array(),array('value'=>v,'modifierlist'=>l));
+}
+                  // name space constant
+value(res)       ::= NAMESPACE(c). {
+    res = c;
+}
+
+
+                  // static class access
+value(res)       ::= ns1(c)DOUBLECOLON static_class_access(s). {
+    if (!in_array(strtolower(c), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess(c, s, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[c])) {
+            res = $this->smarty->registered_classes[c].'::'.s[0].s[1];
+        } else {
+            res = c.'::'.s[0].s[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ("static class '".c."' is undefined or not allowed by security setting");
+    }
+}
+//
+// namespace stuff
+//
+
+ns1(res)           ::= ID(i). {
+    res = i;
+}
+
+ns1(res)           ::= NAMESPACE(i). {
+    res = i;
+    }
+
+
+
+
+//
+// variables 
+//
+                  // Smarty variable (optional array)
+variable(res)    ::= DOLLARID(i). {
+   res = $this->compiler->compileVariable('\''.substr(i,1).'\'');
+}
+variable(res)    ::= varindexed(vi). {
+    if (vi['var'] == '\'smarty\'') {
+        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']);
+        res = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = vi['var'];
+        $this->last_index = vi['smarty_internal_index'];
+        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'];
+    }
+}
+
+                  // variable with property
+variable(res)    ::= varvar(v) AT ID(p). {
+    res = '$_smarty_tpl->tpl_vars['. v .']->'.p;
+}
+
+                  // object
+variable(res)    ::= object(o). {
+    res = o;
+}
+
+                  // config variable
+variable(res)    ::= HATCH ID(i) HATCH. {
+    res = $this->compiler->compileConfigVariable("'" . i . "'");
+}
+
+variable(res)    ::= HATCH ID(i) HATCH arrayindex(a). {
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable("'" . i . "'") . ') ? $tmp'.a.' :null)';
+}
+
+variable(res)    ::= HATCH variable(v) HATCH. {
+    res = $this->compiler->compileConfigVariable(v);
+}
+
+variable(res)    ::= HATCH variable(v) HATCH arrayindex(a). {
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable(v) . ') ? $tmp'.a.' : null)';
+}
+
+varindexed(res)  ::= DOLLARID(i) arrayindex(a). {
+    res = array('var'=>'\''.substr(i,1).'\'', 'smarty_internal_index'=>a);
+}
+varindexed(res)  ::= varvar(v) arrayindex(a). {
+    res = array('var'=>v, 'smarty_internal_index'=>a);
+}
+
+//
+// array index
+//
+                    // multiple array index
+arrayindex(res)  ::= arrayindex(a1) indexdef(a2). {
+    res = a1.a2;
+}
+
+                    // no array index
+arrayindex        ::= . {
+    return;
+}
+
+// single index definition
+                    // Smarty2 style index 
+indexdef(res)    ::= DOT DOLLARID(i).  {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+}
+indexdef(res)    ::= DOT varvar(v).  {
+    res = '['.$this->compiler->compileVariable(v).']';
+}
+
+indexdef(res)    ::= DOT varvar(v) AT ID(p). {
+    res = '['.$this->compiler->compileVariable(v).'->'.p.']';
+}
+
+indexdef(res)   ::= DOT ID(i). {
+    if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = '['. i .']';
+        } else {
+            res = "['". i ."']";
+        }
+}
+
+indexdef(res)   ::= DOT INTEGER(n). {
+    res = '['. n .']';
+}
+
+
+indexdef(res)   ::= DOT LDEL expr(e) RDEL. {
+    res = '['. e .']';
+}
+
+                    // section tag index
+indexdef(res)   ::= OPENB ID(i)CLOSEB. {
+    res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\'index\']').']';
+}
+
+indexdef(res)   ::= OPENB ID(i) DOT ID(i2) CLOSEB. {
+    res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\''.i2.'\']').']';
+}
+indexdef(res)   ::= OPENB SINGLEQUOTESTRING(s) CLOSEB. {
+    res = '['.s.']';
+}
+indexdef(res)   ::= OPENB INTEGER(n) CLOSEB. {
+    res = '['.n.']';
+}
+indexdef(res)   ::= OPENB DOLLARID(i) CLOSEB. {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';;
+}
+indexdef(res)   ::= OPENB variable(v) CLOSEB. {
+    res = '['.v.']';
+}
+indexdef(res)   ::= OPENB value(v) CLOSEB. {
+    res = '['.v.']';
+}
+
+                    // PHP style index
+indexdef(res)   ::= OPENB expr(e) CLOSEB. {
+    res = '['. e .']';
+}
+
+                    // for assign append array
+indexdef(res)  ::= OPENB CLOSEB. {
+    res = '[]';
+}
+
+
+//
+// variable variable names
+//
+
+                    // singel identifier element
+varvar(res)      ::= DOLLARID(i). {
+    res = '\''.substr(i,1).'\'';
+}
+                    // single $
+varvar(res)      ::= DOLLAR. {
+    res = "''";
+}
+
+                    // sequence of identifier elements
+varvar(res)      ::= varvar(v1) varvarele(v2). {
+    res = v1.'.'.v2;
+}
+
+                    // fix sections of element
+varvarele(res)   ::= ID(s). {
+    res = '\''.s.'\'';
+}
+varvarele(res)   ::= SIMPELOUTPUT(i). {
+    $var = trim(substr(i, $this->lex->ldel_length, -$this->lex->rdel_length), ' $');
+    res = $this->compiler->compileVariable('\''.$var.'\'');
+}
+
+                    // variable sections of element
+varvarele(res)   ::= LDEL expr(e) RDEL. {
+    res = '('.e.')';
+}
+
+//
+// objects
+//
+object(res)    ::= varindexed(vi) objectchain(oc). {
+    if (vi['var'] == '\'smarty\'') {
+        res =  $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).oc;
+    } else {
+        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].oc;
+    }
+}
+
+                    // single element
+objectchain(res) ::= objectelement(oe). {
+    res  = oe;
+}
+
+                    // chain of elements 
+objectchain(res) ::= objectchain(oc) objectelement(oe). {
+    res  = oc.oe;
+}
+
+                    // variable
+objectelement(res)::= PTR ID(i) arrayindex(a). {
+    if ($this->security && substr(i,0,1) == '_') {
+        $this->compiler->trigger_template_error (self::Err1);
+    }
+    res = '->'.i.a;
+}
+
+objectelement(res)::= PTR varvar(v) arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    res = '->{'.$this->compiler->compileVariable(v).a.'}';
+}
+
+objectelement(res)::= PTR LDEL expr(e) RDEL arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    res = '->{'.e.a.'}';
+}
+
+objectelement(res)::= PTR ID(ii) LDEL expr(e) RDEL arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    res = '->{\''.ii.'\'.'.e.a.'}';
+}
+
+                    // method
+objectelement(res)::= PTR method(f).  {
+    res = '->'.f;
+}
+
+
+//
+// function
+//
+function(res)     ::= ns1(f) OPENP params(p) CLOSEP. {
+    if (!$this->security || $this->security->isTrustedPhpFunction(f, $this->compiler)) {
+        if (strcasecmp(f,'isset') === 0 || strcasecmp(f,'empty') === 0 || strcasecmp(f,'array') === 0 || is_callable(f)) {
+            $func_name = strtolower(f);
+            if ($func_name == 'isset') {
+                if (count(p) == 0) {
+                    $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
+                }
+                $par = implode(',',p);
+                if (strncasecmp($par,'$_smarty_tpl->smarty->ext->_config->_getConfigVariable',strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0) {
+                    self::$prefix_number++;
+                    $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.'='.str_replace(')',', false)',$par).';?>';
+                    $isset_par = '$_tmp'.self::$prefix_number;
+                } else {
+                    $isset_par=str_replace("')->value","',null,true,false)->value",$par);
+                }
+                res = f . "(". $isset_par .")";
+            } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
+                if (count(p) != 1) {
+                    $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
+                }
+                if ($func_name == 'empty') {
+                    res = $func_name.'('.str_replace("')->value","',null,true,false)->value",p[0]).')';
+                } else {
+                    res = $func_name.'('.p[0].')';
+                }
+            } else {
+                res = f . "(". implode(',',p) .")";
+            }
+        } else {
+            $this->compiler->trigger_template_error ("unknown function \"" . f . "\"");
+        }
+    }
+}
+
+
+//
+// method
+//
+method(res)     ::= ID(f) OPENP params(p) CLOSEP. {
+    if ($this->security && substr(f,0,1) == '_') {
+        $this->compiler->trigger_template_error (self::Err1);
+    }
+    res = f . "(". implode(',',p) .")";
+}
+
+method(res)     ::= DOLLARID(f) OPENP params(p) CLOSEP.  {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    self::$prefix_number++;
+    $this->compiler->prefix_code[] = '<?php $_tmp'.self::$prefix_number.'='.$this->compiler->compileVariable('\''.substr(f,1).'\'').';?>';
+    res = '$_tmp'.self::$prefix_number.'('. implode(',',p) .')';
+}
+
+// function/method parameter
+                    // multiple parameters
+params(res)       ::= params(p) COMMA expr(e). {
+    res = array_merge(p,array(e));
+}
+
+                    // single parameter
+params(res)       ::= expr(e). {
+    res = array(e);
+}
+
+                    // kein parameter
+params(res)       ::= . {
+    res = array();
+}
+
+//
+// modifier
+// 
+modifierlist(res) ::= modifierlist(l) modifier(m) modparameters(p). {
+    res = array_merge(l,array(array_merge(m,p)));
+}
+
+modifierlist(res) ::= modifier(m) modparameters(p). {
+    res = array(array_merge(m,p));
+}
+ 
+modifier(res)    ::= VERT AT ID(m). {
+    res = array(m);
+}
+
+modifier(res)    ::= VERT ID(m). {
+    res =  array(m);
+}
+
+//
+// modifier parameter
+//
+                    // multiple parameter
+modparameters(res) ::= modparameters(mps) modparameter(mp). {
+    res = array_merge(mps,mp);
+}
+
+                    // no parameter
+modparameters(res)      ::= . {
+    res = array();
+}
+
+                    // parameter expression
+modparameter(res) ::= COLON value(mp). {
+    res = array(mp);
+}
+
+modparameter(res) ::= COLON array(mp). {
+    res = array(mp);
+}
+
+                  // static class methode call
+static_class_access(res)       ::= method(m). {
+    res = array(m, '', 'method');
+}
+
+                  // static class methode call with object chainig
+static_class_access(res)       ::= method(m) objectchain(oc). {
+    res = array(m, oc, 'method');
+}
+
+                  // static class constant
+static_class_access(res)       ::= ID(v). {
+    res = array(v, '');
+}
+
+                  // static class variables
+static_class_access(res)       ::=  DOLLARID(v) arrayindex(a). {
+    res = array(v, a, 'property');
+}
+
+                  // static class variables with object chain
+static_class_access(res)       ::= DOLLARID(v) arrayindex(a) objectchain(oc). {
+    res = array(v, a.oc, 'property');
+}
+
+
+// if conditions and operators
+lop(res)        ::= LOGOP(o). {
+    res['op'] = ' '. trim(o) . ' ';
+}
+
+lop(res)        ::= TLOGOP(o). {
+    static $lops = array(
+        'eq' => array('op' => ' == ', 'pre' => null),
+        'ne' => array('op' => ' != ', 'pre' => null),
+        'neq' => array('op' => ' != ', 'pre' => null),
+        'gt' => array('op' => ' > ', 'pre' => null),
+        'ge' => array('op' => ' >= ', 'pre' => null),
+        'gte' => array('op' => ' >= ', 'pre' => null),
+        'lt' => array('op' => ' < ', 'pre' => null),
+        'le' => array('op' => ' <= ', 'pre' => null),
+        'lte' => array('op' => ' <= ', 'pre' => null),
+        'mod' => array('op' => ' % ', 'pre' => null),
+        'and' => array('op' => ' && ', 'pre' => null),
+        'or' => array('op' => ' || ', 'pre' => null),
+        'xor' => array('op' => ' xor ', 'pre' => null),
+        'isdivby' => array('op' => ' % ', 'pre' => '!('),
+        'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+        'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+        'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+        'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+        'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+        );
+    $op = strtolower(preg_replace('/\s*/', '', o));
+    res = $lops[$op];
+}
+
+scond(res)  ::= SINGLECOND(o). {
+        static $scond = array (
+            'iseven' => '!(1 & ',
+            'isnoteven' => '(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
+        );
+   $op = strtolower(str_replace(' ', '', o));
+   res = $scond[$op];
+}
+
+//
+// ARRAY element assignment
+//
+array(res)           ::=  OPENB arrayelements(a) CLOSEB.  {
+    res = 'array('.a.')';
+}
+
+arrayelements(res)   ::=  arrayelement(a).  {
+    res = a;
+}
+
+arrayelements(res)   ::=  arrayelements(a1) COMMA arrayelement(a).  {
+    res = a1.','.a;
+}
+
+arrayelements        ::=  .  {
+    return;
+}
+
+arrayelement(res)    ::=  value(e1) APTR expr(e2). {
+    res = e1.'=>'.e2;
+}
+
+arrayelement(res)    ::=  ID(i) APTR expr(e2). { 
+    res = '\''.i.'\'=>'.e2;
+}
+
+arrayelement(res)    ::=  expr(e). {
+    res = e;
+}
+
+
+//
+// double qouted strings
+//
+doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
+    res = "''";
+}
+
+doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
+    res = s->to_smarty_php($this);
+}
+
+
+doublequoted(res)          ::= doublequoted(o1) doublequotedcontent(o2). {
+    o1->append_subtree($this, o2);
+    res = o1;
+}
+
+doublequoted(res)          ::= doublequotedcontent(o). {
+    res = new Smarty_Internal_ParseTree_Dq($this, o);
+}
+
+doublequotedcontent(res)           ::=  BACKTICK variable(v) BACKTICK. {
+    res = new Smarty_Internal_ParseTree_Code('(string)'.v);
+}
+
+doublequotedcontent(res)           ::=  BACKTICK expr(e) BACKTICK. {
+    res = new Smarty_Internal_ParseTree_Code('(string)'.e);
+}
+
+doublequotedcontent(res)           ::=  DOLLARID(i). {
+    res = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr(i,1) .'\']->value');
+}
+
+doublequotedcontent(res)           ::=  LDEL variable(v) RDEL. {
+    res = new Smarty_Internal_ParseTree_Code('(string)'.v);
+}
+
+doublequotedcontent(res)           ::=  LDEL expr(e) RDEL. {
+    res = new Smarty_Internal_ParseTree_Code('(string)('.e.')');
+}
+
+doublequotedcontent(res)     ::=  smartytag(st). {
+    res = new Smarty_Internal_ParseTree_Tag($this, st);
+}
+
+doublequotedcontent(res)           ::=  TEXT(o). {
+    res = new Smarty_Internal_ParseTree_DqContent(o);
+}
+
diff --git a/sources/include/smarty/libs/Autoloader.php b/sources/include/smarty/libs/Autoloader.php
new file mode 100644
index 0000000..7d0c388
--- /dev/null
+++ b/sources/include/smarty/libs/Autoloader.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Smarty Autoloader
+ *
+ * @package    Smarty
+ */
+
+/**
+ * Smarty Autoloader
+ *
+ * @package    Smarty
+ * @author     Uwe Tews
+ *             Usage:
+ *             require_once '...path/Autoloader.php';
+ *             Smarty_Autoloader::register();
+ *             $smarty = new Smarty();
+ *             Note:       This autoloader is not needed if you use Composer.
+ *             Composer will automatically add the classes of the Smarty package to it common autoloader.
+ */
+class Smarty_Autoloader
+{
+    /**
+     * Filepath to Smarty root
+     *
+     * @var string
+     */
+    public static $SMARTY_DIR = '';
+
+    /**
+     * Filepath to Smarty internal plugins
+     *
+     * @var string
+     */
+    public static $SMARTY_SYSPLUGINS_DIR = '';
+
+    /**
+     * Array with Smarty core classes and their filename
+     *
+     * @var array
+     */
+    public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
+
+    /**
+     * Registers Smarty_Autoloader backward compatible to older installations.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function registerBC($prepend = false)
+    {
+        /**
+         * register the class autoloader
+         */
+        if (!defined('SMARTY_SPL_AUTOLOAD')) {
+            define('SMARTY_SPL_AUTOLOAD', 0);
+        }
+        if (SMARTY_SPL_AUTOLOAD &&
+            set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
+        ) {
+            $registeredAutoLoadFunctions = spl_autoload_functions();
+            if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
+                spl_autoload_register();
+            }
+        } else {
+            self::register($prepend);
+        }
+    }
+
+    /**
+     * Registers Smarty_Autoloader as an SPL autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function register($prepend = false)
+    {
+        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
+        self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
+            self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
+        if (version_compare(phpversion(), '5.3.0', '>=')) {
+            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+        } else {
+            spl_autoload_register(array(__CLASS__, 'autoload'));
+        }
+    }
+
+    /**
+     * Handles auto loading of classes.
+     *
+     * @param string $class A class name.
+     */
+    public static function autoload($class)
+    {
+        $_class = strtolower($class);
+        $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+        if (strpos($_class, 'smarty_internal_') === 0) {
+            if (strpos($_class, 'smarty_internal_compile_') === 0) {
+                if (is_file($file)) {
+                    require $file;
+                }
+                return;
+            }
+            @include $file;
+            return;
+        }
+        if (preg_match('/^(smarty_(((template_(source|config|cache|compiled|resource_base))|((cached|compiled)?resource)|(variable|security)))|(smarty(bc)?)$)/',
+                       $_class, $match)) {
+            if (!empty($match[3])) {
+                @include $file;
+                return;
+            } elseif (!empty($match[9]) && isset(self::$rootClasses[$_class])) {
+                $file = self::$rootClasses[$_class];
+                require $file;
+                return;
+            }
+        }
+        if (0 !== strpos($_class, 'smarty')) {
+            return;
+        }
+        if (is_file($file)) {
+            require $file;
+            return;
+        }
+        return;
+    }
+}
diff --git a/sources/include/smarty/libs/Smarty.class.php b/sources/include/smarty/libs/Smarty.class.php
index 40532fc..a029f94 100644
--- a/sources/include/smarty/libs/Smarty.class.php
+++ b/sources/include/smarty/libs/Smarty.class.php
@@ -2,7 +2,6 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4694 2013-01-13 21:13:14Z uwe.tews@googlemail.com $
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,18 +16,18 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * For questions, help, comments, discussion, etc., please join the
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
  *
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @author Rodney Rehm
- * @package Smarty
- * @version 3.1.13
+ * @link      http://www.smarty.net/
+ * @copyright 2015 New Digital Group, Inc.
+ * @copyright 2015 Uwe Tews
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews
+ * @author    Rodney Rehm
+ * @package   Smarty
+ * @version   3.1.29
  */
 
 /**
@@ -57,7 +56,7 @@ if (!defined('SMARTY_PLUGINS_DIR')) {
     define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
 }
 if (!defined('SMARTY_MBSTRING')) {
-    define('SMARTY_MBSTRING', function_exists('mb_split'));
+    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
 if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
     // UTF-8 can only be done properly when mbstring is available!
@@ -74,38 +73,44 @@ if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
 }
 
 /**
- * register the class autoloader
+ * Try loading the Smarty_Internal_Data class
+ * If we fail we must load Smarty's autoloader.
+ * Otherwise we may have a global autoloader like Composer
  */
-if (!defined('SMARTY_SPL_AUTOLOAD')) {
-    define('SMARTY_SPL_AUTOLOAD', 0);
-}
-
-if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
-    $registeredAutoLoadFunctions = spl_autoload_functions();
-    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-        spl_autoload_register();
+if (!class_exists('Smarty_Autoloader', false)) {
+    if (!class_exists('Smarty_Internal_Data', true)) {
+        require_once dirname(__FILE__) . '/Autoloader.php';
+        Smarty_Autoloader::registerBC();
     }
-} else {
-    spl_autoload_register('smartyAutoload');
 }
 
 /**
  * Load always needed external class files
  */
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_data.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_templatebase.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_template.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_resource.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_resource_file.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_cacheresource.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_cacheresource_file.php';
+if (!class_exists('Smarty_Internal_Data', false)) {
+    require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
+}
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_extension_handler.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php';
 
 /**
  * This is the main Smarty class
+ *
  * @package Smarty
+ *
+ * @method int clearAllCache(int $exp_time = null, string $type = null)
+ * @method int clearCache(string $template_name, string $cache_id = null, string $compile_id = null, int $exp_time = null, string $type = null)
+ * @method int compileAllTemplates(Smarty $smarty, string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ * @method int compileAllConfig(Smarty $smarty, string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ *
  */
-class Smarty extends Smarty_Internal_TemplateBase {
-
+class Smarty extends Smarty_Internal_TemplateBase
+{
     /**#@+
      * constant definitions
      */
@@ -113,50 +118,103 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * smarty version
      */
-    const SMARTY_VERSION = 'Smarty-3.1.13';
+    const SMARTY_VERSION = '3.1.29';
 
     /**
      * define variable scopes
      */
     const SCOPE_LOCAL = 0;
-    const SCOPE_PARENT = 1;
-    const SCOPE_ROOT = 2;
-    const SCOPE_GLOBAL = 3;
+
+    const SCOPE_PARENT = 2;
+
+    const SCOPE_TPL_ROOT = 4;
+
+    const SCOPE_ROOT = 8;
+
+    const SCOPE_SMARTY = 16;
+
+    const SCOPE_GLOBAL = 32;
+
+    const SCOPE_BUBBLE_UP = 64;
+
     /**
      * define caching modes
      */
     const CACHING_OFF = 0;
+
     const CACHING_LIFETIME_CURRENT = 1;
+
     const CACHING_LIFETIME_SAVED = 2;
+
+    /**
+     * define constant for clearing cache files be saved expiration dates
+     */
+    const CLEAR_EXPIRED = - 1;
+
     /**
      * define compile check modes
      */
     const COMPILECHECK_OFF = 0;
+
     const COMPILECHECK_ON = 1;
+
     const COMPILECHECK_CACHEMISS = 2;
+
+    /**
+     * define debug modes
+     */
+    const DEBUG_OFF = 0;
+
+    const DEBUG_ON = 1;
+
+    const DEBUG_INDIVIDUAL = 2;
+
     /**
      * modes for handling of "<?php ... ?>" tags in templates.
      */
     const PHP_PASSTHRU = 0; //-> print tags as plain text
+
     const PHP_QUOTE = 1; //-> escape tags as entities
+
     const PHP_REMOVE = 2; //-> escape tags as entities
+
     const PHP_ALLOW = 3; //-> escape tags as entities
+
     /**
      * filter types
      */
     const FILTER_POST = 'post';
+
     const FILTER_PRE = 'pre';
+
     const FILTER_OUTPUT = 'output';
+
     const FILTER_VARIABLE = 'variable';
+
     /**
      * plugin types
      */
     const PLUGIN_FUNCTION = 'function';
+
     const PLUGIN_BLOCK = 'block';
+
     const PLUGIN_COMPILER = 'compiler';
+
     const PLUGIN_MODIFIER = 'modifier';
+
     const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
 
+    /**
+     * Resource caching modes
+     */
+    const RESOURCE_CACHE_OFF = 0;
+
+    const RESOURCE_CACHE_AUTOMATIC = 1; // cache template objects by rules
+
+    const RESOURCE_CACHE_TEMPLATE = 2; // cache all template objects
+
+    const RESOURCE_CACHE_ON = 4;    // cache source and compiled resources
+
     /**#@-*/
 
     /**
@@ -165,26 +223,31 @@ class Smarty extends Smarty_Internal_TemplateBase {
     public static $global_tpl_vars = array();
 
     /**
-     * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
+     * error handler returned by set_error_handler() in Smarty::muteExpectedErrors()
      */
     public static $_previous_error_handler = null;
+
     /**
      * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
      */
     public static $_muted_directories = array();
+
     /**
      * Flag denoting if Multibyte String functions are available
      */
     public static $_MBSTRING = SMARTY_MBSTRING;
+
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
     public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+
     /**
      * The date format to be used internally
      * (accepts date() and strftime())
      */
     public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+
     /**
      * Flag denoting if PCRE should run in UTF-8 mode
      */
@@ -200,216 +263,227 @@ class Smarty extends Smarty_Internal_TemplateBase {
      */
 
     /**
-     * auto literal on delimiters with whitspace
+     * auto literal on delimiters with whitespace
+     *
      * @var boolean
      */
     public $auto_literal = true;
+
     /**
      * display error on not assigned variables
+     *
      * @var boolean
      */
     public $error_unassigned = false;
+
     /**
-     * look up relative filepaths in include_path
+     * look up relative file path in include_path
+     *
      * @var boolean
      */
     public $use_include_path = false;
+
     /**
      * template directory
+     *
      * @var array
      */
-    private $template_dir = array();
+    private $template_dir = array('./templates/');
+
     /**
      * joined template directory string used in cache keys
+     *
      * @var string
      */
-    public $joined_template_dir = null;
+    public $_joined_template_dir = null;
+
     /**
      * joined config directory string used in cache keys
+     *
      * @var string
      */
-    public $joined_config_dir = null;
+    public $_joined_config_dir = null;
+
     /**
      * default template handler
+     *
      * @var callable
      */
     public $default_template_handler_func = null;
+
     /**
      * default config handler
+     *
      * @var callable
      */
     public $default_config_handler_func = null;
+
     /**
      * default plugin handler
+     *
      * @var callable
      */
     public $default_plugin_handler_func = null;
+
     /**
      * compile directory
+     *
      * @var string
      */
-    private $compile_dir = null;
+    private $compile_dir = './templates_c/';
+
     /**
      * plugins directory
+     *
      * @var array
      */
-    private $plugins_dir = array();
+    private $plugins_dir = null;
+
     /**
      * cache directory
+     *
      * @var string
      */
-    private $cache_dir = null;
+    private $cache_dir = './cache/';
+
     /**
      * config directory
+     *
      * @var array
      */
-    private $config_dir = array();
+    private $config_dir = array('./configs/');
+
     /**
      * force template compiling?
+     *
      * @var boolean
      */
     public $force_compile = false;
+
     /**
      * check template for modifications?
+     *
      * @var boolean
      */
     public $compile_check = true;
+
     /**
      * use sub dirs for compiled/cached files?
+     *
      * @var boolean
      */
     public $use_sub_dirs = false;
+
     /**
      * allow ambiguous resources (that are made unique by the resource handler)
+     *
      * @var boolean
      */
     public $allow_ambiguous_resources = false;
-    /**
-     * caching enabled
-     * @var boolean
-     */
-    public $caching = false;
+
     /**
      * merge compiled includes
+     *
      * @var boolean
      */
     public $merge_compiled_includes = false;
-    /**
-     * cache lifetime in seconds
-     * @var integer
-     */
-    public $cache_lifetime = 3600;
+
     /**
      * force cache file creation
+     *
      * @var boolean
      */
     public $force_cache = false;
-    /**
-     * Set this if you want different sets of cache files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $compile_id = null;
+
     /**
      * template left-delimiter
+     *
      * @var string
      */
     public $left_delimiter = "{";
+
     /**
      * template right-delimiter
+     *
      * @var string
      */
     public $right_delimiter = "}";
+
     /**#@+
      * security
      */
     /**
      * class name
-     *
      * This should be instance of Smarty_Security.
      *
      * @var string
      * @see Smarty_Security
      */
     public $security_class = 'Smarty_Security';
+
     /**
      * implementation of security class
      *
      * @var Smarty_Security
      */
     public $security_policy = null;
+
     /**
      * controls handling of PHP-blocks
      *
      * @var integer
      */
     public $php_handling = self::PHP_PASSTHRU;
+
     /**
      * controls if the php template file resource is allowed
      *
      * @var bool
      */
     public $allow_php_templates = false;
-    /**
-     * Should compiled-templates be prevented from being called directly?
-     *
-     * {@internal
-     * Currently used by Smarty_Internal_Template only.
-     * }}
-     *
-     * @var boolean
-     */
-    public $direct_access_security = true;
+
     /**#@-*/
     /**
      * debug mode
-     *
      * Setting this to true enables the debug-console.
      *
      * @var boolean
      */
     public $debugging = false;
+
     /**
      * This determines if debugging is enable-able from the browser.
      * <ul>
      *  <li>NONE => no debugging control allowed</li>
      *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
      * </ul>
+     *
      * @var string
      */
     public $debugging_ctrl = 'NONE';
+
     /**
      * Name of debugging URL-param.
-     *
      * Only used when $debugging_ctrl is set to 'URL'.
      * The name of the URL-parameter that activates debugging.
      *
-     * @var type
+     * @var string
      */
     public $smarty_debug_id = 'SMARTY_DEBUG';
+
     /**
      * Path of debug template.
+     *
      * @var string
      */
     public $debug_tpl = null;
+
     /**
      * When set, smarty uses this value as error_reporting-level.
+     *
      * @var int
      */
     public $error_reporting = null;
-    /**
-     * Internal flag for getTags()
-     * @var boolean
-     */
-    public $get_used_tags = false;
 
     /**#@+
      * config var settings
@@ -417,16 +491,21 @@ class Smarty extends Smarty_Internal_TemplateBase {
 
     /**
      * Controls whether variables with the same name overwrite each other.
+     *
      * @var boolean
      */
     public $config_overwrite = true;
+
     /**
      * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
+     *
      * @var boolean
      */
     public $config_booleanize = true;
+
     /**
      * Controls whether hidden config sections/vars are read from the file.
+     *
      * @var boolean
      */
     public $config_read_hidden = false;
@@ -439,287 +518,225 @@ class Smarty extends Smarty_Internal_TemplateBase {
 
     /**
      * locking concurrent compiles
+     *
      * @var boolean
      */
     public $compile_locking = true;
+
     /**
-     * Controls whether cache resources should emply locking mechanism
+     * Controls whether cache resources should use locking mechanism
+     *
      * @var boolean
      */
     public $cache_locking = false;
+
     /**
      * seconds to wait for acquiring a lock before ignoring the write lock
+     *
      * @var float
      */
     public $locking_timeout = 10;
 
     /**#@-*/
 
-    /**
-     * global template functions
-     * @var array
-     */
-    public $template_functions = array();
     /**
      * resource type used if none given
-     *
      * Must be an valid key of $registered_resources.
+     *
      * @var string
      */
     public $default_resource_type = 'file';
+
     /**
      * caching type
-     *
      * Must be an element of $cache_resource_types.
      *
      * @var string
      */
     public $caching_type = 'file';
-    /**
-     * internal config properties
-     * @var array
-     */
-    public $properties = array();
+
     /**
      * config type
+     *
      * @var string
      */
     public $default_config_type = 'file';
+
     /**
-     * cached template objects
-     * @var array
+     * enable resource caching
+     *
+     * @var bool
      */
-    public $template_objects = array();
+    public $resource_cache_mode = 1;
+
     /**
      * check If-Modified-Since headers
+     *
      * @var boolean
      */
     public $cache_modified_check = false;
+
     /**
      * registered plugins
-     * @var array
-     */
-    public $registered_plugins = array();
-    /**
-     * plugin search order
-     * @var array
-     */
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
-    /**
-     * registered objects
-     * @var array
-     */
-    public $registered_objects = array();
-    /**
-     * registered classes
-     * @var array
-     */
-    public $registered_classes = array();
-    /**
-     * registered filters
-     * @var array
-     */
-    public $registered_filters = array();
-    /**
-     * registered resources
-     * @var array
-     */
-    public $registered_resources = array();
-    /**
-     * resource handler cache
-     * @var array
-     */
-    public $_resource_handlers = array();
-    /**
-     * registered cache resources
-     * @var array
-     */
-    public $registered_cache_resources = array();
-    /**
-     * cache resource handler cache
-     * @var array
-     */
-    public $_cacheresource_handlers = array();
-    /**
-     * autoload filter
-     * @var array
-     */
-    public $autoload_filters = array();
-    /**
-     * default modifier
-     * @var array
-     */
-    public $default_modifiers = array();
-    /**
-     * autoescape variable output
-     * @var boolean
-     */
-    public $escape_html = false;
-    /**
-     * global internal smarty vars
-     * @var array
-     */
-    public static $_smarty_vars = array();
-    /**
-     * start time for execution time calculation
-     * @var int
-     */
-    public $start_time = 0;
-    /**
-     * default file permissions
-     * @var int
-     */
-    public $_file_perms = 0644;
-    /**
-     * default dir permissions
-     * @var int
-     */
-    public $_dir_perms = 0771;
-    /**
-     * block tag hierarchy
-     * @var array
-     */
-    public $_tag_stack = array();
-    /**
-     * self pointer to Smarty object
-     * @var Smarty
-     */
-    public $smarty;
-    /**
-     * required by the compiler for BC
-     * @var string
-     */
-    public $_current_file = null;
-    /**
-     * internal flag to enable parser debugging
-     * @var bool
-     */
-    public $_parserdebug = false;
-    /**
-     * Saved parameter of merged templates during compilation
      *
      * @var array
      */
-    public $merged_templates_func = array();
+    public $registered_plugins = array();
+
+    /**
+     * registered objects
+     *
+     * @var array
+     */
+    public $registered_objects = array();
+
+    /**
+     * registered classes
+     *
+     * @var array
+     */
+    public $registered_classes = array();
+
+    /**
+     * registered filters
+     *
+     * @var array
+     */
+    public $registered_filters = array();
+
+    /**
+     * registered resources
+     *
+     * @var array
+     */
+    public $registered_resources = array();
+
+    /**
+     * registered cache resources
+     *
+     * @var array
+     */
+    public $registered_cache_resources = array();
+
+    /**
+     * autoload filter
+     *
+     * @var array
+     */
+    public $autoload_filters = array();
+
+    /**
+     * default modifier
+     *
+     * @var array
+     */
+    public $default_modifiers = array();
+
+    /**
+     * autoescape variable output
+     *
+     * @var boolean
+     */
+    public $escape_html = false;
+
+    /**
+     * start time for execution time calculation
+     *
+     * @var int
+     */
+    public $start_time = 0;
+
+    /**
+     * required by the compiler for BC
+     *
+     * @var string
+     */
+    public $_current_file = null;
+
+    /**
+     * internal flag to enable parser debugging
+     *
+     * @var bool
+     */
+    public $_parserdebug = false;
+
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 1;
+
+    /**
+     * Debug object
+     *
+     * @var Smarty_Internal_Debug
+     */
+    public $_debug = null;
+
+    /**
+     * removed properties
+     *
+     * @var string[]
+     */
+    private static $obsoleteProperties = array('resource_caching', 'template_resource_caching',
+                                               'direct_access_security', '_dir_perms', '_file_perms',
+                                               'plugin_search_order', 'inheritance_merge_compiled_includes');
+
+    /**
+     * List of private properties which will call getter/setter ona direct access
+     *
+     * @var array
+     */
+    private static $accessMap = array('template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir',
+                                      'plugins_dir'  => 'PluginsDir', 'compile_dir' => 'CompileDir',
+                                      'cache_dir'    => 'CacheDir',);
+
     /**#@-*/
 
     /**
      * Initialize new Smarty object
-     *
      */
     public function __construct()
     {
-        // selfpointer needed by some other class methods
-        $this->smarty = $this;
+        parent::__construct();
         if (is_callable('mb_internal_encoding')) {
             mb_internal_encoding(Smarty::$_CHARSET);
         }
         $this->start_time = microtime(true);
-        // set default dirs
-        $this->setTemplateDir('.' . DS . 'templates' . DS)
-            ->setCompileDir('.' . DS . 'templates_c' . DS)
-            ->setPluginsDir(SMARTY_PLUGINS_DIR)
-            ->setCacheDir('.' . DS . 'cache' . DS)
-            ->setConfigDir('.' . DS . 'configs' . DS);
 
-        $this->debug_tpl = 'file:' . dirname(__FILE__) . '/debug.tpl';
         if (isset($_SERVER['SCRIPT_NAME'])) {
-            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
+            Smarty::$global_tpl_vars['SCRIPT_NAME'] = new Smarty_Variable($_SERVER['SCRIPT_NAME']);
         }
-    }
 
+        // Check if we're running on windows
+        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
 
-    /**
-     * Class destructor
-     */
-    public function __destruct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * <<magic>> set selfpointer on cloned object
-     */
-    public function __clone()
-    {
-        $this->smarty = $this;
-    }
-
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
-     *
-     * @param string $name property name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $allowed = array(
-        'template_dir' => 'getTemplateDir',
-        'config_dir' => 'getConfigDir',
-        'plugins_dir' => 'getPluginsDir',
-        'compile_dir' => 'getCompileDir',
-        'cache_dir' => 'getCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            return $this->{$allowed[$name]}();
-        } else {
-            trigger_error('Undefined property: '. get_class($this) .'::$'. $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
-     *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
-     */
-    public function __set($name, $value)
-    {
-        $allowed = array(
-        'template_dir' => 'setTemplateDir',
-        'config_dir' => 'setConfigDir',
-        'plugins_dir' => 'setPluginsDir',
-        'compile_dir' => 'setCompileDir',
-        'cache_dir' => 'setCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            $this->{$allowed[$name]}($value);
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+        if (Smarty::$_CHARSET !== 'UTF-8') {
+            Smarty::$_UTF8_MODIFIER = '';
         }
     }
 
     /**
      * Check if a template resource exists
      *
-     * @param string $resource_name template name
+     * @param  string $resource_name template name
+     *
      * @return boolean status
      */
     public function templateExists($resource_name)
     {
-        // create template object
-        $save = $this->template_objects;
-        $tpl = new $this->template_class($resource_name, $this);
-        // check if it does exists
-        $result = $tpl->source->exists;
-        $this->template_objects = $save;
-        return $result;
+        // create source object
+        $source = Smarty_Template_Source::load(null, $this, $resource_name);
+        return $source->exists;
     }
 
     /**
      * Returns a single or all global  variables
      *
-     * @param object $smarty
-     * @param string $varname variable name or null
+     * @param  string $varname variable name or null
+     *
      * @return string variable value or or array of variables
      */
     public function getGlobal($varname = null)
@@ -735,74 +752,28 @@ class Smarty extends Smarty_Internal_TemplateBase {
             foreach (self::$global_tpl_vars AS $key => $var) {
                 $_result[$key] = $var->value;
             }
+
             return $_result;
         }
     }
 
-    /**
-     * Empty cache folder
-     *
-     * @param integer $exp_time expiration time
-     * @param string  $type     resource type
-     * @return integer number of cache files deleted
-     */
-    function clearAllCache($exp_time = null, $type = null)
-    {
-        // load cache resource and call clearAll
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-        return $_cache_resource->clearAll($this, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param string  $template_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
-     * @param string  $type          resource type
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
-    {
-        // load cache resource and call clear
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-        return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
-    }
-
     /**
      * Loads security class and enables security
      *
-     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException when an invalid class name is provided
+     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return Smarty                 current Smarty instance for chaining
+     * @throws SmartyException        when an invalid class name is provided
      */
     public function enableSecurity($security_class = null)
     {
-        if ($security_class instanceof Smarty_Security) {
-            $this->security_policy = $security_class;
-            return $this;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class == null) {
-            $security_class = $this->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $this->security_policy = new $security_class($this);
-        }
-
+        Smarty_Security::enableSecurity($this, $security_class);
         return $this;
     }
 
     /**
      * Disable security
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function disableSecurity()
@@ -815,179 +786,145 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Set template directory
      *
-     * @param string|array $template_dir directory(s) of template sources
-     * @return Smarty current Smarty instance for chaining
+     * @param  string|array $template_dir directory(s) of template sources
+     * @param bool          $isConfig     true for config_dir
+     *
+     * @return \Smarty current Smarty instance for chaining
      */
-    public function setTemplateDir($template_dir)
+    public function setTemplateDir($template_dir, $isConfig = false)
     {
-        $this->template_dir = array();
-        foreach ((array) $template_dir as $k => $v) {
-            $this->template_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        $joined = '_joined_' . $type;
+        $this->{$type} = (array) $template_dir;
+        $this->{$joined} = join(' # ', $this->{$type});
+        $this->_cache[$type . '_new'] = true;
+        $this->_cache[$type] = false;
         return $this;
     }
 
     /**
      * Add template directory(s)
      *
-     * @param string|array $template_dir directory(s) of template sources
-     * @param string       $key          of the array element to assign the template dir to
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException when the given template directory is not valid
+     * @param  string|array $template_dir directory(s) of template sources
+     * @param  string       $key          of the array element to assign the template dir to
+     * @param bool          $isConfig     true for config_dir
+     *
+     * @return Smarty          current Smarty instance for chaining
      */
-    public function addTemplateDir($template_dir, $key=null)
+    public function addTemplateDir($template_dir, $key = null, $isConfig = false)
     {
-        // make sure we're dealing with an array
-        $this->template_dir = (array) $this->template_dir;
-
-        if (is_array($template_dir)) {
-            foreach ($template_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->template_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->template_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } elseif ($key !== null) {
-            // override directory at specified index
-            $this->template_dir[$key] = rtrim($template_dir, '/\\') . DS;
-        } else {
-            // append new directory
-            $this->template_dir[] = rtrim($template_dir, '/\\') . DS;
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        $joined = '_joined_' . $type;
+        if (!isset($this->_cache[$type])) {
+            $this->{$type} = (array) $this->{$type};
+            $this->{$joined} = join(' # ', $this->{$type});
+            $this->_cache[$type . '_new'] = true;
+            $this->_cache[$type] = false;
         }
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
+        $this->{$joined} .= ' # ' . join(' # ', (array) $template_dir);
+        $this->_addDir($type, $template_dir, $key);
         return $this;
     }
 
     /**
      * Get template directories
      *
-     * @param mixed index of directory to get, null to get all
-     * @return array|string list of template directories, or directory of $index
+     * @param mixed $index    index of directory to get, null to get all
+     * @param bool  $isConfig true for config_dir
+     *
+     * @return array list of template directories, or directory of $index
      */
-    public function getTemplateDir($index=null)
+    public function getTemplateDir($index = null, $isConfig = false)
     {
-        if ($index !== null) {
-            return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        if (!isset($this->_cache[$type])) {
+            $joined = '_joined_' . $type;
+            $this->{$type} = (array) $this->{$type};
+            $this->{$joined} = join(' # ', $this->{$type});
+            $this->_cache[$type] = false;
         }
-
-        return (array)$this->template_dir;
+        if ($this->_cache[$type] == false) {
+            foreach ($this->{$type} as $k => $v) {
+                $this->{$type}[$k] = $this->_realpath($v . DS, true);
+            }
+            $this->_cache[$type . '_new'] = true;
+            $this->_cache[$type] = true;
+        }
+        if ($index !== null) {
+            return isset($this->{$type}[$index]) ? $this->{$type}[$index] : null;
+        }
+        return $this->{$type};
     }
 
     /**
      * Set config directory
      *
-     * @param string|array $template_dir directory(s) of configuration sources
-     * @return Smarty current Smarty instance for chaining
+     * @param $config_dir
+     *
+     * @return Smarty       current Smarty instance for chaining
      */
     public function setConfigDir($config_dir)
     {
-        $this->config_dir = array();
-        foreach ((array) $config_dir as $k => $v) {
-            $this->config_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-        return $this;
+        return $this->setTemplateDir($config_dir, true);
     }
 
     /**
      * Add config directory(s)
      *
      * @param string|array $config_dir directory(s) of config sources
-     * @param string key of the array element to assign the config dir to
+     * @param mixed        $key        key of the array element to assign the config dir to
+     *
      * @return Smarty current Smarty instance for chaining
      */
-    public function addConfigDir($config_dir, $key=null)
+    public function addConfigDir($config_dir, $key = null)
     {
-        // make sure we're dealing with an array
-        $this->config_dir = (array) $this->config_dir;
-
-        if (is_array($config_dir)) {
-            foreach ($config_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->config_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->config_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } elseif( $key !== null ) {
-            // override directory at specified index
-            $this->config_dir[$key] = rtrim($config_dir, '/\\') . DS;
-        } else {
-            // append new directory
-            $this->config_dir[] = rtrim($config_dir, '/\\') . DS;
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-        return $this;
+        return $this->addTemplateDir($config_dir, $key, true);
     }
 
     /**
      * Get config directory
      *
-     * @param mixed index of directory to get, null to get all
-     * @return array|string configuration directory
+     * @param mixed $index index of directory to get, null to get all
+     *
+     * @return array configuration directory
      */
-    public function getConfigDir($index=null)
+    public function getConfigDir($index = null)
     {
-        if ($index !== null) {
-            return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
-        }
-
-        return (array)$this->config_dir;
+        return $this->getTemplateDir($index, true);
     }
 
     /**
      * Set plugins directory
      *
-     * @param string|array $plugins_dir directory(s) of plugins
-     * @return Smarty current Smarty instance for chaining
+     * @param  string|array $plugins_dir directory(s) of plugins
+     *
+     * @return Smarty       current Smarty instance for chaining
      */
     public function setPluginsDir($plugins_dir)
     {
-        $this->plugins_dir = array();
-        foreach ((array)$plugins_dir as $k => $v) {
-            $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
+        $this->plugins_dir = (array) $plugins_dir;
+        if (isset($this->_cache['plugins_dir'])) {
+            unset($this->_cache['plugins_dir']);
         }
-
         return $this;
     }
 
     /**
      * Adds directory of plugin files
      *
-     * @param object $smarty
-     * @param string $ |array $ plugins folder
+     * @param $plugins_dir
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function addPluginsDir($plugins_dir)
     {
-        // make sure we're dealing with an array
-        $this->plugins_dir = (array) $this->plugins_dir;
-
-        if (is_array($plugins_dir)) {
-            foreach ($plugins_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->plugins_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } else {
-            // append new directory
-            $this->plugins_dir[] = rtrim($plugins_dir, '/\\') . DS;
+        if (!isset($this->plugins_dir)) {
+            $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+        }
+        $this->plugins_dir = array_merge((array) $this->plugins_dir, (array) $plugins_dir);
+        if (isset($this->_cache['plugins_dir'])) {
+            unset($this->_cache['plugins_dir']);
         }
-
-        $this->plugins_dir = array_unique($this->plugins_dir);
         return $this;
     }
 
@@ -998,21 +935,37 @@ class Smarty extends Smarty_Internal_TemplateBase {
      */
     public function getPluginsDir()
     {
-        return (array)$this->plugins_dir;
+        if (!isset($this->_cache['plugins_dir'])) {
+            if (!isset($this->plugins_dir)) {
+                $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+            } else {
+                $plugins_dir = (array) $this->plugins_dir;
+                $this->plugins_dir = array();
+                foreach ($plugins_dir as $v) {
+                    $this->plugins_dir[] = $this->_realpath($v . DS, true);
+                }
+                $this->plugins_dir = array_unique($this->plugins_dir);
+            }
+            $this->_cache['plugin_files'] = array();
+            $this->_cache['plugins_dir'] = true;
+        }
+        return $this->plugins_dir;
     }
 
     /**
      * Set compile directory
      *
-     * @param string $compile_dir directory to store compiled templates in
+     * @param  string $compile_dir directory to store compiled templates in
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function setCompileDir($compile_dir)
     {
-        $this->compile_dir = rtrim($compile_dir, '/\\') . DS;
+        $this->compile_dir = $this->_realpath($compile_dir . DS, true);
         if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
             Smarty::$_muted_directories[$this->compile_dir] = null;
         }
+        $this->_cache['compile_dir'] = true;
         return $this;
     }
 
@@ -1023,21 +976,30 @@ class Smarty extends Smarty_Internal_TemplateBase {
      */
     public function getCompileDir()
     {
+        if (!isset($this->_cache['compile_dir'])) {
+            $this->compile_dir = $this->_realpath($this->compile_dir . DS, true);
+            if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
+                Smarty::$_muted_directories[$this->compile_dir] = null;
+            }
+            $this->_cache['compile_dir'] = true;
+        }
         return $this->compile_dir;
     }
 
     /**
      * Set cache directory
      *
-     * @param string $cache_dir directory to store cached templates in
+     * @param  string $cache_dir directory to store cached templates in
+     *
      * @return Smarty current Smarty instance for chaining
      */
     public function setCacheDir($cache_dir)
     {
-        $this->cache_dir = rtrim($cache_dir, '/\\') . DS;
+        $this->cache_dir = $this->_realpath($cache_dir . DS, true);
         if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
             Smarty::$_muted_directories[$this->cache_dir] = null;
         }
+        $this->_cache['cache_dir'] = true;
         return $this;
     }
 
@@ -1048,341 +1010,389 @@ class Smarty extends Smarty_Internal_TemplateBase {
      */
     public function getCacheDir()
     {
+        if (!isset($this->_cache['cache_dir'])) {
+            $this->cache_dir = $this->_realpath($this->cache_dir . DS, true);
+            if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
+                Smarty::$_muted_directories[$this->cache_dir] = null;
+            }
+            $this->_cache['cache_dir'] = true;
+        }
         return $this->cache_dir;
     }
 
     /**
-     * Set default modifiers
+     * add directories to given property name
      *
-     * @param array|string $modifiers modifier or list of modifiers to set
-     * @return Smarty current Smarty instance for chaining
+     * @param string       $dirName directory property name
+     * @param string|array $dir     directory string or array of strings
+     * @param mixed        $key     optional key
      */
-    public function setDefaultModifiers($modifiers)
+    private function _addDir($dirName, $dir, $key = null)
     {
-        $this->default_modifiers = (array) $modifiers;
-        return $this;
-    }
-
-    /**
-     * Add default modifiers
-     *
-     * @param array|string $modifiers modifier or list of modifiers to add
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addDefaultModifiers($modifiers)
-    {
-        if (is_array($modifiers)) {
-            $this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
-        } else {
-            $this->default_modifiers[] = $modifiers;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get default modifiers
-     *
-     * @return array list of default modifiers
-     */
-    public function getDefaultModifiers()
-    {
-        return $this->default_modifiers;
-    }
-
-
-    /**
-     * Set autoload filters
-     *
-     * @param array $filters filters to load automatically
-     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setAutoloadFilters($filters, $type=null)
-    {
-        if ($type !== null) {
-            $this->autoload_filters[$type] = (array) $filters;
-        } else {
-            $this->autoload_filters = (array) $filters;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add autoload filters
-     *
-     * @param array $filters filters to load automatically
-     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addAutoloadFilters($filters, $type=null)
-    {
-        if ($type !== null) {
-            if (!empty($this->autoload_filters[$type])) {
-                $this->autoload_filters[$type] = array_merge($this->autoload_filters[$type], (array) $filters);
-            } else {
-                $this->autoload_filters[$type] = (array) $filters;
-            }
-        } else {
-            foreach ((array) $filters as $key => $value) {
-                if (!empty($this->autoload_filters[$key])) {
-                    $this->autoload_filters[$key] = array_merge($this->autoload_filters[$key], (array) $value);
+        $rp = $this->_cache[$dirName];
+        if (is_array($dir)) {
+            foreach ($dir as $k => $v) {
+                $path = $rp ? $this->_realpath($v . DS, true) : $v;
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $this->{$dirName}[] = $path;
                 } else {
-                    $this->autoload_filters[$key] = (array) $value;
+                    // string indexes are overridden
+                    $this->{$dirName}[$k] = $path;
                 }
             }
+        } else {
+            $path = $rp ? $this->_realpath($dir . DS, true) : $dir;
+            if ($key !== null) {
+                // override directory at specified index
+                $this->{$dirName}[$key] = $path;
+            } else {
+                // append new directory
+                $this->{$dirName}[] = $path;
+            }
         }
-
-        return $this;
-    }
-
-    /**
-     * Get autoload filters
-     *
-     * @param string $type type of filter to get autoloads for. Defaults to all autoload filters
-     * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
-     */
-    public function getAutoloadFilters($type=null)
-    {
-        if ($type !== null) {
-            return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array();
-        }
-
-        return $this->autoload_filters;
-    }
-
-    /**
-     * return name of debugging template
-     *
-     * @return string
-     */
-    public function getDebugTemplate()
-    {
-        return $this->debug_tpl;
-    }
-
-    /**
-     * set the debug template
-     *
-     * @param string $tpl_name
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException if file is not readable
-     */
-    public function setDebugTemplate($tpl_name)
-    {
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $this->debug_tpl = $tpl_name;
-
-        return $this;
     }
 
     /**
      * creates a template object
      *
-     * @param string $template the resource handle of the template file
-     * @param mixed $cache_id cache id to be used with this template
-     * @param mixed $compile_id compile id to be used with this template
-     * @param object $parent next higher level of Smarty variables
-     * @param boolean $do_clone flag is Smarty object shall be cloned
-     * @return object template object
+     * @param  string  $template   the resource handle of the template file
+     * @param  mixed   $cache_id   cache id to be used with this template
+     * @param  mixed   $compile_id compile id to be used with this template
+     * @param  object  $parent     next higher level of Smarty variables
+     * @param  boolean $do_clone   flag is Smarty object shall be cloned
+     *
+     * @return object  template object
      */
     public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
     {
-        if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) {
+        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
             $parent = $cache_id;
             $cache_id = null;
         }
-        if (!empty($parent) && is_array($parent)) {
+        if ($parent !== null && is_array($parent)) {
             $data = $parent;
             $parent = null;
         } else {
             $data = null;
         }
-        // default to cache_id and compile_id of Smarty object
-        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
-        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
-        // already in template cache?
-        if ($this->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
+        if ($this->caching &&
+            isset($this->_cache['isCached'][$_templateId = $this->_getTemplateId($template, $cache_id, $compile_id)])
+        ) {
+            $tpl = $do_clone ? clone $this->_cache['isCached'][$_templateId] : $this->_cache['isCached'][$_templateId];
+            $tpl->parent = $parent;
+            $tpl->tpl_vars = array();
+            $tpl->config_vars = array();
         } else {
-            $_templateId = $this->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id, null, null);
         }
         if ($do_clone) {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = clone $this->template_objects[$_templateId];
-                $tpl->smarty = clone $tpl->smarty;
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
-            }
-        } else {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = $this->template_objects[$_templateId];
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
-            }
+            $tpl->smarty = clone $tpl->smarty;
+        } elseif ($parent === null) {
+            $tpl->parent = $this;
         }
         // fill data if present
         if (!empty($data) && is_array($data)) {
             // set up variable values
             foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
+                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        }
+        if ($this->debugging || $this->debugging_ctrl == 'URL') {
+            $tpl->smarty->_debug = new Smarty_Internal_Debug();
+            // check URL debugging control
+            if (!$this->debugging && $this->debugging_ctrl == 'URL') {
+                $tpl->smarty->_debug->debugUrl($tpl->smarty);
             }
         }
         return $tpl;
     }
 
-
     /**
      * Takes unknown classes and loads plugin files for them
      * class name format: Smarty_PluginType_PluginName
      * plugin filename format: plugintype.pluginname.php
      *
-     * @param string $plugin_name    class plugin name to load
-     * @param bool   $check          check if already loaded
+     * @param  string $plugin_name class plugin name to load
+     * @param  bool   $check       check if already loaded
+     *
+     * @throws SmartyException
      * @return string |boolean filepath of loaded file or false
      */
     public function loadPlugin($plugin_name, $check = true)
     {
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
-            return true;
+        return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
+    }
+
+    /**
+     * Get unique template id
+     *
+     * @param string     $template_name
+     * @param null|mixed $cache_id
+     * @param null|mixed $compile_id
+     * @param null       $caching
+     *
+     * @return string
+     */
+    public function _getTemplateId($template_name, $cache_id = null, $compile_id = null, $caching = null)
+    {
+        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
+        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
+        $caching = (int) ($caching === null ? $this->caching : $caching);
+
+        if ($this->allow_ambiguous_resources) {
+            $_templateId =
+                Smarty_Resource::getUniqueTemplateName($this, $template_name) . "#{$cache_id}#{$compile_id}#{$caching}";
+        } else {
+            $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
         }
-        // Plugin name is expected to be: Smarty_[Type]_[Name]
-        $_name_parts = explode('_', $plugin_name, 3);
-        // class name must have three parts to be valid plugin
-        // count($_name_parts) < 3 === !isset($_name_parts[2])
-        if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-            return false;
+        if (isset($_templateId[150])) {
+            $_templateId = sha1($_templateId);
         }
-        // if type is "internal", get plugin from sysplugins
-        if (strtolower($_name_parts[1]) == 'internal') {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (file_exists($file)) {
-                require_once($file);
-                return $file;
+        return $_templateId;
+    }
+
+    /**
+     * Normalize path
+     *  - remove /./ and /../
+     *  - make it absolute if required
+     *
+     * @param string $path     file path
+     * @param bool   $realpath leave $path relative
+     *
+     * @return string
+     */
+    public function _realpath($path, $realpath = null)
+    {
+        static $pattern = null;
+        static $nds = null;
+        if ($pattern == null) {
+            $nds = DS == '/' ? '\\' : '/';
+            $ds = '\\' . DS;
+            $pattern =
+                "#([{$ds}]+[^{$ds}]+[{$ds}]+[.]([{$ds}]+[.])*[.][{$ds}]+([.][{$ds}]+)*)|([{$ds}]+([.][{$ds}]+)+)|[{$ds}]{2,}#";
+        }
+        // normalize DS
+        if (strpos($path, $nds) !== false) {
+            $path = str_replace($nds, DS, $path);
+        }
+
+        if ($realpath === true && (($path[0] !== '/' && DS == '/') || ($path[1] !== ':' && DS != '/'))) {
+            $path = getcwd() . DS . $path;
+        }
+        while ((strpos($path, '.' . DS) !== false) || (strpos($path, DS . DS) !== false)) {
+            $path = preg_replace($pattern, DS, $path);
+        }
+        if ($realpath === false && ($path[0] == '/' || $path[1] == ':')) {
+            $path = str_ireplace(getcwd(), '.', $path);
+        }
+        return $path;
+    }
+
+    /**
+     * @param boolean $compile_check
+     */
+    public function setCompileCheck($compile_check)
+    {
+        $this->compile_check = $compile_check;
+    }
+
+    /**
+     * @param boolean $use_sub_dirs
+     */
+    public function setUseSubDirs($use_sub_dirs)
+    {
+        $this->use_sub_dirs = $use_sub_dirs;
+    }
+
+    /**
+     * @param int $error_reporting
+     */
+    public function setErrorReporting($error_reporting)
+    {
+        $this->error_reporting = $error_reporting;
+    }
+
+    /**
+     * @param boolean $escape_html
+     */
+    public function setEscapeHtml($escape_html)
+    {
+        $this->escape_html = $escape_html;
+    }
+
+    /**
+     * @param boolean $auto_literal
+     */
+    public function setAutoLiteral($auto_literal)
+    {
+        $this->auto_literal = $auto_literal;
+    }
+
+    /**
+     * @param boolean $force_compile
+     */
+    public function setForceCompile($force_compile)
+    {
+        $this->force_compile = $force_compile;
+    }
+
+    /**
+     * @param boolean $merge_compiled_includes
+     */
+    public function setMergeCompiledIncludes($merge_compiled_includes)
+    {
+        $this->merge_compiled_includes = $merge_compiled_includes;
+    }
+
+    /**
+     * @param string $left_delimiter
+     */
+    public function setLeftDelimiter($left_delimiter)
+    {
+        $this->left_delimiter = $left_delimiter;
+    }
+
+    /**
+     * @param string $right_delimiter
+     */
+    public function setRightDelimiter($right_delimiter)
+    {
+        $this->right_delimiter = $right_delimiter;
+    }
+
+    /**
+     * @param boolean $debugging
+     */
+    public function setDebugging($debugging)
+    {
+        $this->debugging = $debugging;
+    }
+
+    /**
+     * @param boolean $config_overwrite
+     */
+    public function setConfigOverwrite($config_overwrite)
+    {
+        $this->config_overwrite = $config_overwrite;
+    }
+
+    /**
+     * @param boolean $config_booleanize
+     */
+    public function setConfigBooleanize($config_booleanize)
+    {
+        $this->config_booleanize = $config_booleanize;
+    }
+
+    /**
+     * @param boolean $config_read_hidden
+     */
+    public function setConfigReadHidden($config_read_hidden)
+    {
+        $this->config_read_hidden = $config_read_hidden;
+    }
+
+    /**
+     * @param boolean $compile_locking
+     */
+    public function setCompileLocking($compile_locking)
+    {
+        $this->compile_locking = $compile_locking;
+    }
+
+    /**
+     * @param string $default_resource_type
+     */
+    public function setDefaultResourceType($default_resource_type)
+    {
+        $this->default_resource_type = $default_resource_type;
+    }
+
+    /**
+     * @param string $caching_type
+     */
+    public function setCachingType($caching_type)
+    {
+        $this->caching_type = $caching_type;
+    }
+
+    /**
+     * Test install
+     *
+     * @param null $errors
+     */
+    public function testInstall(&$errors = null)
+    {
+        Smarty_Internal_TestInstall::testInstall($this, $errors);
+    }
+
+    /**
+     * Class destructor
+     */
+    public function __destruct()
+    {
+        $i = 0;// intentionally left blank
+    }
+
+    /**
+     * <<magic>> Generic getter.
+     * Calls the appropriate getter function.
+     * Issues an E_USER_NOTICE if no valid getter is found.
+     *
+     * @param  string $name property name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+
+        if (isset(self::$accessMap[$name])) {
+            $method = 'get' . self::$accessMap[$name];
+            return $this->{$method}();
+        } elseif (in_array($name, self::$obsoleteProperties)) {
+            return null;
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
+    }
+
+    /**
+     * <<magic>> Generic setter.
+     * Calls the appropriate setter function.
+     * Issues an E_USER_NOTICE if no valid setter is found.
+     *
+     * @param string $name  property name
+     * @param mixed  $value parameter passed to setter
+     */
+    public function __set($name, $value)
+    {
+        if (isset(self::$accessMap[$name])) {
+            $method = 'set' . self::$accessMap[$name];
+            $this->{$method}($value);
+        } elseif (in_array($name, self::$obsoleteProperties)) {
+            return;
+        } else {
+            if (is_object($value) && method_exists($value, $name)) {
+                $this->$name = $value;
             } else {
-                return false;
+                trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
             }
         }
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // loop through plugin dirs and find the plugin
-        foreach($this->getPluginsDir() as $_plugin_dir) {
-            $names = array(
-                $_plugin_dir . $_plugin_filename,
-                $_plugin_dir . strtolower($_plugin_filename),
-            );
-            foreach ($names as $file) {
-                if (file_exists($file)) {
-                    require_once($file);
-                    return $file;
-                }
-                if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $file = stream_resolve_include_path($file);
-                    } else {
-                        $file = Smarty_Internal_Get_Include_Path::getIncludePath($file);
-                    }
-
-                    if ($file !== false) {
-                        require_once($file);
-                        return $file;
-                    }
-                }
-            }
-        }
-        // no plugin loaded
-        return false;
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param string $extension file extension
-     * @param bool $force_compile force all to recompile
-     * @param int $time_limit
-     * @param int $max_errors
-     * @return integer number of template files recompiled
-     */
-    public function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param string $extension file extension
-     * @param bool $force_compile force all to recompile
-     * @param int $time_limit
-     * @param int $max_errors
-     * @return integer number of template files recompiled
-     */
-    public function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllConfig($extention, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param string $resource_name template name
-     * @param string $compile_id compile id
-     * @param integer $exp_time expiration time
-     * @return integer number of template files deleted
-     */
-    public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
-    {
-        return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this);
-    }
-
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param object $templae template object
-     * @return array of tag/attributes
-     */
-    public function getTags(Smarty_Internal_Template $template)
-    {
-        return Smarty_Internal_Utility::getTags($template);
-    }
-
-    /**
-     * Run installation test
-     *
-     * @param array $errors Array to write errors into, rather than outputting them
-     * @return boolean true if setup is fine, false if something is wrong
-     */
-    public function testInstall(&$errors=null)
-    {
-        return Smarty_Internal_Utility::testInstall($this, $errors);
     }
 
     /**
      * Error Handler to mute expected messages
      *
      * @link http://php.net/set_error_handler
-     * @param integer $errno Error level
+     *
+     * @param  integer $errno Error level
+     * @param          $errstr
+     * @param          $errfile
+     * @param          $errline
+     * @param          $errcontext
+     *
      * @return boolean
      */
     public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
@@ -1393,10 +1403,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
         if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
             $smarty_dir = realpath(SMARTY_DIR);
             if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[SMARTY_DIR] = array(
-                    'file' => $smarty_dir,
-                    'length' => strlen($smarty_dir),
-                );
+                Smarty::$_muted_directories[SMARTY_DIR] =
+                    array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
             }
         }
 
@@ -1410,10 +1418,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
                     unset(Smarty::$_muted_directories[$key]);
                     continue;
                 }
-                $dir = array(
-                    'file' => $file,
-                    'length' => strlen($file),
-                );
+                $dir = array('file' => $file, 'length' => strlen($file),);
             }
             if (!strncmp($errfile, $dir['file'], $dir['length'])) {
                 $_is_muted_directory = true;
@@ -1425,7 +1430,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
         // or the error was within smarty but masked to be ignored
         if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
             if (Smarty::$_previous_error_handler) {
-                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline, $errcontext);
+                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline,
+                                      $errcontext);
             } else {
                 return false;
             }
@@ -1474,55 +1480,3 @@ class Smarty extends Smarty_Internal_TemplateBase {
         restore_error_handler();
     }
 }
-
-// Check if we're running on windows
-Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-
-// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-if (Smarty::$_CHARSET !== 'UTF-8') {
-    Smarty::$_UTF8_MODIFIER = '';
-}
-
-/**
- * Smarty exception class
- * @package Smarty
- */
-class SmartyException extends Exception {
-    public static $escape = true;
-    public function __construct($message) {
-        $this->message = self::$escape ? htmlentities($message) : $message;
-    }
-}
-
-/**
- * Smarty compiler exception class
- * @package Smarty
- */
-class SmartyCompilerException extends SmartyException  {
-}
-
-/**
- * Autoloader
- */
-function smartyAutoload($class)
-{
-    $_class = strtolower($class);
-    $_classes = array(
-        'smarty_config_source' => true,
-        'smarty_config_compiled' => true,
-        'smarty_security' => true,
-        'smarty_cacheresource' => true,
-        'smarty_cacheresource_custom' => true,
-        'smarty_cacheresource_keyvaluestore' => true,
-        'smarty_resource' => true,
-        'smarty_resource_custom' => true,
-        'smarty_resource_uncompiled' => true,
-        'smarty_resource_recompiled' => true,
-    );
-
-    if (!strncmp($_class, 'smarty_internal_', 16) || isset($_classes[$_class])) {
-        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-    }
-}
-
-?>
diff --git a/sources/include/smarty/libs/SmartyBC.class.php b/sources/include/smarty/libs/SmartyBC.class.php
index 589dcca..1dd529c 100644
--- a/sources/include/smarty/libs/SmartyBC.class.php
+++ b/sources/include/smarty/libs/SmartyBC.class.php
@@ -3,60 +3,62 @@
  * Project:     Smarty: the PHP compiling template engine
  * File:        SmartyBC.class.php
  * SVN:         $Id: $
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * For questions, help, comments, discussion, etc., please join the
  * Smarty mailing list. Send a blank e-mail to
  * smarty-discussion-subscribe@googlegroups.com
  *
- * @link http://www.smarty.net/
+ * @link      http://www.smarty.net/
  * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @author Rodney Rehm
- * @package Smarty
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews
+ * @author    Rodney Rehm
+ * @package   Smarty
  */
 /**
  * @ignore
  */
-require(dirname(__FILE__) . '/Smarty.class.php');
+require_once(dirname(__FILE__) . '/Smarty.class.php');
 
 /**
  * Smarty Backward Compatability Wrapper Class
  *
  * @package Smarty
  */
-class SmartyBC extends Smarty {
-
+class SmartyBC extends Smarty
+{
     /**
      * Smarty 2 BC
+     *
      * @var string
      */
     public $_version = self::SMARTY_VERSION;
 
+    /**
+     * This is an array of directories where trusted php scripts reside.
+     *
+     * @var array
+     */
+    public $trusted_dir = array();
+
     /**
      * Initialize new SmartyBC object
      *
      * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false )
      */
-    public function __construct(array $options=array())
+    public function __construct(array $options = array())
     {
         parent::__construct($options);
-        // register {php} tag
-        $this->registerPlugin('block', 'php', 'smarty_php_tag');
     }
 
     /**
@@ -100,7 +102,7 @@ class SmartyBC extends Smarty {
      * @param bool   $cacheable
      * @param mixed  $cache_attrs
      */
-    public function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null)
+    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
     {
         $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
     }
@@ -118,11 +120,14 @@ class SmartyBC extends Smarty {
     /**
      * Registers object to be used in templates
      *
-     * @param string  $object      name of template object
-     * @param object  $object_impl the referenced PHP object to register
-     * @param array   $allowed     list of allowed methods (empty = all)
-     * @param boolean $smarty_args smarty argument format, else traditional
-     * @param array   $block_functs list of methods that are block format
+     * @param string  $object        name of template object
+     * @param object  $object_impl   the referenced PHP object to register
+     * @param array   $allowed       list of allowed methods (empty = all)
+     * @param boolean $smarty_args   smarty argument format, else traditional
+     * @param array   $block_methods list of methods that are block format
+     *
+     * @throws SmartyException
+     * @internal param array $block_functs list of methods that are block format
      */
     public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
     {
@@ -149,7 +154,7 @@ class SmartyBC extends Smarty {
      * @param bool   $cacheable
      * @param mixed  $cache_attrs
      */
-    public function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null)
+    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
     {
         $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
     }
@@ -171,7 +176,7 @@ class SmartyBC extends Smarty {
      * @param string $function_impl name of PHP function to register
      * @param bool   $cacheable
      */
-    public function register_compiler_function($function, $function_impl, $cacheable=true)
+    public function register_compiler_function($function, $function_impl, $cacheable = true)
     {
         $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
     }
@@ -189,7 +194,7 @@ class SmartyBC extends Smarty {
     /**
      * Registers modifier to be used in templates
      *
-     * @param string $modifier name of template modifier
+     * @param string $modifier      name of template modifier
      * @param string $modifier_impl name of PHP function to register
      */
     public function register_modifier($modifier, $modifier_impl)
@@ -305,10 +310,11 @@ class SmartyBC extends Smarty {
     /**
      * clear cached content for the given template and cache id
      *
-     * @param string $tpl_file   name of template file
-     * @param string $cache_id   name of cache_id
-     * @param string $compile_id name of compile_id
-     * @param string $exp_time   expiration time
+     * @param  string $tpl_file   name of template file
+     * @param  string $cache_id   name of cache_id
+     * @param  string $compile_id name of compile_id
+     * @param  string $exp_time   expiration time
+     *
      * @return boolean
      */
     public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
@@ -319,7 +325,8 @@ class SmartyBC extends Smarty {
     /**
      * clear the entire contents of cache (all templates)
      *
-     * @param string $exp_time expire time
+     * @param  string $exp_time expire time
+     *
      * @return boolean
      */
     public function clear_all_cache($exp_time = null)
@@ -330,9 +337,10 @@ class SmartyBC extends Smarty {
     /**
      * test to see if valid cache exists for this template
      *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id
-     * @param string $compile_id
+     * @param  string $tpl_file name of template file
+     * @param  string $cache_id
+     * @param  string $compile_id
+     *
      * @return boolean
      */
     public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
@@ -353,9 +361,10 @@ class SmartyBC extends Smarty {
      * or all compiled template files if one is not specified.
      * This function is for advanced use only, not normally needed.
      *
-     * @param string $tpl_file
-     * @param string $compile_id
-     * @param string $exp_time
+     * @param  string $tpl_file
+     * @param  string $compile_id
+     * @param  string $exp_time
+     *
      * @return boolean results of {@link smarty_core_rm_auto()}
      */
     public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
@@ -366,7 +375,8 @@ class SmartyBC extends Smarty {
     /**
      * Checks whether requested template exists.
      *
-     * @param string $tpl_file
+     * @param  string $tpl_file
+     *
      * @return boolean
      */
     public function template_exists($tpl_file)
@@ -377,10 +387,11 @@ class SmartyBC extends Smarty {
     /**
      * Returns an array containing template variables
      *
-     * @param string $name
+     * @param  string $name
+     *
      * @return array
      */
-    public function get_template_vars($name=null)
+    public function get_template_vars($name = null)
     {
         return $this->getTemplateVars($name);
     }
@@ -388,10 +399,11 @@ class SmartyBC extends Smarty {
     /**
      * Returns an array containing config variables
      *
-     * @param string $name
+     * @param  string $name
+     *
      * @return array
      */
-    public function get_config_vars($name=null)
+    public function get_config_vars($name = null)
     {
         return $this->getConfigVars($name);
     }
@@ -411,7 +423,8 @@ class SmartyBC extends Smarty {
     /**
      * return a reference to a registered object
      *
-     * @param string $name
+     * @param  string $name
+     *
      * @return object
      */
     public function get_registered_object($name)
@@ -432,29 +445,11 @@ class SmartyBC extends Smarty {
     /**
      * trigger Smarty error
      *
-     * @param string $error_msg
+     * @param string  $error_msg
      * @param integer $error_type
      */
     public function trigger_error($error_msg, $error_type = E_USER_WARNING)
     {
         trigger_error("Smarty error: $error_msg", $error_type);
     }
-
 }
-
-/**
- * Smarty {php}{/php} block function
- *
- * @param array   $params   parameter list
- * @param string  $content  contents of the block
- * @param object  $template template object
- * @param boolean &$repeat  repeat flag
- * @return string content re-formatted
- */
-function smarty_php_tag($params, $content, $template, &$repeat)
-{
-    eval($content);
-    return '';
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/debug.tpl b/sources/include/smarty/libs/debug.tpl
index 12eef0f..5526cbc 100644
--- a/sources/include/smarty/libs/debug.tpl
+++ b/sources/include/smarty/libs/debug.tpl
@@ -1,133 +1,160 @@
 {capture name='_smarty_debug' assign=debug_output}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-    <title>Smarty Debug Console</title>
-<style type="text/css">
-{literal}
-body, h1, h2, td, th, p {
-    font-family: sans-serif;
-    font-weight: normal;
-    font-size: 0.9em;
-    margin: 1px;
-    padding: 0;
-}
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+    <head>
+        <title>Smarty Debug Console</title>
+        <style type="text/css">
+            {literal}
+            body, h1, h2, h3, td, th, p {
+                font-family: sans-serif;
+                font-weight: normal;
+                font-size: 0.9em;
+                margin: 1px;
+                padding: 0;
+            }
 
-h1 {
-    margin: 0;
-    text-align: left;
-    padding: 2px;
-    background-color: #f0c040;
-    color:  black;
-    font-weight: bold;
-    font-size: 1.2em;
- }
+            h1 {
+                margin: 0;
+                text-align: left;
+                padding: 2px;
+                background-color: #f0c040;
+                color: black;
+                font-weight: bold;
+                font-size: 1.2em;
+            }
 
-h2 {
-    background-color: #9B410E;
-    color: white;
-    text-align: left;
-    font-weight: bold;
-    padding: 2px;
-    border-top: 1px solid black;
-}
+            h2 {
+                background-color: #9B410E;
+                color: white;
+                text-align: left;
+                font-weight: bold;
+                padding: 2px;
+                border-top: 1px solid black;
+            }
+            h3 {
+                text-align: left;
+                font-weight: bold;
+                color: black;
+                font-size: 0.7em;
+                padding: 2px;
+            }
 
-body {
-    background: black; 
-}
+            body {
+                background: black;
+            }
 
-p, table, div {
-    background: #f0ead8;
-} 
+            p, table, div {
+                background: #f0ead8;
+            }
 
-p {
-    margin: 0;
-    font-style: italic;
-    text-align: center;
-}
+            p {
+                margin: 0;
+                font-style: italic;
+                text-align: center;
+            }
 
-table {
-    width: 100%;
-}
+            table {
+                width: 100%;
+            }
 
-th, td {
-    font-family: monospace;
-    vertical-align: top;
-    text-align: left;
-    width: 50%;
-}
+            th, td {
+                font-family: monospace;
+                vertical-align: top;
+                text-align: left;
+            }
 
-td {
-    color: green;
-}
+            td {
+                color: green;
+            }
 
-.odd {
-    background-color: #eeeeee;
-}
+            .odd {
+                background-color: #eeeeee;
+            }
 
-.even {
-    background-color: #fafafa;
-}
+            .even {
+                background-color: #fafafa;
+            }
 
-.exectime {
-    font-size: 0.8em;
-    font-style: italic;
-}
+            .exectime {
+                font-size: 0.8em;
+                font-style: italic;
+            }
 
-#table_assigned_vars th {
-    color: blue;
-}
+            #bold div {
+                color: black;
+                font-weight: bold;
+            }
+            #blue h3 {
+                color: blue;
+            }
+            #normal div {
+                color: black;
+                font-weight: normal;
+            }
+            #table_assigned_vars th {
+                color: blue;
+                font-weight: bold;
+            }
 
-#table_config_vars th {
-    color: maroon;
-}
-{/literal}
-</style>
-</head>
-<body>
+            #table_config_vars th {
+                color: maroon;
+            }
 
-<h1>Smarty Debug Console  -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+            {/literal}
+        </style>
+    </head>
+    <body>
 
-{if !empty($template_data)}
-<h2>included templates &amp; config files (load time in seconds)</h2>
+    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
+        -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
 
-<div>
-{foreach $template_data as $template}
-  <font color=brown>{$template.name}</font>
-  <span class="exectime">
-   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
-  </span>
-  <br>
-{/foreach}
-</div>
-{/if}
+    {if !empty($template_data)}
+        <h2>included templates &amp; config files (load time in seconds)</h2>
+        <div>
+            {foreach $template_data as $template}
+                <font color=brown>{$template.name}</font>
+                <br>&nbsp;&nbsp;<span class="exectime">
+                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+                 </span>
+                <br>
+            {/foreach}
+        </div>
+    {/if}
 
-<h2>assigned template variables</h2>
+    <h2>assigned template variables</h2>
 
-<table id="table_assigned_vars">
-    {foreach $assigned_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>${$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
-</table>
+    <table id="table_assigned_vars">
+        {foreach $assigned_vars as $vars}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <td><h3><font color=blue>${$vars@key}</font></h3>
+                    {if isset($vars['nocache'])}<b>Nocache</b></br>{/if}
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
+                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
+         {/foreach}
+    </table>
 
-<h2>assigned config file variables (outer template scope)</h2>
+    <h2>assigned config file variables</h2>
 
-<table id="table_config_vars">
-    {foreach $config_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>{$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
+    <table id="table_config_vars">
+        {foreach $config_vars as $vars}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <td><h3><font color=blue>#{$vars@key}#</font></h3>
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
+            </tr>
+        {/foreach}
 
-</table>
-</body>
-</html>
+    </table>
+    </body>
+    </html>
 {/capture}
 <script type="text/javascript">
-{$id = $template_name|default:''|md5}
-    _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
+    {$id = '__Smarty__'}
+    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
+    _smarty_console = window.open("", "console{$id}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
     _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
     _smarty_console.document.close();
 </script>
diff --git a/sources/include/smarty/libs/plugins/block.textformat.php b/sources/include/smarty/libs/plugins/block.textformat.php
index b22b104..abf5449 100644
--- a/sources/include/smarty/libs/plugins/block.textformat.php
+++ b/sources/include/smarty/libs/plugins/block.textformat.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin to format text blocks
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsBlock
  */
 
 /**
  * Smarty {textformat}{/textformat} block plugin
- *
  * Type:     block function<br>
  * Name:     textformat<br>
  * Purpose:  format text a certain way with preset styles
@@ -23,12 +22,14 @@
  * - wrap_boundary - boolean (true)
  * </pre>
  *
- * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
- *       (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ *         (Smarty online manual)
+ *
  * @param array                    $params   parameters
  * @param string                   $content  contents of the block
  * @param Smarty_Internal_Template $template template object
  * @param boolean                  &$repeat  repeat flag
+ *
  * @return string content re-formatted
  * @author Monte Ohrt <monte at ohrt dot com>
  */
@@ -53,17 +54,17 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
             case 'indent_char':
             case 'wrap_char':
             case 'assign':
-                $$_key = (string)$_val;
+                $$_key = (string) $_val;
                 break;
 
             case 'indent':
             case 'indent_first':
             case 'wrap':
-                $$_key = (int)$_val;
+                $$_key = (int) $_val;
                 break;
 
             case 'wrap_cut':
-                $$_key = (bool)$_val;
+                $$_key = (bool) $_val;
                 break;
 
             default:
@@ -76,8 +77,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
     }
     // split into paragraphs
     $_paragraphs = preg_split('![\r\n]{2}!', $content);
-    $_output = '';
-
 
     foreach ($_paragraphs as &$_paragraph) {
         if (!$_paragraph) {
@@ -102,12 +101,10 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
         }
     }
     $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-    
+
     if ($assign) {
         $template->assign($assign, $_output);
     } else {
         return $_output;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/function.counter.php b/sources/include/smarty/libs/plugins/function.counter.php
index 3906bad..4da85a1 100644
--- a/sources/include/smarty/libs/plugins/function.counter.php
+++ b/sources/include/smarty/libs/plugins/function.counter.php
@@ -1,22 +1,24 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {counter} function plugin
- *
  * Type:     function<br>
  * Name:     counter<br>
  * Purpose:  print out a counter value
  *
  * @author Monte Ohrt <monte at ohrt dot com>
- * @link http://www.smarty.net/manual/en/language.function.counter.php {counter}
- *       (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
+ *         (Smarty online manual)
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 function smarty_function_counter($params, $template)
@@ -26,16 +28,16 @@ function smarty_function_counter($params, $template)
     $name = (isset($params['name'])) ? $params['name'] : 'default';
     if (!isset($counters[$name])) {
         $counters[$name] = array(
-            'start'=>1,
-            'skip'=>1,
-            'direction'=>'up',
-            'count'=>1
-            );
+            'start'     => 1,
+            'skip'      => 1,
+            'direction' => 'up',
+            'count'     => 1
+        );
     }
     $counter =& $counters[$name];
 
     if (isset($params['start'])) {
-        $counter['start'] = $counter['count'] = (int)$params['start'];
+        $counter['start'] = $counter['count'] = (int) $params['start'];
     }
 
     if (!empty($params['assign'])) {
@@ -45,9 +47,9 @@ function smarty_function_counter($params, $template)
     if (isset($counter['assign'])) {
         $template->assign($counter['assign'], $counter['count']);
     }
-    
+
     if (isset($params['print'])) {
-        $print = (bool)$params['print'];
+        $print = (bool) $params['print'];
     } else {
         $print = empty($counter['assign']);
     }
@@ -61,18 +63,16 @@ function smarty_function_counter($params, $template)
     if (isset($params['skip'])) {
         $counter['skip'] = $params['skip'];
     }
-    
+
     if (isset($params['direction'])) {
         $counter['direction'] = $params['direction'];
     }
 
-    if ($counter['direction'] == "down")
+    if ($counter['direction'] == "down") {
         $counter['count'] -= $counter['skip'];
-    else
+    } else {
         $counter['count'] += $counter['skip'];
-    
-    return $retval;
-    
-}
+    }
 
-?>
\ No newline at end of file
+    return $retval;
+}
diff --git a/sources/include/smarty/libs/plugins/function.cycle.php b/sources/include/smarty/libs/plugins/function.cycle.php
index 1778ffb..8dc5cd9 100644
--- a/sources/include/smarty/libs/plugins/function.cycle.php
+++ b/sources/include/smarty/libs/plugins/function.cycle.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {cycle} function plugin
- *
  * Type:     function<br>
  * Name:     cycle<br>
  * Date:     May 3, 2002<br>
@@ -31,15 +30,17 @@
  * {cycle name=row}
  * </pre>
  *
- * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Mark Priatel <mpriatel@rogers.com>
- * @author credit to Gerard <gerard@interfold.com>
- * @author credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @link     http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ *           (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   credit to Mark Priatel <mpriatel@rogers.com>
+ * @author   credit to Gerard <gerard@interfold.com>
+ * @author   credit to Jason Sweat <jsweat_php@yahoo.com>
  * @version  1.3
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 
@@ -48,18 +49,20 @@ function smarty_function_cycle($params, $template)
     static $cycle_vars;
 
     $name = (empty($params['name'])) ? 'default' : $params['name'];
-    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
-    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
-    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
+    $print = (isset($params['print'])) ? (bool) $params['print'] : true;
+    $advance = (isset($params['advance'])) ? (bool) $params['advance'] : true;
+    $reset = (isset($params['reset'])) ? (bool) $params['reset'] : false;
 
     if (!isset($params['values'])) {
-        if(!isset($cycle_vars[$name]['values'])) {
+        if (!isset($cycle_vars[$name]['values'])) {
             trigger_error("cycle: missing 'values' parameter");
+
             return;
         }
     } else {
-        if(isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
+        if (isset($cycle_vars[$name]['values'])
+            && $cycle_vars[$name]['values'] != $params['values']
+        ) {
             $cycle_vars[$name]['index'] = 0;
         }
         $cycle_vars[$name]['values'] = $params['values'];
@@ -71,13 +74,13 @@ function smarty_function_cycle($params, $template)
         $cycle_vars[$name]['delimiter'] = ',';
     }
 
-    if(is_array($cycle_vars[$name]['values'])) {
+    if (is_array($cycle_vars[$name]['values'])) {
         $cycle_array = $cycle_vars[$name]['values'];
     } else {
-        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
+        $cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']);
     }
 
-    if(!isset($cycle_vars[$name]['index']) || $reset ) {
+    if (!isset($cycle_vars[$name]['index']) || $reset) {
         $cycle_vars[$name]['index'] = 0;
     }
 
@@ -86,21 +89,19 @@ function smarty_function_cycle($params, $template)
         $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
     }
 
-    if($print) {
+    if ($print) {
         $retval = $cycle_array[$cycle_vars[$name]['index']];
     } else {
         $retval = null;
     }
 
-    if($advance) {
-        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
+    if ($advance) {
+        if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) {
             $cycle_vars[$name]['index'] = 0;
         } else {
-            $cycle_vars[$name]['index']++;
+            $cycle_vars[$name]['index'] ++;
         }
     }
 
     return $retval;
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/function.fetch.php b/sources/include/smarty/libs/plugins/function.fetch.php
index eca1182..3506d4a 100644
--- a/sources/include/smarty/libs/plugins/function.fetch.php
+++ b/sources/include/smarty/libs/plugins/function.fetch.php
@@ -2,50 +2,53 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {fetch} plugin
- *
  * Type:     function<br>
  * Name:     fetch<br>
  * Purpose:  fetch file, web or ftp data and display results
  *
- * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
- *       (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ *         (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
  * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
  */
 function smarty_function_fetch($params, $template)
 {
     if (empty($params['file'])) {
-        trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
+        trigger_error("[plugin] fetch parameter 'file' cannot be empty", E_USER_NOTICE);
+
         return;
     }
-    
+
     // strip file protocol
     if (stripos($params['file'], 'file://') === 0) {
         $params['file'] = substr($params['file'], 7);
     }
-    
+
     $protocol = strpos($params['file'], '://');
     if ($protocol !== false) {
         $protocol = strtolower(substr($params['file'], 0, $protocol));
     }
-    
+
     if (isset($template->smarty->security_policy)) {
         if ($protocol) {
             // remote resource (or php stream, …)
-            if(!$template->smarty->security_policy->isTrustedUri($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
                 return;
             }
         } else {
             // local file
-            if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
                 return;
             }
         }
@@ -54,53 +57,54 @@ function smarty_function_fetch($params, $template)
     $content = '';
     if ($protocol == 'http') {
         // http fetch
-        if($uri_parts = parse_url($params['file'])) {
+        if ($uri_parts = parse_url($params['file'])) {
             // set defaults
             $host = $server_name = $uri_parts['host'];
             $timeout = 30;
             $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-            $agent = "Smarty Template Engine ". Smarty::SMARTY_VERSION;
+            $agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION;
             $referer = "";
             $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
             $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
             $_is_proxy = false;
-            if(empty($uri_parts['port'])) {
+            if (empty($uri_parts['port'])) {
                 $port = 80;
             } else {
                 $port = $uri_parts['port'];
             }
-            if(!empty($uri_parts['user'])) {
+            if (!empty($uri_parts['user'])) {
                 $user = $uri_parts['user'];
             }
-            if(!empty($uri_parts['pass'])) {
+            if (!empty($uri_parts['pass'])) {
                 $pass = $uri_parts['pass'];
             }
             // loop through parameters, setup headers
-            foreach($params as $param_key => $param_value) {
-                switch($param_key) {
+            foreach ($params as $param_key => $param_value) {
+                switch ($param_key) {
                     case "file":
                     case "assign":
                     case "assign_headers":
                         break;
                     case "user":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $user = $param_value;
                         }
                         break;
                     case "pass":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $pass = $param_value;
                         }
                         break;
                     case "accept":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $accept = $param_value;
                         }
                         break;
                     case "header":
-                        if(!empty($param_value)) {
-                            if(!preg_match('![\w\d-]+: .+!',$param_value)) {
-                                trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE);
+                        if (!empty($param_value)) {
+                            if (!preg_match('![\w\d-]+: .+!', $param_value)) {
+                                trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE);
+
                                 return;
                             } else {
                                 $extra_headers[] = $param_value;
@@ -108,99 +112,104 @@ function smarty_function_fetch($params, $template)
                         }
                         break;
                     case "proxy_host":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $proxy_host = $param_value;
                         }
                         break;
                     case "proxy_port":
-                        if(!preg_match('!\D!', $param_value)) {
+                        if (!preg_match('!\D!', $param_value)) {
                             $proxy_port = (int) $param_value;
                         } else {
-                            trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+                            trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
+
                             return;
                         }
                         break;
                     case "agent":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $agent = $param_value;
                         }
                         break;
                     case "referer":
-                        if(!empty($param_value)) {
+                        if (!empty($param_value)) {
                             $referer = $param_value;
                         }
                         break;
                     case "timeout":
-                        if(!preg_match('!\D!', $param_value)) {
+                        if (!preg_match('!\D!', $param_value)) {
                             $timeout = (int) $param_value;
                         } else {
-                            trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+                            trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
+
                             return;
                         }
                         break;
                     default:
-                        trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE);
+                        trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE);
+
                         return;
                 }
             }
-            if(!empty($proxy_host) && !empty($proxy_port)) {
+            if (!empty($proxy_host) && !empty($proxy_port)) {
                 $_is_proxy = true;
-                $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
+                $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
             } else {
-                $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
+                $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
             }
 
-            if(!$fp) {
-                trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE);
+            if (!$fp) {
+                trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
+
                 return;
             } else {
-                if($_is_proxy) {
+                if ($_is_proxy) {
                     fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
                 } else {
                     fputs($fp, "GET $uri HTTP/1.0\r\n");
                 }
-                if(!empty($host)) {
+                if (!empty($host)) {
                     fputs($fp, "Host: $host\r\n");
                 }
-                if(!empty($accept)) {
+                if (!empty($accept)) {
                     fputs($fp, "Accept: $accept\r\n");
                 }
-                if(!empty($agent)) {
+                if (!empty($agent)) {
                     fputs($fp, "User-Agent: $agent\r\n");
                 }
-                if(!empty($referer)) {
+                if (!empty($referer)) {
                     fputs($fp, "Referer: $referer\r\n");
                 }
-                if(isset($extra_headers) && is_array($extra_headers)) {
-                    foreach($extra_headers as $curr_header) {
-                        fputs($fp, $curr_header."\r\n");
+                if (isset($extra_headers) && is_array($extra_headers)) {
+                    foreach ($extra_headers as $curr_header) {
+                        fputs($fp, $curr_header . "\r\n");
                     }
                 }
-                if(!empty($user) && !empty($pass)) {
-                    fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
+                if (!empty($user) && !empty($pass)) {
+                    fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n");
                 }
 
                 fputs($fp, "\r\n");
-                while(!feof($fp)) {
-                    $content .= fgets($fp,4096);
+                while (!feof($fp)) {
+                    $content .= fgets($fp, 4096);
                 }
                 fclose($fp);
-                $csplit = preg_split("!\r\n\r\n!",$content,2);
+                $csplit = preg_split("!\r\n\r\n!", $content, 2);
 
                 $content = $csplit[1];
 
-                if(!empty($params['assign_headers'])) {
-                    $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
+                if (!empty($params['assign_headers'])) {
+                    $template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0]));
                 }
             }
         } else {
-            trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE);
+            trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
+
             return;
         }
     } else {
         $content = @file_get_contents($params['file']);
         if ($content === false) {
-            throw new SmartyException("{fetch} cannot read resource '" . $params['file'] ."'");
+            throw new SmartyException("{fetch} cannot read resource '" . $params['file'] . "'");
         }
     }
 
@@ -210,5 +219,3 @@ function smarty_function_fetch($params, $template)
         return $content;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/function.html_checkboxes.php b/sources/include/smarty/libs/plugins/function.html_checkboxes.php
index 1866bc2..d786803 100644
--- a/sources/include/smarty/libs/plugins/function.html_checkboxes.php
+++ b/sources/include/smarty/libs/plugins/function.html_checkboxes.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_checkboxes} function plugin
- *
  * File:       function.html_checkboxes.php<br>
  * Type:       function<br>
  * Name:       html_checkboxes<br>
@@ -32,15 +31,17 @@
  * - escape     (optional) - escape the content (not value), defaults to true
  * </pre>
  *
- * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *      (Smarty online manual)
+ * @link       http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ *             (Smarty online manual)
  * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
+ * @author     credits to Monte Ohrt <monte at ohrt dot com>
  * @version    1.0
- * @param array $params parameters
+ *
+ * @param array  $params   parameters
  * @param object $template template object
+ *
  * @return string
- * @uses smarty_function_escape_special_chars()
+ * @uses       smarty_function_escape_special_chars()
  */
 function smarty_function_html_checkboxes($params, $template)
 {
@@ -58,8 +59,8 @@ function smarty_function_html_checkboxes($params, $template)
 
     $extra = '';
 
-    foreach($params as $_key => $_val) {
-        switch($_key) {
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
             case 'name':
             case 'separator':
                 $$_key = (string) $_val;
@@ -89,7 +90,7 @@ function smarty_function_html_checkboxes($params, $template)
                             if (method_exists($_sel, "__toString")) {
                                 $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
                             } else {
-                                trigger_error("html_checkboxes: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
+                                trigger_error("html_checkboxes: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
                                 continue;
                             }
                         } else {
@@ -101,7 +102,7 @@ function smarty_function_html_checkboxes($params, $template)
                     if (method_exists($_val, "__toString")) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_checkboxes: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                        trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
                     }
                 } else {
                     $selected = smarty_function_escape_special_chars((string) $_val);
@@ -116,7 +117,8 @@ function smarty_function_html_checkboxes($params, $template)
             case 'assign':
                 break;
 
-            case 'strict': break;
+            case 'strict':
+                break;
 
             case 'disabled':
             case 'readonly':
@@ -131,11 +133,11 @@ function smarty_function_html_checkboxes($params, $template)
 
                     break;
                 }
-                // omit break; to fall through!
+            // omit break; to fall through!
 
             default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
                     trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
@@ -143,76 +145,79 @@ function smarty_function_html_checkboxes($params, $template)
         }
     }
 
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
+    if (!isset($options) && !isset($values)) {
+        return '';
+    } /* raise error here? */
 
     $_html_result = array();
 
     if (isset($options)) {
-        foreach ($options as $_key=>$_val) {
+        foreach ($options as $_key => $_val) {
             $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
         }
     } else {
-        foreach ($values as $_i=>$_key) {
+        foreach ($values as $_i => $_key) {
             $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
         }
     }
 
-    if(!empty($params['assign'])) {
+    if (!empty($params['assign'])) {
         $template->assign($params['assign'], $_html_result);
     } else {
         return implode("\n", $_html_result);
     }
-
 }
 
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape=true) {
+function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape = true)
+{
     $_output = '';
-    
+
     if (is_object($value)) {
         if (method_exists($value, "__toString")) {
             $value = (string) $value->__toString();
         } else {
-            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+            trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
+
             return '';
         }
     } else {
         $value = (string) $value;
     }
-    
+
     if (is_object($output)) {
         if (method_exists($output, "__toString")) {
             $output = (string) $output->__toString();
         } else {
-            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
+            trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE);
+
             return '';
         }
     } else {
         $output = (string) $output;
     }
-    
+
     if ($labels) {
         if ($label_ids) {
             $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
             $_output .= '<label for="' . $_id . '">';
         } else {
             $_output .= '<label>';
-        } 
+        }
     }
-    
+
     $name = smarty_function_escape_special_chars($name);
     $value = smarty_function_escape_special_chars($value);
     if ($escape) {
         $output = smarty_function_escape_special_chars($output);
     }
-    
+
     $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-    
+
     if ($labels && $label_ids) {
         $_output .= ' id="' . $_id . '"';
     }
-    
+
     if (is_array($selected)) {
         if (isset($selected[$value])) {
             $_output .= ' checked="checked"';
@@ -220,14 +225,13 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte
     } elseif ($value === $selected) {
         $_output .= ' checked="checked"';
     }
-    
+
     $_output .= $extra . ' />' . $output;
     if ($labels) {
         $_output .= '</label>';
     }
-    
-    $_output .=  $separator;
+
+    $_output .= $separator;
+
     return $_output;
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/function.html_image.php b/sources/include/smarty/libs/plugins/function.html_image.php
index 6521966..5037e8b 100644
--- a/sources/include/smarty/libs/plugins/function.html_image.php
+++ b/sources/include/smarty/libs/plugins/function.html_image.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_image} function plugin
- * 
  * Type:     function<br>
  * Name:     html_image<br>
  * Date:     Feb 24, 2003<br>
@@ -23,21 +22,24 @@
  * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
  * - path_prefix - prefix for path output (optional, default empty)
  * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author credits to Duda <duda@big.hu> 
+ *
+ * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ *          (Smarty online manual)
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Duda <duda@big.hu>
  * @version 1.0
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *
+ * @throws SmartyException
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
  */
 function smarty_function_html_image($params, $template)
 {
     require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
- 
+
     $alt = '';
     $file = '';
     $height = '';
@@ -47,7 +49,7 @@ function smarty_function_html_image($params, $template)
     $suffix = '';
     $path_prefix = '';
     $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
-    foreach($params as $_key => $_val) {
+    foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'file':
             case 'height':
@@ -63,7 +65,7 @@ function smarty_function_html_image($params, $template)
                     $$_key = smarty_function_escape_special_chars($_val);
                 } else {
                     throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
 
             case 'link':
@@ -77,41 +79,42 @@ function smarty_function_html_image($params, $template)
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
                     throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
-        } 
-    } 
+        }
+    }
 
     if (empty($file)) {
         trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
+
         return;
-    } 
+    }
 
     if ($file[0] == '/') {
         $_image_path = $basedir . $file;
     } else {
         $_image_path = $file;
     }
-    
+
     // strip file protocol
     if (stripos($params['file'], 'file://') === 0) {
         $params['file'] = substr($params['file'], 7);
     }
-    
+
     $protocol = strpos($params['file'], '://');
     if ($protocol !== false) {
         $protocol = strtolower(substr($params['file'], 0, $protocol));
     }
-    
+
     if (isset($template->smarty->security_policy)) {
         if ($protocol) {
             // remote resource (or php stream, …)
-            if(!$template->smarty->security_policy->isTrustedUri($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
                 return;
             }
         } else {
             // local file
-            if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
                 return;
             }
         }
@@ -122,23 +125,26 @@ function smarty_function_html_image($params, $template)
         if (!$_image_data = @getimagesize($_image_path)) {
             if (!file_exists($_image_path)) {
                 trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
+
                 return;
-            } else if (!is_readable($_image_path)) {
+            } elseif (!is_readable($_image_path)) {
                 trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
+
                 return;
             } else {
                 trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
+
                 return;
-            } 
+            }
         }
 
         if (!isset($params['width'])) {
             $width = $_image_data[0];
-        } 
+        }
         if (!isset($params['height'])) {
             $height = $_image_data[1];
-        } 
-    } 
+        }
+    }
 
     if (isset($params['dpi'])) {
         if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
@@ -147,13 +153,11 @@ function smarty_function_html_image($params, $template)
             $dpi_default = 72;
         } else {
             $dpi_default = 96;
-        } 
+        }
         $_resize = $dpi_default / $params['dpi'];
         $width = round($width * $_resize);
         $height = round($height * $_resize);
-    } 
+    }
 
     return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/sources/include/smarty/libs/plugins/function.html_options.php b/sources/include/smarty/libs/plugins/function.html_options.php
index 68fa052..7ec3e06 100644
--- a/sources/include/smarty/libs/plugins/function.html_options.php
+++ b/sources/include/smarty/libs/plugins/function.html_options.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_options} function plugin
- * 
  * Type:     function<br>
  * Name:     html_options<br>
  * Purpose:  Prints the list of <option> tags generated from
@@ -23,17 +22,18 @@
  * - id         (optional) - string default not set
  * - class      (optional) - string default not set
  * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *
+ * @link     http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ *           (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ * @uses     smarty_function_escape_special_chars()
  */
-function smarty_function_html_options($params, $template)
+function smarty_function_html_options($params)
 {
     require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
 
@@ -72,7 +72,7 @@ function smarty_function_html_options($params, $template)
                             if (method_exists($_sel, "__toString")) {
                                 $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
                             } else {
-                                trigger_error("html_options: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
+                                trigger_error("html_options: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
                                 continue;
                             }
                         } else {
@@ -84,42 +84,44 @@ function smarty_function_html_options($params, $template)
                     if (method_exists($_val, "__toString")) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_options: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                        trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
                     }
                 } else {
                     $selected = smarty_function_escape_special_chars((string) $_val);
                 }
                 break;
-            
-            case 'strict': break;
-            
+
+            case 'strict':
+                break;
+
             case 'disabled':
             case 'readonly':
                 if (!empty($params['strict'])) {
                     if (!is_scalar($_val)) {
                         trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
                     }
-                    
+
                     if ($_val === true || $_val === $_key) {
                         $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
                     }
-                    
+
                     break;
                 }
-                // omit break; to fall through!
-            
+            // omit break; to fall through!
+
             default:
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
                     trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
-        } 
+        }
     }
 
     if (!isset($options) && !isset($values)) {
         /* raise error here? */
+
         return '';
     }
 
@@ -134,14 +136,14 @@ function smarty_function_html_options($params, $template)
         foreach ($values as $_i => $_key) {
             $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        } 
+        }
     }
 
     if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="'.$class.'"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'"' : '';
+        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
         $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
-    } 
+    }
 
     return $_html_result;
 }
@@ -158,36 +160,37 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
         } elseif ($_key === $selected) {
             $_html_result .= ' selected="selected"';
         }
-        $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
+        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
         if (is_object($value)) {
             if (method_exists($value, "__toString")) {
                 $value = smarty_function_escape_special_chars((string) $value->__toString());
             } else {
-                trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+                trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
+
                 return '';
             }
         } else {
             $value = smarty_function_escape_special_chars((string) $value);
         }
         $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx++;
+        $idx ++;
     } else {
         $_idx = 0;
-        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx);
-        $idx++;
+        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null, $class, $_idx);
+        $idx ++;
     }
+
     return $_html_result;
-} 
+}
 
 function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
 {
     $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
     foreach ($values as $key => $value) {
         $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
-    } 
+    }
     $optgroup_html .= "</optgroup>\n";
-    return $optgroup_html;
-} 
 
-?>
\ No newline at end of file
+    return $optgroup_html;
+}
diff --git a/sources/include/smarty/libs/plugins/function.html_radios.php b/sources/include/smarty/libs/plugins/function.html_radios.php
index a2741f6..f121d5e 100644
--- a/sources/include/smarty/libs/plugins/function.html_radios.php
+++ b/sources/include/smarty/libs/plugins/function.html_radios.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_radios} function plugin
- * 
  * File:       function.html_radios.php<br>
  * Type:       function<br>
  * Name:       html_radios<br>
@@ -31,16 +30,18 @@
  * {html_radios values=$ids name='box' separator='<br>' output=$names}
  * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
  * </pre>
- * 
- * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *      (Smarty online manual)
- * @author Christopher Kvarme <christopher.kvarme@flashjab.com> 
- * @author credits to Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ *          (Smarty online manual)
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
  * @version 1.0
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
  */
 function smarty_function_html_radios($params, $template)
 {
@@ -57,7 +58,7 @@ function smarty_function_html_radios($params, $template)
     $output = null;
     $extra = '';
 
-    foreach($params as $_key => $_val) {
+    foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'name':
             case 'separator':
@@ -72,11 +73,11 @@ function smarty_function_html_radios($params, $template)
                     if (method_exists($_val, "__toString")) {
                         $selected = smarty_function_escape_special_chars((string) $_val->__toString());
                     } else {
-                        trigger_error("html_radios: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                        trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
                     }
                 } else {
                     $selected = (string) $_val;
-                } 
+                }
                 break;
 
             case 'escape':
@@ -102,7 +103,8 @@ function smarty_function_html_radios($params, $template)
             case 'assign':
                 break;
 
-            case 'strict': break;
+            case 'strict':
+                break;
 
             case 'disabled':
             case 'readonly':
@@ -117,20 +119,21 @@ function smarty_function_html_radios($params, $template)
 
                     break;
                 }
-                // omit break; to fall through!
+            // omit break; to fall through!
 
             default:
                 if (!is_array($_val)) {
                     $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
                 } else {
                     trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
-        } 
-    } 
+        }
+    }
 
     if (!isset($options) && !isset($values)) {
         /* raise error here? */
+
         return '';
     }
 
@@ -144,57 +147,59 @@ function smarty_function_html_radios($params, $template)
         foreach ($values as $_i => $_key) {
             $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-        } 
-    } 
+        }
+    }
 
     if (!empty($params['assign'])) {
         $template->assign($params['assign'], $_html_result);
     } else {
         return implode("\n", $_html_result);
-    } 
-} 
+    }
+}
 
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape)
 {
     $_output = '';
-    
+
     if (is_object($value)) {
         if (method_exists($value, "__toString")) {
             $value = (string) $value->__toString();
         } else {
-            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+            trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
+
             return '';
         }
     } else {
         $value = (string) $value;
     }
-    
+
     if (is_object($output)) {
         if (method_exists($output, "__toString")) {
             $output = (string) $output->__toString();
         } else {
-            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
+            trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE);
+
             return '';
         }
     } else {
         $output = (string) $output;
     }
-    
+
     if ($labels) {
         if ($label_ids) {
             $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
             $_output .= '<label for="' . $_id . '">';
         } else {
             $_output .= '<label>';
-        } 
+        }
     }
-    
+
     $name = smarty_function_escape_special_chars($name);
     $value = smarty_function_escape_special_chars($value);
     if ($escape) {
         $output = smarty_function_escape_special_chars($output);
     }
-    
+
     $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
 
     if ($labels && $label_ids) {
@@ -204,14 +209,13 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $
     if ($value === $selected) {
         $_output .= ' checked="checked"';
     }
-    
+
     $_output .= $extra . ' />' . $output;
     if ($labels) {
         $_output .= '</label>';
     }
-    
-    $_output .= $separator;
-    return $_output;
-} 
 
-?>
\ No newline at end of file
+    $_output .= $separator;
+
+    return $_output;
+}
diff --git a/sources/include/smarty/libs/plugins/function.html_select_date.php b/sources/include/smarty/libs/plugins/function.html_select_date.php
index 13c5003..d662566 100644
--- a/sources/include/smarty/libs/plugins/function.html_select_date.php
+++ b/sources/include/smarty/libs/plugins/function.html_select_date.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
@@ -17,11 +17,9 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
 
 /**
  * Smarty {html_select_date} plugin
- * 
  * Type:     function<br>
  * Name:     html_select_date<br>
  * Purpose:  Prints the dropdowns for date selection.
- * 
  * ChangeLog:
  * <pre>
  *            - 1.0 initial release
@@ -37,21 +35,22 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
  *              dropdown to include given date unless explicitly set (Monte)
  *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
  *              of 0000-00-00 dates (cybot, boots)
- *            - 2.0 complete rewrite for performance,  
+ *            - 2.0 complete rewrite for performance,
  *              added attributes month_names, *_id
  * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
- *      (Smarty online manual)
- * @version 2.0
- * @author Andrei Zmievski 
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Rodney Rehm
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string 
+ *
+ * @link     http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ *           (Smarty online manual)
+ * @version  2.0
+ * @author   Andrei Zmievski
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @return string
  */
-function smarty_function_html_select_date($params, $template)
+function smarty_function_html_select_date($params)
 {
     // generate timestamps used for month names only
     static $_month_timestamps = null;
@@ -59,7 +58,7 @@ function smarty_function_html_select_date($params, $template)
     if ($_month_timestamps === null) {
         $_current_year = date('Y');
         $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i++) {
+        for ($i = 1; $i <= 12; $i ++) {
             $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
         }
     }
@@ -120,7 +119,7 @@ function smarty_function_html_select_date($params, $template)
                     $time = smarty_make_timestamp($_value);
                 }
                 break;
-                
+
             case 'month_names':
                 if (is_array($_value) && count($_value) == 12) {
                     $$_key = $_value;
@@ -128,7 +127,7 @@ function smarty_function_html_select_date($params, $template)
                     trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
                 }
                 break;
-                
+
             case 'prefix':
             case 'field_array':
             case 'start_year':
@@ -155,7 +154,7 @@ function smarty_function_html_select_date($params, $template)
             case 'month_id':
             case 'day_id':
             case 'year_id':
-                $$_key = (string)$_value;
+                $$_key = (string) $_value;
                 break;
 
             case 'display_days':
@@ -163,7 +162,7 @@ function smarty_function_html_select_date($params, $template)
             case 'display_years':
             case 'year_as_text':
             case 'reverse_years':
-                $$_key = (bool)$_value;
+                $$_key = (bool) $_value;
                 break;
 
             default:
@@ -171,32 +170,30 @@ function smarty_function_html_select_date($params, $template)
                     $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
                 } else {
                     trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
+                }
                 break;
-        } 
+        }
     }
-    
+
     // Note: date() is faster than strftime()
     // Note: explode(date()) is faster than date() date() date()
     if (isset($params['time']) && is_array($params['time'])) {
         if (isset($params['time'][$prefix . 'Year'])) {
             // $_REQUEST[$field_array] given
-            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params['time'][$prefix . $_elementName])
                     ? $params['time'][$prefix . $_elementName]
                     : date($_elementKey);
             }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
         } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
             // $_REQUEST given
-            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+            foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
                     ? $params['time'][$field_array][$prefix . $_elementName]
                     : date($_elementKey);
             }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
         } else {
             // no date found, use NOW
             list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
@@ -217,13 +214,13 @@ function smarty_function_html_select_date($params, $template)
         $key .= '_year';
         $t = $$key;
         if ($t === null) {
-            $$key = (int)$_current_year;
-        } else if ($t[0] == '+') {
-            $$key = (int)($_current_year + trim(substr($t, 1)));
-        } else if ($t[0] == '-') {
-            $$key = (int)($_current_year - trim(substr($t, 1)));
+            $$key = (int) $_current_year;
+        } elseif ($t[0] == '+') {
+            $$key = (int) ($_current_year + (int)trim(substr($t, 1)));
+        } elseif ($t[0] == '-') {
+            $$key = (int) ($_current_year - (int)trim(substr($t, 1)));
         } else {
-            $$key = (int)$$key;
+            $$key = (int) $$key;
         }
     }
 
@@ -236,73 +233,71 @@ function smarty_function_html_select_date($params, $template)
 
     // generate year <select> or <input>
     if ($display_years) {
-        $_html_years = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
         if ($all_extra) {
             $_extra .= ' ' . $all_extra;
-        } 
+        }
         if ($year_extra) {
             $_extra .= ' ' . $year_extra;
         }
-        
+
         if ($year_as_text) {
             $_html_years = '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra . $extra_attrs . ' />';
         } else {
             $_html_years = '<select name="' . $_name . '"';
             if ($year_id !== null || $all_id !== null) {
-                $_html_years .= ' id="' . smarty_function_escape_special_chars( 
-                    $year_id !== null ? ( $year_id ? $year_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-                ) . '"';
+                $_html_years .= ' id="' . smarty_function_escape_special_chars(
+                        $year_id !== null ? ($year_id ? $year_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                    ) . '"';
             }
             if ($year_size) {
                 $_html_years .= ' size="' . $year_size . '"';
-            } 
-            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
-            
-            if (isset($year_empty) || isset($all_empty)) {
-                $_html_years .= '<option value="">' . ( isset($year_empty) ? $year_empty : $all_empty ) . '</option>' . $option_separator;
             }
-            
-            $op = $start_year > $end_year ? -1 : 1;
-            for ($i=$start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
+
+            if (isset($year_empty) || isset($all_empty)) {
+                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' . $option_separator;
+            }
+
+            $op = $start_year > $end_year ? - 1 : 1;
+            for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
                 $_html_years .= '<option value="' . $i . '"'
                     . ($_year == $i ? ' selected="selected"' : '')
                     . '>' . $i . '</option>' . $option_separator;
             }
-            
+
             $_html_years .= '</select>';
         }
     }
-    
+
     // generate month <select> or <input>
     if ($display_months) {
-        $_html_month = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
         if ($all_extra) {
             $_extra .= ' ' . $all_extra;
-        } 
+        }
         if ($month_extra) {
             $_extra .= ' ' . $month_extra;
         }
-        
+
         $_html_months = '<select name="' . $_name . '"';
         if ($month_id !== null || $all_id !== null) {
-            $_html_months .= ' id="' . smarty_function_escape_special_chars( 
-                $month_id !== null ? ( $month_id ? $month_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-            ) . '"';
+            $_html_months .= ' id="' . smarty_function_escape_special_chars(
+                    $month_id !== null ? ($month_id ? $month_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($month_size) {
             $_html_months .= ' size="' . $month_size . '"';
-        } 
-        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-        
-        if (isset($month_empty) || isset($all_empty)) {
-            $_html_months .= '<option value="">' . ( isset($month_empty) ? $month_empty : $all_empty ) . '</option>' . $option_separator;
         }
-        
-        for ($i = 1; $i <= 12; $i++) {
+        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
+
+        if (isset($month_empty) || isset($all_empty)) {
+            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' . $option_separator;
+        }
+
+        for ($i = 1; $i <= 12; $i ++) {
             $_val = sprintf('%02d', $i);
             $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i]));
             $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]);
@@ -310,52 +305,51 @@ function smarty_function_html_select_date($params, $template)
                 . ($_val == $_month ? ' selected="selected"' : '')
                 . '>' . $_text . '</option>' . $option_separator;
         }
-        
+
         $_html_months .= '</select>';
     }
-    
+
     // generate day <select> or <input>
     if ($display_days) {
-        $_html_day = '';
         $_extra = '';
         $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
         if ($all_extra) {
             $_extra .= ' ' . $all_extra;
-        } 
+        }
         if ($day_extra) {
             $_extra .= ' ' . $day_extra;
         }
-        
+
         $_html_days = '<select name="' . $_name . '"';
         if ($day_id !== null || $all_id !== null) {
-            $_html_days .= ' id="' . smarty_function_escape_special_chars( 
-                $day_id !== null ? ( $day_id ? $day_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-            ) . '"';
+            $_html_days .= ' id="' . smarty_function_escape_special_chars(
+                    $day_id !== null ? ($day_id ? $day_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($day_size) {
             $_html_days .= ' size="' . $day_size . '"';
-        } 
-        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
-        
-        if (isset($day_empty) || isset($all_empty)) {
-            $_html_days .= '<option value="">' . ( isset($day_empty) ? $day_empty : $all_empty ) . '</option>' . $option_separator;
         }
-        
-        for ($i = 1; $i <= 31; $i++) {
+        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
+
+        if (isset($day_empty) || isset($all_empty)) {
+            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' . $option_separator;
+        }
+
+        for ($i = 1; $i <= 31; $i ++) {
             $_val = sprintf('%02d', $i);
             $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
-            $_value = $day_value_format ==  '%02d' ? $_val : sprintf($day_value_format, $i);
+            $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
             $_html_days .= '<option value="' . $_value . '"'
                 . ($_val == $_day ? ' selected="selected"' : '')
                 . '>' . $_text . '</option>' . $option_separator;
         }
-        
+
         $_html_days .= '</select>';
     }
 
     // order the fields for output
     $_html = '';
-    for ($i=0; $i <= 2; $i++) {
+    for ($i = 0; $i <= 2; $i ++) {
         switch ($field_order[$i]) {
             case 'Y':
             case 'y':
@@ -365,8 +359,8 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_years;
                 }
-            break;
-            
+                break;
+
             case 'm':
             case 'M':
                 if (isset($_html_months)) {
@@ -375,8 +369,8 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_months;
                 }
-            break;
-            
+                break;
+
             case 'd':
             case 'D':
                 if (isset($_html_days)) {
@@ -385,10 +379,9 @@ function smarty_function_html_select_date($params, $template)
                     }
                     $_html .= $_html_days;
                 }
-            break;
+                break;
         }
     }
+
     return $_html;
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/function.html_select_time.php b/sources/include/smarty/libs/plugins/function.html_select_time.php
index 9fb8038..9af6aad 100644
--- a/sources/include/smarty/libs/plugins/function.html_select_time.php
+++ b/sources/include/smarty/libs/plugins/function.html_select_time.php
@@ -2,7 +2,7 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
@@ -17,21 +17,21 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
 
 /**
  * Smarty {html_select_time} function plugin
- *
  * Type:     function<br>
  * Name:     html_select_time<br>
  * Purpose:  Prints the dropdowns for time selection
  *
- * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
- *          (Smarty online manual)
- * @author Roberto Berto <roberto@berto.net>
- * @author Monte Ohrt <monte AT ohrt DOT com>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @link     http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ *           (Smarty online manual)
+ * @author   Roberto Berto <roberto@berto.net>
+ * @author   Monte Ohrt <monte AT ohrt DOT com>
+ *
+ * @param array $params parameters
+ *
  * @return string
- * @uses smarty_make_timestamp()
+ * @uses     smarty_make_timestamp()
  */
-function smarty_function_html_select_time($params, $template)
+function smarty_function_html_select_time($params)
 {
     $prefix = "Time_";
     $field_array = null;
@@ -117,7 +117,7 @@ function smarty_function_html_select_time($params, $template)
             case 'minute_value_format':
             case 'second_format':
             case 'second_value_format':
-                $$_key = (string)$_value;
+                $$_key = (string) $_value;
                 break;
 
             case 'display_hours':
@@ -125,7 +125,7 @@ function smarty_function_html_select_time($params, $template)
             case 'display_seconds':
             case 'display_meridian':
             case 'use_24_hours':
-                $$_key = (bool)$_value;
+                $$_key = (bool) $_value;
                 break;
 
             case 'minute_interval':
@@ -135,7 +135,7 @@ function smarty_function_html_select_time($params, $template)
             case 'minute_size':
             case 'second_size':
             case 'meridian_size':
-                $$_key = (int)$_value;
+                $$_key = (int) $_value;
                 break;
 
             default:
@@ -151,7 +151,7 @@ function smarty_function_html_select_time($params, $template)
     if (isset($params['time']) && is_array($params['time'])) {
         if (isset($params['time'][$prefix . 'Hour'])) {
             // $_REQUEST[$field_array] given
-            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params['time'][$prefix . $_elementName])
                     ? $params['time'][$prefix . $_elementName]
@@ -160,11 +160,11 @@ function smarty_function_html_select_time($params, $template)
             $_meridian = isset($params['time'][$prefix . 'Meridian'])
                 ? (' ' . $params['time'][$prefix . 'Meridian'])
                 : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
         } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
             // $_REQUEST given
-            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
                 $_variableName = '_' . strtolower($_elementName);
                 $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
                     ? $params['time'][$field_array][$prefix . $_elementName]
@@ -173,7 +173,7 @@ function smarty_function_html_select_time($params, $template)
             $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian'])
                 ? (' ' . $params['time'][$field_array][$prefix . 'Meridian'])
                 : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
             list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
         } else {
             // no date found, use NOW
@@ -204,8 +204,8 @@ function smarty_function_html_select_time($params, $template)
         $_html_hours = '<select name="' . $_name . '"';
         if ($hour_id !== null || $all_id !== null) {
             $_html_hours .= ' id="' . smarty_function_escape_special_chars(
-                $hour_id !== null ? ( $hour_id ? $hour_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
+                    $hour_id !== null ? ($hour_id ? $hour_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($hour_size) {
             $_html_hours .= ' size="' . $hour_size . '"';
@@ -213,12 +213,12 @@ function smarty_function_html_select_time($params, $template)
         $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
 
         if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '<option value="">' . ( isset($hour_empty) ? $hour_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' . $option_separator;
         }
 
         $start = $use_24_hours ? 0 : 1;
         $end = $use_24_hours ? 23 : 12;
-        for ($i=$start; $i <= $end; $i++) {
+        for ($i = $start; $i <= $end; $i ++) {
             $_val = sprintf('%02d', $i);
             $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
             $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
@@ -226,7 +226,7 @@ function smarty_function_html_select_time($params, $template)
             if (!$use_24_hours) {
                 $_hour12 = $_hour == 0
                     ? 12
-                    : ($_hour <= 12 ? $_hour : $_hour -12);
+                    : ($_hour <= 12 ? $_hour : $_hour - 12);
             }
 
             $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
@@ -253,8 +253,8 @@ function smarty_function_html_select_time($params, $template)
         $_html_minutes = '<select name="' . $_name . '"';
         if ($minute_id !== null || $all_id !== null) {
             $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
-                $minute_id !== null ? ( $minute_id ? $minute_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
+                    $minute_id !== null ? ($minute_id ? $minute_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($minute_size) {
             $_html_minutes .= ' size="' . $minute_size . '"';
@@ -262,11 +262,11 @@ function smarty_function_html_select_time($params, $template)
         $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
 
         if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '<option value="">' . ( isset($minute_empty) ? $minute_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' . $option_separator;
         }
 
         $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
-        for ($i=0; $i <= 59; $i += $minute_interval) {
+        for ($i = 0; $i <= 59; $i += $minute_interval) {
             $_val = sprintf('%02d', $i);
             $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
             $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
@@ -293,8 +293,8 @@ function smarty_function_html_select_time($params, $template)
         $_html_seconds = '<select name="' . $_name . '"';
         if ($second_id !== null || $all_id !== null) {
             $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
-                $second_id !== null ? ( $second_id ? $second_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
+                    $second_id !== null ? ($second_id ? $second_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($second_size) {
             $_html_seconds .= ' size="' . $second_size . '"';
@@ -302,11 +302,11 @@ function smarty_function_html_select_time($params, $template)
         $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
 
         if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '<option value="">' . ( isset($second_empty) ? $second_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' . $option_separator;
         }
 
         $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
-        for ($i=0; $i <= 59; $i += $second_interval) {
+        for ($i = 0; $i <= 59; $i += $second_interval) {
             $_val = sprintf('%02d', $i);
             $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
             $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
@@ -333,8 +333,8 @@ function smarty_function_html_select_time($params, $template)
         $_html_meridian = '<select name="' . $_name . '"';
         if ($meridian_id !== null || $all_id !== null) {
             $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
-                $meridian_id !== null ? ( $meridian_id ? $meridian_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
+                    $meridian_id !== null ? ($meridian_id ? $meridian_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
+                ) . '"';
         }
         if ($meridian_size) {
             $_html_meridian .= ' size="' . $meridian_size . '"';
@@ -342,11 +342,11 @@ function smarty_function_html_select_time($params, $template)
         $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
 
         if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '<option value="">' . ( isset($meridian_empty) ? $meridian_empty : $all_empty ) . '</option>' . $option_separator;
+            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) . '</option>' . $option_separator;
         }
 
-        $_html_meridian .= '<option value="am"'. ($_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
-            . '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator
+        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') . '>AM</option>' . $option_separator
+            . '<option value="pm"' . ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator
             . '</select>';
     }
 
@@ -362,5 +362,3 @@ function smarty_function_html_select_time($params, $template)
 
     return $_html;
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/function.html_table.php b/sources/include/smarty/libs/plugins/function.html_table.php
index 6b9cb9d..ec7ba48 100644
--- a/sources/include/smarty/libs/plugins/function.html_table.php
+++ b/sources/include/smarty/libs/plugins/function.html_table.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {html_table} function plugin
- *
  * Type:     function<br>
  * Name:     html_table<br>
  * Date:     Feb 17, 2003<br>
@@ -37,17 +36,18 @@
  * {table loop=$data cols="first,second,third" tr_attr=$colors}
  * </pre>
  *
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author credit to boots <boots dot smarty at yahoo dot com>
- * @version 1.1
- * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
- *          (Smarty online manual)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   credit to Messju Mohr <messju at lammfellpuschen dot de>
+ * @author   credit to boots <boots dot smarty at yahoo dot com>
+ * @version  1.1
+ * @link     http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ *           (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
  * @return string
  */
-function smarty_function_html_table($params, $template)
+function smarty_function_html_table($params)
 {
     $table_attr = 'border="1"';
     $tr_attr = '';
@@ -63,14 +63,15 @@ function smarty_function_html_table($params, $template)
     $loop = null;
 
     if (!isset($params['loop'])) {
-        trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
+        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+
         return;
     }
 
     foreach ($params as $_key => $_value) {
         switch ($_key) {
             case 'loop':
-                $$_key = (array)$_value;
+                $$_key = (array) $_value;
                 break;
 
             case 'cols':
@@ -81,14 +82,14 @@ function smarty_function_html_table($params, $template)
                     $cols = explode(',', $_value);
                     $cols_count = count($cols);
                 } elseif (!empty($_value)) {
-                    $cols_count = (int)$_value;
+                    $cols_count = (int) $_value;
                 } else {
                     $cols_count = $cols;
                 }
                 break;
 
             case 'rows':
-                $$_key = (int)$_value;
+                $$_key = (int) $_value;
                 break;
 
             case 'table_attr':
@@ -97,7 +98,7 @@ function smarty_function_html_table($params, $template)
             case 'vdir':
             case 'inner':
             case 'caption':
-                $$_key = (string)$_value;
+                $$_key = (string) $_value;
                 break;
 
             case 'tr_attr':
@@ -129,7 +130,7 @@ function smarty_function_html_table($params, $template)
         $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
         $output .= "<thead><tr>\n";
 
-        for ($r = 0; $r < $cols_count; $r++) {
+        for ($r = 0; $r < $cols_count; $r ++) {
             $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
             $output .= $cols[$r];
             $output .= "</th>\n";
@@ -138,12 +139,12 @@ function smarty_function_html_table($params, $template)
     }
 
     $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r++) {
+    for ($r = 0; $r < $rows; $r ++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows-1 - $r) * $cols_count;
+        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
 
-        for ($c = 0; $c < $cols_count; $c++) {
-            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count-1 - $c;
+        for ($c = 0; $c < $cols_count; $c ++) {
+            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
             if ($inner != 'cols') {
                 /* shuffle x to loop over rows*/
                 $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
@@ -173,5 +174,3 @@ function smarty_function_html_table_cycle($name, $var, $no)
 
     return ($ret) ? ' ' . $ret : '';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/function.mailto.php b/sources/include/smarty/libs/plugins/function.mailto.php
index 55d5c06..520fb7a 100644
--- a/sources/include/smarty/libs/plugins/function.mailto.php
+++ b/sources/include/smarty/libs/plugins/function.mailto.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {mailto} function plugin
- *
  * Type:     function<br>
  * Name:     mailto<br>
  * Date:     May 21, 2002
@@ -39,22 +38,24 @@
  * {mailto address="me@domain.com" extra='class="mailto"'}
  * </pre>
  *
- * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
- *          (Smarty online manual)
- * @version 1.2
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credits to Jason Sweat (added cc, bcc and subject functionality)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @link     http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ *           (Smarty online manual)
+ * @version  1.2
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   credits to Jason Sweat (added cc, bcc and subject functionality)
+ *
+ * @param array $params parameters
+ *
  * @return string
  */
-function smarty_function_mailto($params, $template)
+function smarty_function_mailto($params)
 {
     static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
     $extra = '';
 
     if (empty($params['address'])) {
-        trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
+        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
+
         return;
     } else {
         $address = $params['address'];
@@ -71,8 +72,9 @@ function smarty_function_mailto($params, $template)
             case 'cc':
             case 'bcc':
             case 'followupto':
-                if (!empty($value))
-                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+            if (!empty($value)) {
+                $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+            }
                 break;
 
             case 'subject':
@@ -91,10 +93,11 @@ function smarty_function_mailto($params, $template)
     if ($mail_parms) {
         $address .= '?' . join('&', $mail_parms);
     }
-    
+
     $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
     if (!isset($_allowed_encoding[$encode])) {
         trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING);
+
         return;
     }
     // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
@@ -102,7 +105,7 @@ function smarty_function_mailto($params, $template)
         $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
 
         $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) {
             $js_encode .= '%' . bin2hex($string[$x]);
         }
 
@@ -110,7 +113,7 @@ function smarty_function_mailto($params, $template)
     } elseif ($encode == 'javascript_charcode') {
         $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
 
-        for($x = 0, $y = strlen($string); $x < $y; $x++) {
+        for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
             $ord[] = ord($string[$x]);
         }
 
@@ -125,11 +128,12 @@ function smarty_function_mailto($params, $template)
     } elseif ($encode == 'hex') {
         preg_match('!^(.*)(\?.*)$!', $address, $match);
         if (!empty($match[2])) {
-            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
+            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
+
             return;
         }
         $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
+        for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) {
             if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) {
                 $address_encode .= '%' . bin2hex($address[$x]);
             } else {
@@ -137,16 +141,15 @@ function smarty_function_mailto($params, $template)
             }
         }
         $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+        for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) {
             $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
         }
 
         $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+
         return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
     } else {
         // no encoding
         return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/function.math.php b/sources/include/smarty/libs/plugins/function.math.php
index f4d3f05..aba76e8 100644
--- a/sources/include/smarty/libs/plugins/function.math.php
+++ b/sources/include/smarty/libs/plugins/function.math.php
@@ -1,87 +1,91 @@
 <?php
 /**
  * Smarty plugin
- *
  * This plugin is only for Smarty2 BC
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsFunction
  */
 
 /**
  * Smarty {math} function plugin
- *
  * Type:     function<br>
  * Name:     math<br>
  * Purpose:  handle math computations in template
  *
- * @link http://www.smarty.net/manual/en/language.function.math.php {math}
- *          (Smarty online manual)
+ * @link     http://www.smarty.net/manual/en/language.function.math.php {math}
+ *           (Smarty online manual)
  * @author   Monte Ohrt <monte at ohrt dot com>
+ *
  * @param array                    $params   parameters
  * @param Smarty_Internal_Template $template template object
+ *
  * @return string|null
  */
 function smarty_function_math($params, $template)
 {
     static $_allowed_funcs = array(
-        'int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
-        'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
-        'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true ,'tan' => true
+        'int'  => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
+        'log'  => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
+        'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true, 'tan' => true
     );
     // be sure equation parameter is present
     if (empty($params['equation'])) {
-        trigger_error("math: missing equation parameter",E_USER_WARNING);
+        trigger_error("math: missing equation parameter", E_USER_WARNING);
+
         return;
     }
 
     $equation = $params['equation'];
 
     // make sure parenthesis are balanced
-    if (substr_count($equation,"(") != substr_count($equation,")")) {
-        trigger_error("math: unbalanced parenthesis",E_USER_WARNING);
+    if (substr_count($equation, "(") != substr_count($equation, ")")) {
+        trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
+
         return;
     }
 
     // match all vars in equation, make sure all are passed
-    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
+    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!", $equation, $match);
 
-    foreach($match[1] as $curr_var) {
+    foreach ($match[1] as $curr_var) {
         if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
-            trigger_error("math: function call $curr_var not allowed",E_USER_WARNING);
+            trigger_error("math: function call $curr_var not allowed", E_USER_WARNING);
+
             return;
         }
     }
 
-    foreach($params as $key => $val) {
+    foreach ($params as $key => $val) {
         if ($key != "equation" && $key != "format" && $key != "assign") {
             // make sure value is not empty
-            if (strlen($val)==0) {
-                trigger_error("math: parameter $key is empty",E_USER_WARNING);
+            if (strlen($val) == 0) {
+                trigger_error("math: parameter $key is empty", E_USER_WARNING);
+
                 return;
             }
             if (!is_numeric($val)) {
-                trigger_error("math: parameter $key: is not numeric",E_USER_WARNING);
+                trigger_error("math: parameter $key: is not numeric", E_USER_WARNING);
+
                 return;
             }
             $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
         }
     }
     $smarty_math_result = null;
-    eval("\$smarty_math_result = ".$equation.";");
+    eval("\$smarty_math_result = " . $equation . ";");
 
     if (empty($params['format'])) {
         if (empty($params['assign'])) {
             return $smarty_math_result;
         } else {
-            $template->assign($params['assign'],$smarty_math_result);
+            $template->assign($params['assign'], $smarty_math_result);
         }
     } else {
-        if (empty($params['assign'])){
-            printf($params['format'],$smarty_math_result);
+        if (empty($params['assign'])) {
+            printf($params['format'], $smarty_math_result);
         } else {
-            $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
+            $template->assign($params['assign'], sprintf($params['format'], $smarty_math_result));
         }
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifier.capitalize.php b/sources/include/smarty/libs/plugins/modifier.capitalize.php
index a78e363..a8ad763 100644
--- a/sources/include/smarty/libs/plugins/modifier.capitalize.php
+++ b/sources/include/smarty/libs/plugins/modifier.capitalize.php
@@ -1,25 +1,24 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty capitalize modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     capitalize<br>
  * Purpose:  capitalize words in the string
- *
  * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
  *
  * @param string  $string    string to capitalize
  * @param boolean $uc_digits also capitalize "x123" to "X123"
  * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
+ *
  * @return string capitalized string
- * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Monte Ohrt <monte at ohrt dot com>
  * @author Rodney Rehm
  */
 function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
@@ -27,39 +26,65 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
     if (Smarty::$_MBSTRING) {
         if ($lc_rest) {
             // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case( $string, MB_CASE_TITLE, Smarty::$_CHARSET );
+            $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
         } else {
             // uppercase word breaks
-            $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\2'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $string);
+            $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert_cb', $string);
         }
         // check uc_digits case
         if (!$uc_digits) {
             if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-                foreach($matches[1] as $match) {
+                foreach ($matches[1] as $match) {
                     $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0]));
                 }
-            } 
+            }
         }
-        $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\3'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $upper_string);
+        $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string);
         return $upper_string;
     }
-    
+
     // lowercase first
     if ($lc_rest) {
         $string = strtolower($string);
     }
     // uppercase (including hyphenated words)
-    $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').ucfirst(stripslashes('\\2'))", $string); 
+    $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb', $string);
     // check uc_digits case
     if (!$uc_digits) {
         if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-            foreach($matches[1] as $match) {
+            foreach ($matches[1] as $match) {
                 $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
             }
-        } 
+        }
     }
-    $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').strtoupper(stripslashes('\\3'))", $upper_string);
+    $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb', $upper_string);
     return $upper_string;
-} 
+}
 
-?>
\ No newline at end of file
+/* 
+ *
+ * Bug: create_function() use exhausts memory when used in long loops
+ * Fix: use declared functions for callbacks instead of using create_function()
+ * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
+ *
+ * @author Kyle Renfrow
+ */
+function smarty_mod_cap_mbconvert_cb($matches)
+{
+    return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[2]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+
+function smarty_mod_cap_mbconvert2_cb($matches)
+{
+    return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[3]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+
+function smarty_mod_cap_ucfirst_cb($matches)
+{
+    return stripslashes($matches[1]) . ucfirst(stripslashes($matches[2]));
+}
+
+function smarty_mod_cap_ucfirst2_cb($matches)
+{
+    return stripslashes($matches[1]) . ucfirst(stripslashes($matches[3]));
+}
diff --git a/sources/include/smarty/libs/plugins/modifier.date_format.php b/sources/include/smarty/libs/plugins/modifier.date_format.php
index f3eaba0..28d6ff0 100644
--- a/sources/include/smarty/libs/plugins/modifier.date_format.php
+++ b/sources/include/smarty/libs/plugins/modifier.date_format.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty date_format modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     date_format<br>
  * Purpose:  format datestamps via strftime<br>
@@ -16,24 +15,26 @@
  *          - string: input date string
  *          - format: strftime format for output
  *          - default_date: default date if $string is empty
- * 
- * @link http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string $string       input date string
  * @param string $format       strftime format for output
  * @param string $default_date default date if $string is empty
  * @param string $formatter    either 'strftime' or 'auto'
+ *
  * @return string |void
- * @uses smarty_make_timestamp()
+ * @uses   smarty_make_timestamp()
  */
-function smarty_modifier_date_format($string, $format=null, $default_date='', $formatter='auto')
+function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
 {
     if ($format === null) {
         $format = Smarty::$_DATE_FORMAT;
     }
     /**
-    * Include the {@link shared.make_timestamp.php} plugin
-    */
+     * require_once the {@link shared.make_timestamp.php} plugin
+     */
     require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
     if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') {
         $timestamp = smarty_make_timestamp($string);
@@ -41,25 +42,24 @@ function smarty_modifier_date_format($string, $format=null, $default_date='', $f
         $timestamp = smarty_make_timestamp($default_date);
     } else {
         return;
-    } 
-    if($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) {
+    }
+    if ($formatter == 'strftime' || ($formatter == 'auto' && strpos($format, '%') !== false)) {
         if (DS == '\\') {
             $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
             $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
             if (strpos($format, '%e') !== false) {
                 $_win_from[] = '%e';
                 $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
-            } 
+            }
             if (strpos($format, '%l') !== false) {
                 $_win_from[] = '%l';
                 $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
-            } 
+            }
             $format = str_replace($_win_from, $_win_to, $format);
-        } 
+        }
+
         return strftime($format, $timestamp);
     } else {
         return date($format, $timestamp);
     }
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/sources/include/smarty/libs/plugins/modifier.debug_print_var.php b/sources/include/smarty/libs/plugins/modifier.debug_print_var.php
index fa44100..4ff8213 100644
--- a/sources/include/smarty/libs/plugins/modifier.debug_print_var.php
+++ b/sources/include/smarty/libs/plugins/modifier.debug_print_var.php
@@ -1,53 +1,66 @@
 <?php
 /**
  * Smarty plugin
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Debug
  */
 
 /**
  * Smarty debug_print_var modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     debug_print_var<br>
  * Purpose:  formats variable contents for display in the console
  *
- * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param array|object $var     variable to be formatted
- * @param integer      $depth   maximum recursion depth if $var is an array
- * @param integer      $length  maximum string length if $var is a string
- * @return string 
+ * @param int          $max     maximum recursion depth if $var is an array or object
+ * @param int          $length  maximum string length if $var is a string
+ * @param int          $depth   actual recursion depth
+ * @param array        $objects processed objects in actual depth to prevent recursive object processing
+ *
+ * @return string
  */
-function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
+function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
 {
-    $_replace = array("\n" => '<i>\n</i>',
-        "\r" => '<i>\r</i>',
-        "\t" => '<i>\t</i>'
-        );
-
+    $_replace = array("\n" => '\n',
+                      "\r" => '\r',
+                      "\t" => '\t'
+    );
     switch (gettype($var)) {
         case 'array' :
             $results = '<b>Array (' . count($var) . ')</b>';
+            if ($depth == $max) {
+                break;
+            }
             foreach ($var as $curr_key => $curr_val) {
                 $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                 . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
-                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-                $depth--;
-            } 
+                    . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
+                    . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
+                $depth --;
+            }
             break;
-            
+
         case 'object' :
             $object_vars = get_object_vars($var);
             $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+            if (in_array($var, $objects)) {
+                $results .= ' called recursive';
+                break;
+            }
+            if ($depth == $max) {
+                break;
+            }
+            $objects[] = $var;
             foreach ($object_vars as $curr_key => $curr_val) {
                 $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                 . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
-                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-                $depth--;
-            } 
+                    . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
+                    . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
+                $depth --;
+            }
             break;
-            
+
         case 'boolean' :
         case 'NULL' :
         case 'resource' :
@@ -59,15 +72,15 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
                 $results = 'null';
             } else {
                 $results = htmlspecialchars((string) $var);
-            } 
+            }
             $results = '<i>' . $results . '</i>';
             break;
-            
+
         case 'integer' :
         case 'float' :
             $results = htmlspecialchars((string) $var);
             break;
-            
+
         case 'string' :
             $results = strtr($var, $_replace);
             if (Smarty::$_MBSTRING) {
@@ -82,7 +95,7 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
 
             $results = htmlspecialchars('"' . $results . '"');
             break;
-            
+
         case 'unknown type' :
         default :
             $results = strtr((string) $var, $_replace);
@@ -95,11 +108,9 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
                     $results = substr($results, 0, $length - 3) . '...';
                 }
             }
-             
+
             $results = htmlspecialchars($results);
-    } 
+    }
 
     return $results;
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/sources/include/smarty/libs/plugins/modifier.escape.php b/sources/include/smarty/libs/plugins/modifier.escape.php
index 5ca8e77..9fdb070 100644
--- a/sources/include/smarty/libs/plugins/modifier.escape.php
+++ b/sources/include/smarty/libs/plugins/modifier.escape.php
@@ -2,23 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty escape modifier plugin
- *
  * Type:     modifier<br>
  * Name:     escape<br>
  * Purpose:  escape string for output
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @link   http://www.smarty.net/docs/en/language.modifier.escape
  * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string  $string        input string
  * @param string  $esc_type      escape type
  * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
  * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+ *
  * @return string escaped input string
  */
 function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
@@ -27,7 +28,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
     if ($_double_encode === null) {
         $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
     }
-    
+
     if (!$char_set) {
         $char_set = Smarty::$_CHARSET;
     }
@@ -46,6 +47,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                     $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
                     $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+
                     return $string;
                 }
             }
@@ -65,10 +67,11 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                         $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                         $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
                         $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+
                         return $string;
                     }
                 }
-                
+
                 // htmlentities() won't convert everything, so use mb_convert_encoding
                 return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
             }
@@ -83,6 +86,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
                     $string = htmlentities($string, ENT_QUOTES, $char_set);
                     $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
+
                     return $string;
                 }
             }
@@ -102,9 +106,10 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
             // Note that the UTF-8 encoded character ä will be represented as %c3%a4
             $return = '';
             $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
+            for ($x = 0; $x < $_length; $x ++) {
                 $return .= '%' . bin2hex($string[$x]);
             }
+
             return $return;
 
         case 'hexentity':
@@ -115,13 +120,15 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                 foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
                     $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
                 }
+
                 return $return;
             }
             // no MBString fallback
             $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
+            for ($x = 0; $x < $_length; $x ++) {
                 $return .= '&#x' . bin2hex($string[$x]) . ';';
             }
+
             return $return;
 
         case 'decentity':
@@ -132,13 +139,15 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                 foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
                     $return .= '&#' . $unicode . ';';
                 }
+
                 return $return;
             }
             // no MBString fallback
             $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
+            for ($x = 0; $x < $_length; $x ++) {
                 $return .= '&#' . ord($string[$x]) . ';';
             }
+
             return $return;
 
         case 'javascript':
@@ -148,6 +157,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
         case 'mail':
             if (Smarty::$_MBSTRING) {
                 require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+
                 return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
             }
             // no MBString fallback
@@ -165,11 +175,12 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                         $return .= chr($unicode);
                     }
                 }
+
                 return $return;
             }
 
             $_length = strlen($string);
-            for ($_i = 0; $_i < $_length; $_i++) {
+            for ($_i = 0; $_i < $_length; $_i ++) {
                 $_ord = ord(substr($string, $_i, 1));
                 // non-standard char, escape it
                 if ($_ord >= 126) {
@@ -178,11 +189,10 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
                     $return .= substr($string, $_i, 1);
                 }
             }
+
             return $return;
 
         default:
             return $string;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifier.regex_replace.php b/sources/include/smarty/libs/plugins/modifier.regex_replace.php
index f9fd5fa..ffea167 100644
--- a/sources/include/smarty/libs/plugins/modifier.regex_replace.php
+++ b/sources/include/smarty/libs/plugins/modifier.regex_replace.php
@@ -2,39 +2,43 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty regex_replace modifier plugin
- *
  * Type:     modifier<br>
  * Name:     regex_replace<br>
  * Purpose:  regular expression search/replace
  *
- * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ * @link    http://smarty.php.net/manual/en/language.modifier.regex.replace.php
  *          regex_replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param string       $string   input string
- * @param string|array $search   regular expression(s) to search for
- * @param string|array $replace  string(s) that should be replaced
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string       $string  input string
+ * @param string|array $search  regular expression(s) to search for
+ * @param string|array $replace string(s) that should be replaced
+ * @param int          $limit   the maximum number of replacements
+ *
  * @return string
  */
-function smarty_modifier_regex_replace($string, $search, $replace)
+function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
 {
-    if(is_array($search)) {
-        foreach($search as $idx => $s) {
+    if (is_array($search)) {
+        foreach ($search as $idx => $s) {
             $search[$idx] = _smarty_regex_replace_check($s);
         }
     } else {
         $search = _smarty_regex_replace_check($search);
     }
-    return preg_replace($search, $replace, $string);
+
+    return preg_replace($search, $replace, $string, $limit);
 }
 
 /**
  * @param  string $search string(s) that should be replaced
+ *
  * @return string
  * @ignore
  */
@@ -42,14 +46,13 @@ function _smarty_regex_replace_check($search)
 {
     // null-byte injection detection
     // anything behind the first null-byte is ignored
-    if (($pos = strpos($search,"\0")) !== false) {
-        $search = substr($search,0,$pos);
+    if (($pos = strpos($search, "\0")) !== false) {
+        $search = substr($search, 0, $pos);
     }
     // remove eval-modifier from $search
     if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
-        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
+        $search = substr($search, 0, - strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
     }
+
     return $search;
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifier.replace.php b/sources/include/smarty/libs/plugins/modifier.replace.php
index 4d71a6e..aa5e857 100644
--- a/sources/include/smarty/libs/plugins/modifier.replace.php
+++ b/sources/include/smarty/libs/plugins/modifier.replace.php
@@ -1,33 +1,34 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty replace modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     replace<br>
  * Purpose:  simple search/replace
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Uwe Tews 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ *
  * @param string $string  input string
  * @param string $search  text to search for
  * @param string $replace replacement text
- * @return string 
+ *
+ * @return string
  */
 function smarty_modifier_replace($string, $search, $replace)
 {
     if (Smarty::$_MBSTRING) {
         require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+
         return smarty_mb_str_replace($search, $replace, $string);
     }
-    
-    return str_replace($search, $replace, $string);
-} 
 
-?>
\ No newline at end of file
+    return str_replace($search, $replace, $string);
+}
diff --git a/sources/include/smarty/libs/plugins/modifier.spacify.php b/sources/include/smarty/libs/plugins/modifier.spacify.php
index a907232..e5c41ad 100644
--- a/sources/include/smarty/libs/plugins/modifier.spacify.php
+++ b/sources/include/smarty/libs/plugins/modifier.spacify.php
@@ -1,27 +1,27 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
 
 /**
  * Smarty spacify modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     spacify<br>
  * Purpose:  add spaces between characters in a string
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string $string       input string
  * @param string $spacify_char string to insert between characters.
+ *
  * @return string
  */
 function smarty_modifier_spacify($string, $spacify_char = ' ')
 {
     // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
-} 
-
-?>
\ No newline at end of file
+    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, - 1, PREG_SPLIT_NO_EMPTY));
+}
diff --git a/sources/include/smarty/libs/plugins/modifier.truncate.php b/sources/include/smarty/libs/plugins/modifier.truncate.php
index 9a803ec..fbe62e8 100644
--- a/sources/include/smarty/libs/plugins/modifier.truncate.php
+++ b/sources/include/smarty/libs/plugins/modifier.truncate.php
@@ -2,58 +2,63 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifier
  */
- 
+
 /**
  * Smarty truncate modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     truncate<br>
  * Purpose:  Truncate a string to a certain length if necessary,
  *               optionally splitting in the middle of a word, and
  *               appending the $etc string or inserting $etc into the middle.
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
  * @param string  $string      input string
  * @param integer $length      length of truncated text
  * @param string  $etc         end string
  * @param boolean $break_words truncate at word boundary
  * @param boolean $middle      truncate in the middle of text
+ *
  * @return string truncated string
  */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) {
-    if ($length == 0)
+function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
+{
+    if ($length == 0) {
         return '';
+    }
 
     if (Smarty::$_MBSTRING) {
         if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
             $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
             if (!$break_words && !$middle) {
                 $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '', mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
-            } 
+            }
             if (!$middle) {
                 return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
             }
+
             return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc . mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
         }
+
         return $string;
     }
-    
+
     // no MBString fallback
     if (isset($string[$length])) {
         $length -= min($length, strlen($etc));
         if (!$break_words && !$middle) {
             $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
-        } 
+        }
         if (!$middle) {
             return substr($string, 0, $length) . $etc;
         }
+
         return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
     }
-    return $string;
-} 
 
-?>
\ No newline at end of file
+    return $string;
+}
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.cat.php b/sources/include/smarty/libs/plugins/modifiercompiler.cat.php
index 5049c63..db9d81f 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.cat.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.cat.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty cat modifier plugin
- *
  * Type:     modifier<br>
  * Name:     cat<br>
  * Date:     Feb 24, 2003<br>
@@ -16,15 +15,15 @@
  * Input:    string to catenate<br>
  * Example:  {$var|cat:"foo"}
  *
- * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
- *          (Smarty online manual)
+ * @link     http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ *           (Smarty online manual)
  * @author   Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_cat($params, $compiler)
+function smarty_modifiercompiler_cat($params)
 {
-    return '('.implode(').(', $params).')';
+    return '(' . implode(').(', $params) . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.count_characters.php b/sources/include/smarty/libs/plugins/modifiercompiler.count_characters.php
index 0f269c9..f8463d8 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.count_characters.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.count_characters.php
@@ -2,23 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty count_characters modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_characteres<br>
  * Purpose:  count the number of characters in a text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_characters($params, $compiler)
+function smarty_modifiercompiler_count_characters($params)
 {
     if (!isset($params[1]) || $params[1] != 'true') {
         return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
@@ -29,5 +30,3 @@ function smarty_modifiercompiler_count_characters($params, $compiler)
     // no MBString fallback
     return 'strlen(' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/sources/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
index 853f98f..34f0bbb 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
@@ -2,27 +2,26 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty count_paragraphs modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_paragraphs<br>
  * Purpose:  count the number of paragraphs in a text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_paragraphs (Smarty online manual)
- * @author Uwe Tews
+ * @author  Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_paragraphs($params, $compiler)
+function smarty_modifiercompiler_count_paragraphs($params)
 {
     // count \r or \n characters
     return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.count_sentences.php b/sources/include/smarty/libs/plugins/modifiercompiler.count_sentences.php
index f8d79b3..f1ec560 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.count_sentences.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.count_sentences.php
@@ -2,27 +2,26 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty count_sentences modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
  *          count_sentences (Smarty online manual)
- * @author Uwe Tews
+ * @author  Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_count_sentences($params, $compiler)
+function smarty_modifiercompiler_count_sentences($params)
 {
     // find periods, question marks, exclamation marks with a word before but not after.
     return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.count_words.php b/sources/include/smarty/libs/plugins/modifiercompiler.count_words.php
index f53443e..8b4330f 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.count_words.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.count_words.php
@@ -2,23 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty count_words modifier plugin
- *
  * Type:     modifier<br>
  * Name:     count_words<br>
  * Purpose:  count the number of words in a text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
-*/
-function smarty_modifiercompiler_count_words($params, $compiler)
+ */
+function smarty_modifiercompiler_count_words($params)
 {
     if (Smarty::$_MBSTRING) {
         // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
@@ -28,5 +29,3 @@ function smarty_modifiercompiler_count_words($params, $compiler)
     // no MBString fallback
     return 'str_word_count(' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.default.php b/sources/include/smarty/libs/plugins/modifiercompiler.default.php
index 3554964..fe77762 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.default.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.default.php
@@ -2,34 +2,34 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty default modifier plugin
- *
  * Type:     modifier<br>
  * Name:     default<br>
  * Purpose:  designate default value for empty variables
  *
- * @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_default ($params, $compiler)
+function smarty_modifiercompiler_default($params)
 {
     $output = $params[0];
     if (!isset($params[1])) {
         $params[1] = "''";
     }
-    
+
     array_shift($params);
     foreach ($params as $param) {
         $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
     }
+
     return $output;
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.escape.php b/sources/include/smarty/libs/plugins/modifiercompiler.escape.php
index d38d129..0b29220 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.escape.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.escape.php
@@ -2,25 +2,27 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * @ignore
  */
-require_once( SMARTY_PLUGINS_DIR .'shared.literal_compiler_param.php' );
+require_once(SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php');
 
 /**
  * Smarty escape modifier plugin
- *
  * Type:     modifier<br>
  * Name:     escape<br>
  * Purpose:  escape string for output
  *
- * @link http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
+ * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
  * @author Rodney Rehm
+ *
  * @param array $params parameters
+ * @param       $compiler
+ *
  * @return string with compiled code
  */
 function smarty_modifiercompiler_escape($params, $compiler)
@@ -29,7 +31,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
     if ($_double_encode === null) {
         $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
     }
-    
+
     try {
         $esc_type = smarty_literal_compiler_param($params, 1, 'html');
         $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
@@ -43,13 +45,13 @@ function smarty_modifiercompiler_escape($params, $compiler)
             case 'html':
                 if ($_double_encode) {
                     return 'htmlspecialchars('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ', '
-                        . var_export($double_encode, true) . ')';
-                } else if ($double_encode) {
+                    . $params[0] . ', ENT_QUOTES, '
+                    . var_export($char_set, true) . ', '
+                    . var_export($double_encode, true) . ')';
+                } elseif ($double_encode) {
                     return 'htmlspecialchars('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ')';
+                    . $params[0] . ', ENT_QUOTES, '
+                    . var_export($char_set, true) . ')';
                 } else {
                     // fall back to modifier.escape.php
                 }
@@ -59,18 +61,18 @@ function smarty_modifiercompiler_escape($params, $compiler)
                     if ($_double_encode) {
                         // php >=5.2.3 - go native
                         return 'mb_convert_encoding(htmlspecialchars('
-                            . $params[0] .', ENT_QUOTES, '
-                            . var_export($char_set, true) . ', '
-                            . var_export($double_encode, true)
-                            . '), "HTML-ENTITIES", '
-                            . var_export($char_set, true) . ')';
-                    } else if ($double_encode) {
+                        . $params[0] . ', ENT_QUOTES, '
+                        . var_export($char_set, true) . ', '
+                        . var_export($double_encode, true)
+                        . '), "HTML-ENTITIES", '
+                        . var_export($char_set, true) . ')';
+                    } elseif ($double_encode) {
                         // php <5.2.3 - only handle double encoding
                         return 'mb_convert_encoding(htmlspecialchars('
-                            . $params[0] .', ENT_QUOTES, '
-                            . var_export($char_set, true)
-                            . '), "HTML-ENTITIES", '
-                            . var_export($char_set, true) . ')';
+                        . $params[0] . ', ENT_QUOTES, '
+                        . var_export($char_set, true)
+                        . '), "HTML-ENTITIES", '
+                        . var_export($char_set, true) . ')';
                     } else {
                         // fall back to modifier.escape.php
                     }
@@ -80,14 +82,14 @@ function smarty_modifiercompiler_escape($params, $compiler)
                 if ($_double_encode) {
                     // php >=5.2.3 - go native
                     return 'htmlentities('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ', '
-                        . var_export($double_encode, true) . ')';
-                } else if ($double_encode) {
+                    . $params[0] . ', ENT_QUOTES, '
+                    . var_export($char_set, true) . ', '
+                    . var_export($double_encode, true) . ')';
+                } elseif ($double_encode) {
                     // php <5.2.3 - only handle double encoding
                     return 'htmlentities('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ')';
+                    . $params[0] . ', ENT_QUOTES, '
+                    . var_export($char_set, true) . ')';
                 } else {
                     // fall back to modifier.escape.php
                 }
@@ -105,21 +107,20 @@ function smarty_modifiercompiler_escape($params, $compiler)
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
                 return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
-
         }
-    } catch(SmartyException $e) {
+    }
+    catch (SmartyException $e) {
         // pass through to regular plugin fallback
     }
 
     // could not optimize |escape call, so fallback to regular plugin
-    if ($compiler->tag_nocache | $compiler->nocache) {
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+    if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
+        $compiler->parent_compiler->template->compiled->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->parent_compiler->template->compiled->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
     } else {
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+        $compiler->parent_compiler->template->compiled->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->parent_compiler->template->compiled->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
     }
-    return 'smarty_modifier_escape(' . join( ', ', $params ) . ')';
-}
 
-?>
\ No newline at end of file
+    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
+}
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.from_charset.php b/sources/include/smarty/libs/plugins/modifiercompiler.from_charset.php
index 5d6b788..dab43e9 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.from_charset.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.from_charset.php
@@ -2,22 +2,23 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty from_charset modifier plugin
- *
  * Type:     modifier<br>
  * Name:     from_charset<br>
  * Purpose:  convert character encoding from $charset to internal encoding
  *
  * @author Rodney Rehm
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_from_charset($params, $compiler)
+function smarty_modifiercompiler_from_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
         // FIXME: (rodneyrehm) shouldn't this throw an error?
@@ -30,5 +31,3 @@ function smarty_modifiercompiler_from_charset($params, $compiler)
 
     return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.indent.php b/sources/include/smarty/libs/plugins/modifiercompiler.indent.php
index 26094b7..e3ca208 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.indent.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.indent.php
@@ -1,24 +1,26 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty indent modifier plugin
- *
  * Type:     modifier<br>
  * Name:     indent<br>
  * Purpose:  indent lines of text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
 
-function smarty_modifiercompiler_indent($params, $compiler)
+function smarty_modifiercompiler_indent($params)
 {
     if (!isset($params[1])) {
         $params[1] = 4;
@@ -26,7 +28,6 @@ function smarty_modifiercompiler_indent($params, $compiler)
     if (!isset($params[2])) {
         $params[2] = "' '";
     }
+
     return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.lower.php b/sources/include/smarty/libs/plugins/modifiercompiler.lower.php
index bc3abd7..1d255f3 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.lower.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.lower.php
@@ -1,31 +1,31 @@
 <?php
 /**
  * Smarty plugin
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty lower modifier plugin
- *
  * Type:     modifier<br>
  * Name:     lower<br>
  * Purpose:  convert string to lowercase
  *
- * @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
 
-function smarty_modifiercompiler_lower($params, $compiler)
+function smarty_modifiercompiler_lower($params)
 {
     if (Smarty::$_MBSTRING) {
-        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
+        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
     return 'strtolower(' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.noprint.php b/sources/include/smarty/libs/plugins/modifiercompiler.noprint.php
index d7433e9..4906908 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.noprint.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.noprint.php
@@ -2,24 +2,20 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty noprint modifier plugin
- *
  * Type:     modifier<br>
  * Name:     noprint<br>
  * Purpose:  return an empty string
  *
  * @author   Uwe Tews
- * @param array $params parameters
  * @return string with compiled code
  */
-function smarty_modifiercompiler_noprint($params, $compiler)
+function smarty_modifiercompiler_noprint()
 {
     return "''";
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.string_format.php b/sources/include/smarty/libs/plugins/modifiercompiler.string_format.php
index 5a8d435..71cdf28 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.string_format.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.string_format.php
@@ -2,25 +2,24 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty string_format modifier plugin
- *
  * Type:     modifier<br>
  * Name:     string_format<br>
  * Purpose:  format strings via sprintf
  *
- * @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_string_format($params, $compiler)
+function smarty_modifiercompiler_string_format($params)
 {
     return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.strip.php b/sources/include/smarty/libs/plugins/modifiercompiler.strip.php
index 8d15ca4..fcd6cba 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.strip.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.strip.php
@@ -2,13 +2,12 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty strip modifier plugin
- *
  * Type:     modifier<br>
  * Name:     strip<br>
  * Purpose:  Replace all repeated spaces, newlines, tabs
@@ -16,18 +15,19 @@
  * Example:  {$var|strip} {$var|strip:"&nbsp;"}<br>
  * Date:     September 25th, 2002
  *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+ * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
 
-function smarty_modifiercompiler_strip($params, $compiler)
+function smarty_modifiercompiler_strip($params)
 {
     if (!isset($params[1])) {
         $params[1] = "' '";
     }
+
     return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.strip_tags.php b/sources/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
index 9ba71e3..da5d364 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.strip_tags.php
@@ -2,32 +2,28 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty strip_tags modifier plugin
- *
  * Type:     modifier<br>
  * Name:     strip_tags<br>
  * Purpose:  strip html tags from text
  *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+ * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
  * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_strip_tags($params, $compiler)
+function smarty_modifiercompiler_strip_tags($params)
 {
-   if (!isset($params[1])) {
-        $params[1] = true;
-    }
-    if ($params[1] === true) {
+    if (!isset($params[1]) || $params[1] === true || trim($params[1], '"') == 'true') {
         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
     } else {
         return 'strip_tags(' . $params[0] . ')';
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.to_charset.php b/sources/include/smarty/libs/plugins/modifiercompiler.to_charset.php
index d6c0f29..9122d8b 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.to_charset.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.to_charset.php
@@ -2,22 +2,23 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty to_charset modifier plugin
- *
  * Type:     modifier<br>
  * Name:     to_charset<br>
  * Purpose:  convert character encoding from internal encoding to $charset
  *
  * @author Rodney Rehm
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_to_charset($params, $compiler)
+function smarty_modifiercompiler_to_charset($params)
 {
     if (!Smarty::$_MBSTRING) {
         // FIXME: (rodneyrehm) shouldn't this throw an error?
@@ -30,5 +31,3 @@ function smarty_modifiercompiler_to_charset($params, $compiler)
 
     return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.unescape.php b/sources/include/smarty/libs/plugins/modifiercompiler.unescape.php
index 6135492..3b17ea2 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.unescape.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.unescape.php
@@ -2,22 +2,23 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty unescape modifier plugin
- *
  * Type:     modifier<br>
  * Name:     unescape<br>
  * Purpose:  unescape html entities
  *
  * @author Rodney Rehm
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_unescape($params, $compiler)
+function smarty_modifiercompiler_unescape($params)
 {
     if (!isset($params[1])) {
         $params[1] = 'html';
@@ -47,5 +48,3 @@ function smarty_modifiercompiler_unescape($params, $compiler)
             return $params[0];
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.upper.php b/sources/include/smarty/libs/plugins/modifiercompiler.upper.php
index 8611fa8..52ca4e8 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.upper.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.upper.php
@@ -2,29 +2,28 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty upper modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     lower<br>
  * Purpose:  convert string to uppercase
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ *
  * @return string with compiled code
  */
-function smarty_modifiercompiler_upper($params, $compiler)
+function smarty_modifiercompiler_upper($params)
 {
     if (Smarty::$_MBSTRING) {
-        return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
+        return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
     }
     // no MBString fallback
     return 'strtoupper(' . $params[0] . ')';
-} 
-
-?>
\ No newline at end of file
+}
diff --git a/sources/include/smarty/libs/plugins/modifiercompiler.wordwrap.php b/sources/include/smarty/libs/plugins/modifiercompiler.wordwrap.php
index 8b524f3..6bb6324 100644
--- a/sources/include/smarty/libs/plugins/modifiercompiler.wordwrap.php
+++ b/sources/include/smarty/libs/plugins/modifiercompiler.wordwrap.php
@@ -2,45 +2,46 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsModifierCompiler
  */
 
 /**
  * Smarty wordwrap modifier plugin
- * 
  * Type:     modifier<br>
  * Name:     wordwrap<br>
  * Purpose:  wrap a string of text at a given length
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
- * @author Uwe Tews 
+ *
+ * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
+ * @author Uwe Tews
+ *
  * @param array $params parameters
+ * @param       $compiler
+ *
  * @return string with compiled code
  */
 function smarty_modifiercompiler_wordwrap($params, $compiler)
 {
     if (!isset($params[1])) {
         $params[1] = 80;
-    } 
+    }
     if (!isset($params[2])) {
         $params[2] = '"\n"';
-    } 
+    }
     if (!isset($params[3])) {
         $params[3] = 'false';
-    } 
+    }
     $function = 'wordwrap';
     if (Smarty::$_MBSTRING) {
-        if ($compiler->tag_nocache | $compiler->nocache) {
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
+        if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
+            $compiler->parent_compiler->template->compiled->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
             $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
         } else {
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
+            $compiler->parent_compiler->template->compiled->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
+            $compiler->parent_compiler->template->compiled->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
         }
         $function = 'smarty_mb_wordwrap';
     }
-    return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
-} 
 
-?>
\ No newline at end of file
+    return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
+}
diff --git a/sources/include/smarty/libs/plugins/outputfilter.trimwhitespace.php b/sources/include/smarty/libs/plugins/outputfilter.trimwhitespace.php
index 87cf8c7..ad35d11 100644
--- a/sources/include/smarty/libs/plugins/outputfilter.trimwhitespace.php
+++ b/sources/include/smarty/libs/plugins/outputfilter.trimwhitespace.php
@@ -2,22 +2,22 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFilter
  */
 
 /**
  * Smarty trimwhitespace outputfilter plugin
- *
  * Trim unnecessary whitespace from HTML markup.
  *
  * @author   Rodney Rehm
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
+ *
+ * @param string $source input string
+ *
  * @return string filtered output
- * @todo substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
+ * @todo     substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
  */
-function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $smarty)
+function smarty_outputfilter_trimwhitespace($source)
 {
     $store = array();
     $_store = 0;
@@ -35,17 +35,17 @@ function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $s
             $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
 
             $_offset += $_length - strlen($replace);
-            $_store++;
+            $_store ++;
         }
     }
 
     // Strip all HTML-Comments
     // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
-    $source = preg_replace( '#<!--.*?-->#ms', '', $source );
+    $source = preg_replace('#<!--.*?-->#ms', '', $source);
 
     // capture html elements not to be messed with
     $_offset = 0;
-    if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?</\\1>#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+    if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
         foreach ($matches as $match) {
             $store[] = $match[0][0];
             $_length = strlen($match[0][0]);
@@ -53,42 +53,38 @@ function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $s
             $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
 
             $_offset += $_length - strlen($replace);
-            $_store++;
+            $_store ++;
         }
     }
 
     $expressions = array(
         // replace multiple spaces between tags by a single space
         // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
-        '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
+        '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
         // remove spaces between attributes (but not in attribute values!)
-        '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
+        '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
         // note: for some very weird reason trim() seems to remove spaces inside attributes.
         // maybe a \0 byte or something is interfering?
-        '#^\s+<#Ss' => '<',
-        '#>\s+$#Ss' => '>',
+        '#^\s+<#Ss'                                                       => '<',
+        '#>\s+$#Ss'                                                       => '>',
     );
 
-    $source = preg_replace( array_keys($expressions), array_values($expressions), $source );
+    $source = preg_replace(array_keys($expressions), array_values($expressions), $source);
     // note: for some very weird reason trim() seems to remove spaces inside attributes.
     // maybe a \0 byte or something is interfering?
     // $source = trim( $source );
 
-    // capture html elements not to be messed with
     $_offset = 0;
     if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
         foreach ($matches as $match) {
-            $store[] = $match[0][0];
             $_length = strlen($match[0][0]);
-            $replace = array_shift($store);
+            $replace = $store[$match[1][0]];
             $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
 
             $_offset += strlen($replace) - $_length;
-            $_store++;
+            $_store ++;
         }
     }
 
     return $source;
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/shared.escape_special_chars.php b/sources/include/smarty/libs/plugins/shared.escape_special_chars.php
index d2609b6..d3bd756 100644
--- a/sources/include/smarty/libs/plugins/shared.escape_special_chars.php
+++ b/sources/include/smarty/libs/plugins/shared.escape_special_chars.php
@@ -2,20 +2,21 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
 if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
     /**
      * escape_special_chars common function
-     *
      * Function: smarty_function_escape_special_chars<br>
      * Purpose:  used by other smarty functions to escape
      *           special chars except for already escaped ones
      *
      * @author   Monte Ohrt <monte at ohrt dot com>
-     * @param string $string text that should by escaped
+     *
+     * @param  string $string text that should by escaped
+     *
      * @return string
      */
     function smarty_function_escape_special_chars($string)
@@ -23,18 +24,20 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
         if (!is_array($string)) {
             $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
         }
+
         return $string;
-    }  
-} else {         
+    }
+} else {
     /**
      * escape_special_chars common function
-     *
      * Function: smarty_function_escape_special_chars<br>
      * Purpose:  used by other smarty functions to escape
      *           special chars except for already escaped ones
      *
      * @author   Monte Ohrt <monte at ohrt dot com>
-     * @param string $string text that should by escaped
+     *
+     * @param  string $string text that should by escaped
+     *
      * @return string
      */
     function smarty_function_escape_special_chars($string)
@@ -42,10 +45,9 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
         if (!is_array($string)) {
             $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
             $string = htmlspecialchars($string);
-            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); 
+            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
         }
-        return $string;
-    }                                                                                                             
-} 
 
-?>
\ No newline at end of file
+        return $string;
+    }
+}
diff --git a/sources/include/smarty/libs/plugins/shared.literal_compiler_param.php b/sources/include/smarty/libs/plugins/shared.literal_compiler_param.php
index dbcd937..47d728a 100644
--- a/sources/include/smarty/libs/plugins/shared.literal_compiler_param.php
+++ b/sources/include/smarty/libs/plugins/shared.literal_compiler_param.php
@@ -2,7 +2,7 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
@@ -12,22 +12,24 @@
  * @param array   $params  parameter array as given to the compiler function
  * @param integer $index   array index of the parameter to convert
  * @param mixed   $default value to be returned if the parameter is not present
+ *
  * @return mixed evaluated value of parameter or $default
  * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
  * @author Rodney Rehm
  */
-function smarty_literal_compiler_param($params, $index, $default=null)
+function smarty_literal_compiler_param($params, $index, $default = null)
 {
     // not set, go default
     if (!isset($params[$index])) {
         return $default;
     }
     // test if param is a literal
-    if (!preg_match('/^([\'"]?)[a-zA-Z0-9]+(\\1)$/', $params[$index])) {
+    if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[$index])) {
         throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time');
     }
 
     $t = null;
     eval("\$t = " . $params[$index] . ";");
+
     return $t;
 }
diff --git a/sources/include/smarty/libs/plugins/shared.make_timestamp.php b/sources/include/smarty/libs/plugins/shared.make_timestamp.php
index 5d7c97e..f87d40c 100644
--- a/sources/include/smarty/libs/plugins/shared.make_timestamp.php
+++ b/sources/include/smarty/libs/plugins/shared.make_timestamp.php
@@ -2,7 +2,7 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
@@ -11,7 +11,9 @@
  * Purpose:  used by other smarty functions to make a timestamp from a string.
  *
  * @author   Monte Ohrt <monte at ohrt dot com>
- * @param DateTime|int|string $string  date object, timestamp or string that can be converted using strtotime()
+ *
+ * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
+ *
  * @return int
  */
 function smarty_make_timestamp($string)
@@ -19,24 +21,23 @@ function smarty_make_timestamp($string)
     if (empty($string)) {
         // use "now":
         return time();
-    } elseif ($string instanceof DateTime) {
-        return $string->getTimestamp();
+    } elseif ($string instanceof DateTime || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)) {
+        return (int) $string->format('U'); // PHP 5.2 BC
     } elseif (strlen($string) == 14 && ctype_digit($string)) {
         // it is mysql timestamp format of YYYYMMDDHHMMSS?
-        return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
+        return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2),
+                      substr($string, 4, 2), substr($string, 6, 2), substr($string, 0, 4));
     } elseif (is_numeric($string)) {
         // it is a numeric string, we handle it as timestamp
         return (int) $string;
     } else {
         // strtotime should handle it
         $time = strtotime($string);
-        if ($time == -1 || $time === false) {
+        if ($time == - 1 || $time === false) {
             // strtotime() was not able to parse $string, use "now":
             return time();
         }
+
         return $time;
     }
 }
-
-?>
diff --git a/sources/include/smarty/libs/plugins/shared.mb_str_replace.php b/sources/include/smarty/libs/plugins/shared.mb_str_replace.php
index ecafeb7..a5682ed 100644
--- a/sources/include/smarty/libs/plugins/shared.mb_str_replace.php
+++ b/sources/include/smarty/libs/plugins/shared.mb_str_replace.php
@@ -2,7 +2,7 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 if (!function_exists('smarty_mb_str_replace')) {
@@ -10,14 +10,15 @@ if (!function_exists('smarty_mb_str_replace')) {
     /**
      * Multibyte string replace
      *
-     * @param string $search  the string to be searched
-     * @param string $replace the replacement string
-     * @param string $subject the source string
-     * @param int    &$count  number of matches found
+     * @param  string $search  the string to be searched
+     * @param  string $replace the replacement string
+     * @param  string $subject the source string
+     * @param  int    &$count  number of matches found
+     *
      * @return string replaced string
      * @author Rodney Rehm
      */
-    function smarty_mb_str_replace($search, $replace, $subject, &$count=0)
+    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
     {
         if (!is_array($search) && is_array($replace)) {
             return false;
@@ -25,7 +26,7 @@ if (!function_exists('smarty_mb_str_replace')) {
         if (is_array($subject)) {
             // call mb_replace for each single string in $subject
             foreach ($subject as &$string) {
-                $string = &smarty_mb_str_replace($search, $replace, $string, $c);
+                $string = & smarty_mb_str_replace($search, $replace, $string, $c);
                 $count += $c;
             }
         } elseif (is_array($search)) {
@@ -36,7 +37,7 @@ if (!function_exists('smarty_mb_str_replace')) {
                 }
             } else {
                 $n = max(count($search), count($replace));
-                while ($n--) {
+                while ($n --) {
                     $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
                     $count += $c;
                     next($search);
@@ -48,8 +49,7 @@ if (!function_exists('smarty_mb_str_replace')) {
             $count = count($parts) - 1;
             $subject = implode($replace, $parts);
         }
+
         return $subject;
     }
-
 }
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/shared.mb_unicode.php b/sources/include/smarty/libs/plugins/shared.mb_unicode.php
index e7f839e..0f790b5 100644
--- a/sources/include/smarty/libs/plugins/shared.mb_unicode.php
+++ b/sources/include/smarty/libs/plugins/shared.mb_unicode.php
@@ -2,47 +2,53 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
 /**
  * convert characters to their decimal unicode equivalents
  *
- * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
  * @param string $string   characters to calculate unicode of
  * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
+ *
  * @return array sequence of unicodes
  * @author Rodney Rehm
  */
-function smarty_mb_to_unicode($string, $encoding=null) {
+function smarty_mb_to_unicode($string, $encoding = null)
+{
     if ($encoding) {
         $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
     } else {
         $expanded = mb_convert_encoding($string, "UTF-32BE");
     }
+
     return unpack("N*", $expanded);
 }
 
 /**
  * convert unicodes to the character of given encoding
  *
- * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
  * @param integer|array $unicode  single unicode or list of unicodes to convert
  * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
+ *
  * @return string unicode as character sequence in given $encoding
  * @author Rodney Rehm
  */
-function smarty_mb_from_unicode($unicode, $encoding=null) {
+function smarty_mb_from_unicode($unicode, $encoding = null)
+{
     $t = '';
     if (!$encoding) {
         $encoding = mb_internal_encoding();
     }
-    foreach((array) $unicode as $utf32be) {
+    foreach ((array) $unicode as $utf32be) {
         $character = pack("N*", $utf32be);
         $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
     }
+
     return $t;
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/shared.mb_wordwrap.php b/sources/include/smarty/libs/plugins/shared.mb_wordwrap.php
index ba3498c..31f4acf 100644
--- a/sources/include/smarty/libs/plugins/shared.mb_wordwrap.php
+++ b/sources/include/smarty/libs/plugins/shared.mb_wordwrap.php
@@ -2,44 +2,40 @@
 /**
  * Smarty shared plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsShared
  */
 
-if(!function_exists('smarty_mb_wordwrap')) {
+if (!function_exists('smarty_mb_wordwrap')) {
 
     /**
      * Wrap a string to a given number of characters
      *
-     * @link http://php.net/manual/en/function.wordwrap.php for similarity
-     * @param string  $str   the string to wrap
-     * @param int     $width the width of the output
-     * @param string  $break the character used to break the line
-     * @param boolean $cut   ignored parameter, just for the sake of
-     * @return string wrapped string
+     * @link   http://php.net/manual/en/function.wordwrap.php for similarity
+     *
+     * @param  string  $str   the string to wrap
+     * @param  int     $width the width of the output
+     * @param  string  $break the character used to break the line
+     * @param  boolean $cut   ignored parameter, just for the sake of
+     *
+     * @return string  wrapped string
      * @author Rodney Rehm
      */
-    function smarty_mb_wordwrap($str, $width=75, $break="\n", $cut=false)
+    function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
     {
         // break words into tokens using white space as a delimiter
-        $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+        $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
         $length = 0;
         $t = '';
         $_previous = false;
+        $_space = false;
 
         foreach ($tokens as $_token) {
             $token_length = mb_strlen($_token, Smarty::$_CHARSET);
             $_tokens = array($_token);
             if ($token_length > $width) {
-                // remove last space
-                $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-                $_previous = false;
-                $length = 0;
-
-                if ($cut) {
-                    $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-                    // broken words go on a new line
-                    $t .= $break;
+                 if ($cut) {
+                    $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
                 }
             }
 
@@ -50,27 +46,23 @@ if(!function_exists('smarty_mb_wordwrap')) {
 
                 if ($length > $width) {
                     // remove space before inserted break
-                    if ($_previous && $token_length < $width) {
-                        $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+                    if ($_previous) {
+                        $t = mb_substr($t, 0, - 1, Smarty::$_CHARSET);
                     }
 
-                    // add the break before the token
-                    $t .= $break;
-                    $length = $token_length;
-
-                    // skip space after inserting a break
-                    if ($_space) {
-                        $length = 0;
-                        continue;
+                    if (!$_space) {
+                        // add the break before the token
+                        if (!empty($t)) {
+                            $t .= $break;
+                        }
+                        $length = $token_length;
                     }
-                } else if ($token == "\n") {
+                } elseif ($token == "\n") {
                     // hard break must reset counters
                     $_previous = 0;
                     $length = 0;
-                } else {
-                    // remember if we had a space or not
-                    $_previous = $_space;
                 }
+                $_previous = $_space;
                 // add the token
                 $t .= $token;
             }
@@ -78,6 +70,4 @@ if(!function_exists('smarty_mb_wordwrap')) {
 
         return $t;
     }
-
 }
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/sources/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php
index aff711e..aecd1e7 100644
--- a/sources/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php
+++ b/sources/include/smarty/libs/plugins/variablefilter.htmlspecialchars.php
@@ -2,20 +2,18 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsFilter
  */
 
 /**
  * Smarty htmlspecialchars variablefilter plugin
  *
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
+ * @param string $source input string
+ *
  * @return string filtered output
  */
-function smarty_variablefilter_htmlspecialchars($source, $smarty)
+function smarty_variablefilter_htmlspecialchars($source)
 {
     return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_cacheresource.php b/sources/include/smarty/libs/sysplugins/smarty_cacheresource.php
index ca18add..14ab62f 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_cacheresource.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_cacheresource.php
@@ -1,106 +1,115 @@
 <?php
 /**
-* Smarty Internal Plugin
-*
-* @package Smarty
-* @subpackage Cacher
-*/
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
 
 /**
-* Cache Handler API
-*
-* @package Smarty
-* @subpackage Cacher
-* @author Rodney Rehm
-*/
-abstract class Smarty_CacheResource {
+ * Cache Handler API
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_CacheResource
+{
     /**
-    * cache for Smarty_CacheResource instances
-    * @var array
-    */
-    public static $resources = array();
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    protected static $sysplugins = array('file' => 'smarty_internal_cacheresource_file.php',);
 
     /**
-    * resource types provided by the core
-    * @var array
-    */
-    protected static $sysplugins = array(
-        'file' => true,
-    );
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    abstract public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
 
     /**
-    * populate Cached Object with meta data from Resource
-    *
-    * @param Smarty_Template_Cached $cached cached object
-    * @param Smarty_Internal_Template $_template template object
-    * @return void
-    */
-    public abstract function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return void
+     */
+    abstract public function populateTimestamp(Smarty_Template_Cached $cached);
 
     /**
-    * populate Cached Object with timestamp and exists from Resource
-    *
-    * @param Smarty_Template_Cached $source cached object
-    * @return void
-    */
-    public abstract function populateTimestamp(Smarty_Template_Cached $cached);
+     * Read the cached template and process header
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update    flag if called because cache update
+     *
+     * @return bool true or false if the cached content does not exist
+     */
+    abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false);
 
     /**
-    * Read the cached template and process header
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param Smarty_Template_Cached $cached cached object
-    * @return booelan true or false if the cached content does not exist
-    */
-    public abstract function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null);
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean success
+     */
+    abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
 
     /**
-    * Write the rendered template output to cache
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content to cache
-    * @return boolean success
-    */
-    public abstract function writeCachedContent(Smarty_Internal_Template $_template, $content);
-
-    /**
-    * Return cached content
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content of cache
-    */
+     * Return cached content
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return null|string
+     */
     public function getCachedContent(Smarty_Internal_Template $_template)
     {
         if ($_template->cached->handler->process($_template)) {
             ob_start();
-            $_template->properties['unifunc']($_template);
+            $unifunc = $_template->cached->unifunc;
+            $unifunc($_template);
             return ob_get_clean();
         }
+
         return null;
     }
 
     /**
-    * Empty cache
-    *
-    * @param Smarty $smarty Smarty object
-    * @param integer $exp_time expiration time (number of seconds, not timestamp)
-    * @return integer number of cache files deleted
-    */
-    public abstract function clearAll(Smarty $smarty, $exp_time=null);
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clearAll(Smarty $smarty, $exp_time = null);
 
     /**
-    * Empty cache for a specific template
-    *
-    * @param Smarty $smarty Smarty object
-    * @param string $resource_name template name
-    * @param string $cache_id cache id
-    * @param string $compile_id compile id
-    * @param integer $exp_time expiration time (number of seconds, not timestamp)
-    * @return integer number of cache files deleted
-    */
-    public abstract function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
-
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
 
+    /**
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool|null
+     */
     public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // theoretically locking_timeout should be checked against time_limit (max_execution_time)
@@ -114,35 +123,61 @@ abstract class Smarty_CacheResource {
             }
             sleep(1);
         }
+
         return $hadLock;
     }
 
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // check if lock exists
         return false;
     }
 
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // create lock
         return true;
     }
 
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         // release lock
         return true;
     }
 
-
     /**
-    * Load Cache Resource Handler
-    *
-    * @param Smarty $smarty Smarty object
-    * @param string $type name of the cache resource
-    * @return Smarty_CacheResource Cache Resource Handler
-    */
+     * Load Cache Resource Handler
+     *
+     * @param Smarty $smarty Smarty object
+     * @param string $type   name of the cache resource
+     *
+     * @throws SmartyException
+     * @return Smarty_CacheResource Cache Resource Handler
+     */
     public static function load(Smarty $smarty, $type = null)
     {
         if (!isset($type)) {
@@ -150,232 +185,39 @@ abstract class Smarty_CacheResource {
         }
 
         // try smarty's cache
-        if (isset($smarty->_cacheresource_handlers[$type])) {
-            return $smarty->_cacheresource_handlers[$type];
+        if (isset($smarty->_cache['cacheresource_handlers'][$type])) {
+            return $smarty->_cache['cacheresource_handlers'][$type];
         }
-        
+
         // try registered resource
         if (isset($smarty->registered_cache_resources[$type])) {
             // do not cache these instances as they may vary from instance to instance
-            return $smarty->_cacheresource_handlers[$type] = $smarty->registered_cache_resources[$type];
+            return $smarty->_cache['cacheresource_handlers'][$type] = $smarty->registered_cache_resources[$type];
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
-                self::$resources[$type] = new $cache_resource_class();
-            }
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            return $smarty->_cache['cacheresource_handlers'][$type] = new $cache_resource_class();
         }
         // try plugins dir
         $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
         if ($smarty->loadPlugin($cache_resource_class)) {
-            if (!isset(self::$resources[$type])) {
-                self::$resources[$type] = new $cache_resource_class();
-            }
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+            return $smarty->_cache['cacheresource_handlers'][$type] = new $cache_resource_class();
         }
         // give up
         throw new SmartyException("Unable to load cache resource '{$type}'");
     }
 
     /**
-    * Invalid Loaded Cache Files
-    *
-    * @param Smarty $smarty Smarty object
-    */
-    public static function invalidLoadedCache(Smarty $smarty)
+     * Invalid Loaded Cache Files
+     *
+     * @param Smarty $smarty Smarty object
+     */
+    public function invalidLoadedCache(Smarty $smarty)
     {
-        foreach ($smarty->template_objects as $tpl) {
-            if (isset($tpl->cached)) {
-                $tpl->cached->valid = false;
-                $tpl->cached->processed = false;
-            }
+        $smarty->_cache['isCached'] = array();
+        if (isset($smarty->ext->_subtemplate)) {
+            $smarty->ext->_subtemplate->tplObjects = array();
         }
     }
 }
-
-/**
-* Smarty Resource Data Object
-*
-* Cache Data Container for Template Files
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Rodney Rehm
-*/
-class Smarty_Template_Cached {
-    /**
-    * Source Filepath
-    * @var string
-    */
-    public $filepath = false;
-
-    /**
-    * Source Content
-    * @var string
-    */
-    public $content = null;
-
-    /**
-    * Source Timestamp
-    * @var integer
-    */
-    public $timestamp = false;
-
-    /**
-    * Source Existance
-    * @var boolean
-    */
-    public $exists = false;
-
-    /**
-    * Cache Is Valid
-    * @var boolean
-    */
-    public $valid = false;
-
-    /**
-    * Cache was processed
-    * @var boolean
-    */
-    public $processed = false;
-
-    /**
-    * CacheResource Handler
-    * @var Smarty_CacheResource
-    */
-    public $handler = null;
-
-    /**
-    * Template Compile Id (Smarty_Internal_Template::$compile_id)
-    * @var string
-    */
-    public $compile_id = null;
-
-    /**
-    * Template Cache Id (Smarty_Internal_Template::$cache_id)
-    * @var string
-    */
-    public $cache_id = null;
-
-    /**
-    * Id for cache locking
-    * @var string
-    */
-    public $lock_id = null;
-
-    /**
-    * flag that cache is locked by this instance
-    * @var bool
-    */
-    public $is_locked = false;
-
-    /**
-    * Source Object
-    * @var Smarty_Template_Source
-    */
-    public $source = null;
-
-    /**
-    * create Cached Object container
-    *
-    * @param Smarty_Internal_Template $_template template object
-    */
-    public function __construct(Smarty_Internal_Template $_template)
-    {
-        $this->compile_id = $_template->compile_id;
-        $this->cache_id = $_template->cache_id;
-        $this->source = $_template->source;
-        $_template->cached = $this;
-        $smarty = $_template->smarty;
-
-        //
-        // load resource handler
-        //
-        $this->handler = $handler = Smarty_CacheResource::load($smarty); // Note: prone to circular references
-
-        //
-        //    check if cache is valid
-        //
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
-            $handler->populate($this, $_template);
-            return;
-        }
-        while (true) {
-            while (true) {
-                $handler->populate($this, $_template);
-                if ($this->timestamp === false || $smarty->force_compile || $smarty->force_cache) {
-                    $this->valid = false;
-                } else {
-                    $this->valid = true;
-                }
-                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
-                    // lifetime expired
-                    $this->valid = false;
-                }
-                if ($this->valid || !$_template->smarty->cache_locking) {
-                    break;
-                }
-                if (!$this->handler->locked($_template->smarty, $this)) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                    break 2;
-                }
-            }
-            if ($this->valid) {
-                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
-                    // load cache file for the following checks
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::start_cache($_template);
-                    }
-                    if($handler->process($_template, $this) === false) {
-                        $this->valid = false;
-                    } else {
-                        $this->processed = true;
-                    }
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::end_cache($_template);
-                    }
-                } else {
-                    continue;
-                }
-            } else {
-                return;
-            }
-            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
-                $this->valid = false;
-            }
-            if (!$this->valid && $_template->smarty->cache_locking) {
-                $this->handler->acquireLock($_template->smarty, $this);
-                return;
-            } else {
-                return;
-            }
-        }
-    }
-
-    /**
-    * Write this cache object to handler
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content to cache
-    * @return boolean success
-    */
-    public function write(Smarty_Internal_Template $_template, $content)
-    {
-        if (!$_template->source->recompiled) {
-            if ($this->handler->writeCachedContent($_template, $content)) {
-                $this->timestamp = time();
-                $this->exists = true;
-                $this->valid = true;
-                if ($_template->smarty->cache_locking) {
-                    $this->handler->releaseLock($_template->smarty, $this);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-}
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/sources/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php
index ee9de15..4e9606e 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_cacheresource_custom.php
@@ -2,42 +2,43 @@
 /**
  * Smarty Internal Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
  */
 
 /**
  * Cache Handler API
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
-abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
-
+abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
+{
     /**
      * fetch cached content and its modification time from data source
      *
-     * @param string $id         unique cache content identifier
-     * @param string $name       template name
-     * @param string $cache_id   cache id
-     * @param string $compile_id compile id
-     * @param string $content    cached content
-     * @param integer $mtime cache modification timestamp (epoch)
+     * @param  string  $id         unique cache content identifier
+     * @param  string  $name       template name
+     * @param  string  $cache_id   cache id
+     * @param  string  $compile_id compile id
+     * @param  string  $content    cached content
+     * @param  integer $mtime      cache modification timestamp (epoch)
+     *
      * @return void
      */
-    protected abstract function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
+    abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
 
     /**
      * Fetch cached content's modification timestamp from data source
-     *
      * {@internal implementing this method is optional.
      *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
      *
-     * @param string $id         unique cache content identifier
-     * @param string $name       template name
-     * @param string $cache_id   cache id
-     * @param string $compile_id compile id
+     * @param  string $id         unique cache content identifier
+     * @param  string $name       template name
+     * @param  string $cache_id   cache id
+     * @param  string $compile_id compile id
+     *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      */
     protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
@@ -48,47 +49,54 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
     /**
      * Save content to cache
      *
-     * @param string       $id         unique cache content identifier
-     * @param string       $name       template name
-     * @param string       $cache_id   cache id
-     * @param string       $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration or null
-     * @param string $content content to cache
-     * @return boolean success
+     * @param  string       $id         unique cache content identifier
+     * @param  string       $name       template name
+     * @param  string       $cache_id   cache id
+     * @param  string       $compile_id compile id
+     * @param  integer|null $exp_time   seconds till expiration or null
+     * @param  string       $content    content to cache
+     *
+     * @return boolean      success
      */
-    protected abstract function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
+    abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
 
     /**
      * Delete content from cache
      *
-     * @param string       $name       template name
-     * @param string       $cache_id   cache id
-     * @param string       $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration time in seconds or null
-     * @return integer number of deleted caches
+     * @param  string       $name       template name
+     * @param  string       $cache_id   cache id
+     * @param  string       $compile_id compile id
+     * @param  integer|null $exp_time   seconds till expiration time in seconds or null
+     *
+     * @return integer      number of deleted caches
      */
-    protected abstract function delete($name, $cache_id, $compile_id, $exp_time);
+    abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
 
     /**
      * populate Cached Object with meta data from Resource
      *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Cached   $cached    cached object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
         $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
-        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w\|]+!', '_', $cached->compile_id) : null;
-
-        $cached->filepath = sha1($cached->source->filepath . $_cache_id . $_compile_id);
+        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w]+!', '_', $cached->compile_id) : null;
+        $path = $cached->source->filepath . $_cache_id . $_compile_id;
+        $cached->filepath = sha1($path);
+        if ($_template->smarty->cache_locking) {
+            $cached->lock_id = sha1('lock.' . $path);
+        }
         $this->populateTimestamp($cached);
     }
 
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Cached $source cached object
+     * @param Smarty_Template_Cached $cached
+     *
      * @return void
      */
     public function populateTimestamp(Smarty_Template_Cached $cached)
@@ -97,6 +105,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
         if ($mtime !== null) {
             $cached->timestamp = $mtime;
             $cached->exists = !!$cached->timestamp;
+
             return;
         }
         $timestamp = null;
@@ -108,11 +117,13 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
     /**
      * Read the cached template and process the header
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Cached   $cached    cached object
+     * @param bool                      $update    flag if called because cache update
+     *
+     * @return boolean                 true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         if (!$cached) {
             $cached = $_template->cached;
@@ -120,118 +131,151 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
         $content = $cached->content ? $cached->content : null;
         $timestamp = $cached->timestamp ? $cached->timestamp : null;
         if ($content === null || !$timestamp) {
-            $this->fetch(
-                $_template->cached->filepath,
-                $_template->source->name,
-                $_template->cache_id,
-                $_template->compile_id,
-                $content,
-                $timestamp
-            );
+            $this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp);
         }
         if (isset($content)) {
+            /** @var Smarty_Internal_Template $_smarty_tpl
+             * used in evaluated code
+             */
             $_smarty_tpl = $_template;
             eval("?>" . $content);
+            $cached->content = null;
             return true;
         }
+
         return false;
     }
 
     /**
      * Write the rendered template output to cache
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     * @return boolean success
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  string                   $content   content to cache
+     *
+     * @return boolean                  success
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        return $this->save(
-            $_template->cached->filepath,
-            $_template->source->name,
-            $_template->cache_id,
-            $_template->compile_id,
-            $_template->properties['cache_lifetime'],
-            $content
-        );
+        return $this->save($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $_template->cache_lifetime, $content);
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            $timestamp = null;
+            $this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp);
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
     }
 
     /**
      * Empty cache
      *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     * @param  Smarty  $smarty   Smarty object
+     * @param  integer $exp_time expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
      */
-    public function clearAll(Smarty $smarty, $exp_time=null)
+    public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        $this->cache = array();
         return $this->delete(null, null, null, $exp_time);
     }
 
     /**
      * Empty cache for a specific template
      *
-     * @param Smarty  $smarty        Smarty object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     * @param  Smarty  $smarty        Smarty object
+     * @param  string  $resource_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $this->cache = array();
-        return $this->delete($resource_name, $cache_id, $compile_id, $exp_time);
+        $cache_name = null;
+
+        if (isset($resource_name)) {
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                $cache_name = $source->name;
+            } else {
+                return 0;
+            }
+            // remove from template cache
+            if (isset($smarty->_cache['template_objects'])) {
+                foreach ($smarty->_cache['template_objects'] as $key => $_tpl) {
+                    if (isset($_tpl->cached) && $_tpl->source->uid == $source->uid) {
+                        unset($smarty->_cache['template_objects'][$key]);
+                    }
+                }
+            }
+        }
+
+        return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
     }
 
     /**
      * Check is cache is locked for this template
      *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
+     * @param  Smarty                 $smarty Smarty object
+     * @param  Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        $id = $cached->filepath;
+        $id = $cached->lock_id;
         $name = $cached->source->name . '.lock';
 
-        $mtime = $this->fetchTimestamp($id, $name, null, null);
+        $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
         if ($mtime === null) {
-            $this->fetch($id, $name, null, null, $content, $mtime);
+            $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
         }
-
-        return $mtime && time() - $mtime < $smarty->locking_timeout;
+        return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
     }
 
     /**
      * Lock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $cached->is_locked = true;
-
-        $id = $cached->filepath;
+        $id = $cached->lock_id;
         $name = $cached->source->name . '.lock';
-        $this->save($id, $name, null, null, $smarty->locking_timeout, '');
+        $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
     }
 
     /**
      * Unlock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $cached->is_locked = false;
-
         $name = $cached->source->name . '.lock';
-        $this->delete($name, null, null, null);
+        $this->delete($name, $cached->cache_id, $cached->compile_id, null);
     }
 }
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/sources/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
index dff9b65..ee4021a 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -2,44 +2,44 @@
 /**
  * Smarty Internal Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
  */
 
 /**
  * Smarty Cache Handler Base for Key/Value Storage Implementations
- *
  * This class implements the functionality required to use simple key/value stores
  * for hierarchical cache groups. key/value stores like memcache or APC do not support
  * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
  * is no problem to filesystem and RDBMS implementations.
- *
  * This implementation is based on the concept of invalidation. While one specific cache
  * can be identified and cleared, any range of caches cannot be identified. For this reason
  * each level of the cache group hierarchy can have its own value in the store. These values
  * are nothing but microtimes, telling us when a particular cache group was cleared for the
  * last time. These keys are evaluated for every cache read to determine if the cache has
  * been invalidated since it was created and should hence be treated as inexistent.
- *
  * Although deep hierarchies are possible, they are not recommended. Try to keep your
  * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
  * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
  * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
  * consider using »a|b|c|$page-$items-$whatever« instead.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
-abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
-
+abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
+{
     /**
      * cache for contents
+     *
      * @var array
      */
     protected $contents = array();
+
     /**
      * cache for timestamps
+     *
      * @var array
      */
     protected $timestamps = array();
@@ -47,16 +47,15 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * populate Cached Object with meta data from Resource
      *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Cached   $cached    cached object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
-        $cached->filepath = $_template->source->uid
-                . '#' . $this->sanitize($cached->source->name)
-                . '#' . $this->sanitize($cached->cache_id)
-                . '#' . $this->sanitize($cached->compile_id);
+        $cached->filepath = $_template->source->uid . '#' . $this->sanitize($cached->source->resource) . '#' .
+            $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
 
         $this->populateTimestamp($cached);
     }
@@ -64,7 +63,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Cached $cached cached object
+     * @param  Smarty_Template_Cached $cached cached object
+     *
      * @return void
      */
     public function populateTimestamp(Smarty_Template_Cached $cached)
@@ -80,11 +80,13 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Read the cached template and process the header
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Cached   $cached    cached object
+     * @param bool                      $update    flag if called because cache update
+     *
+     * @return boolean                 true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         if (!$cached) {
             $cached = $_template->cached;
@@ -97,55 +99,92 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
             }
         }
         if (isset($content)) {
+            /** @var Smarty_Internal_Template $_smarty_tpl
+             * used in evaluated code
+             */
             $_smarty_tpl = $_template;
             eval("?>" . $content);
+
             return true;
         }
+
         return false;
     }
 
     /**
      * Write the rendered template output to cache
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string $content content to cache
-     * @return boolean success
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  string                   $content   content to cache
+     *
+     * @return boolean                  success
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
         $this->addMetaTimestamp($content);
-        return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
+
+        return $this->write(array($_template->cached->filepath => $content), $_template->cache_lifetime);
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->source->uid)) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
     }
 
     /**
      * Empty cache
-     *
      * {@internal the $exp_time argument is ignored altogether }}
      *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time [being ignored]
+     * @param  Smarty  $smarty   Smarty object
+     * @param  integer $exp_time expiration time [being ignored]
+     *
      * @return integer number of cache files deleted [always -1]
      * @uses purge() to clear the whole store
      * @uses invalidate() to mark everything outdated if purge() is inapplicable
      */
-    public function clearAll(Smarty $smarty, $exp_time=null)
+    public function clearAll(Smarty $smarty, $exp_time = null)
     {
         if (!$this->purge()) {
             $this->invalidate(null);
         }
-        return -1;
+        // remove from template cache
+        if (isset($smarty->_cache['template_objects'])) {
+            foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                if (isset($tpl->cached)) {
+                    unset($smarty->_cache['template_objects'][$key]);
+                }
+            }
+        }
+        return - 1;
     }
 
     /**
      * Empty cache for a specific template
-     *
      * {@internal the $exp_time argument is ignored altogether}}
      *
-     * @param Smarty  $smarty        Smarty object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time [being ignored]
+     * @param  Smarty  $smarty        Smarty object
+     * @param  string  $resource_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time [being ignored]
+     *
      * @return integer number of cache files deleted [always -1]
      * @uses buildCachedFilepath() to generate the CacheID
      * @uses invalidate() to mark CacheIDs parent chain as outdated
@@ -153,53 +192,54 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $uid = $this->getTemplateUid($smarty, $resource_name, $cache_id, $compile_id);
-        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
+        $uid = $this->getTemplateUid($smarty, $resource_name);
+        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' .
+            $this->sanitize($compile_id);
         $this->delete(array($cid));
         $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
-        return -1;
+        // remove from template cache
+        if (isset($resource_name) && isset($smarty->_cache['template_objects'])) {
+            if (isset($smarty->_cache['template_objects'])) {
+                foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                    if ($tpl->source->uid == $uid && isset($tpl->cached)) {
+                        unset($smarty->_cache['template_objects'][$key]);
+                    }
+                }
+            }
+        }
+        return - 1;
     }
+
     /**
      * Get template's unique ID
      *
-     * @param Smarty $smarty        Smarty object
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
+     * @param  Smarty $smarty        Smarty object
+     * @param  string $resource_name template name
+     *
      * @return string filepath of cache file
+     * @throws \SmartyException
+     *
      */
-    protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id)
+    protected function getTemplateUid(Smarty $smarty, $resource_name)
     {
-        $uid = '';
         if (isset($resource_name)) {
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            if ($tpl->source->exists) {
-                $uid = $tpl->source->uid;
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                return $source->uid;
             }
-            
-            // remove from template cache
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
         }
-        return $uid;
+        return '';
     }
 
     /**
      * Sanitize CacheID components
      *
-     * @param string $string CacheID component to sanitize
+     * @param  string $string CacheID component to sanitize
+     *
      * @return string sanitized CacheID component
      */
     protected function sanitize($string)
     {
-        // some poeple smoke bad weed
         $string = trim($string, '|');
         if (!$string) {
             return null;
@@ -210,13 +250,14 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Fetch and prepare a cache object.
      *
-     * @param string  $cid           CacheID to fetch
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param string  $content       cached content
-     * @param integer &$timestamp    cached timestamp (epoch)
-     * @param string  $resource_uid  resource's uid
+     * @param  string  $cid           CacheID to fetch
+     * @param  string  $resource_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  string  $content       cached content
+     * @param  integer &$timestamp    cached timestamp (epoch)
+     * @param  string  $resource_uid  resource's uid
+     *
      * @return boolean success
      */
     protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null)
@@ -238,7 +279,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
 
     /**
      * Add current microtime to the beginning of $cache_content
-     *
      * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
      *
      * @param string &$content the content to be cached
@@ -253,25 +293,25 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Extract the timestamp the $content was cached
      *
-     * @param string &$content the cached content
-     * @return float the microtime the content was cached
+     * @param  string &$content the cached content
+     *
+     * @return float  the microtime the content was cached
      */
     protected function getMetaTimestamp(&$content)
     {
-        $s = unpack("N", substr($content, 0, 4));
-        $m = unpack("N", substr($content, 4, 4));
-        $content = substr($content, 8);
-        return $s[1] + ($m[1] / 100000000);
+        extract(unpack('N1s/N1m/a*content', $content));
+        return $s + ($m / 100000000);
     }
 
     /**
      * Invalidate CacheID
      *
-     * @param string $cid           CacheID
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's uid
+     * @param  string $cid           CacheID
+     * @param  string $resource_name template name
+     * @param  string $cache_id      cache id
+     * @param  string $compile_id    compile id
+     * @param  string $resource_uid  source's uid
+     *
      * @return void
      */
     protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
@@ -281,22 +321,24 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
         // invalidate everything
         if (!$resource_name && !$cache_id && !$compile_id) {
             $key = 'IVK#ALL';
-        }
-        // invalidate all caches by template
-        else if ($resource_name && !$cache_id && !$compile_id) {
-            $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
-        }
-        // invalidate all caches by cache group
-        else if (!$resource_name && $cache_id && !$compile_id) {
-            $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
-        }
-        // invalidate all caches by compile id
-        else if (!$resource_name && !$cache_id && $compile_id) {
-            $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
-        }
-        // invalidate by combination
+        } // invalidate all caches by template
         else {
-            $key = 'IVK#CID#' . $cid;
+            if ($resource_name && !$cache_id && !$compile_id) {
+                $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
+            } // invalidate all caches by cache group
+            else {
+                if (!$resource_name && $cache_id && !$compile_id) {
+                    $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
+                } // invalidate all caches by compile id
+                else {
+                    if (!$resource_name && !$cache_id && $compile_id) {
+                        $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
+                    } // invalidate by combination
+                    else {
+                        $key = 'IVK#CID#' . $cid;
+                    }
+                }
+            }
         }
         $this->write(array($key => $now));
     }
@@ -304,12 +346,13 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Determine the latest timestamp known to the invalidation chain
      *
-     * @param string $cid           CacheID to determine latest invalidation timestamp of
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's filepath
-     * @return float the microtime the CacheID was invalidated
+     * @param  string $cid           CacheID to determine latest invalidation timestamp of
+     * @param  string $resource_name template name
+     * @param  string $cache_id      cache id
+     * @param  string $compile_id    compile id
+     * @param  string $resource_uid  source's filepath
+     *
+     * @return float  the microtime the CacheID was invalidated
      */
     protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
     {
@@ -321,27 +364,28 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
         if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
             return 0;
         }
-        
+
         // there are no InValidationKeys
         if (!($values = $this->read($_cid))) {
             return 0;
         }
         // make sure we're dealing with floats
         $values = array_map('floatval', $values);
+
         return max($values);
     }
 
     /**
      * Translate a CacheID into the list of applicable InvalidationKeys.
-     *
      * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
      *
-     * @param string $cid           CacheID to translate
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's filepath
-     * @return array list of InvalidationKeys
+     * @param  string $cid           CacheID to translate
+     * @param  string $resource_name template name
+     * @param  string $cache_id      cache id
+     * @param  string $compile_id    compile id
+     * @param  string $resource_uid  source's filepath
+     *
+     * @return array  list of InvalidationKeys
      * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
      */
     protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
@@ -357,7 +401,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
             $t[] = 'IVK#COMPILE' . $_compile;
         }
         $_name .= '#';
-        // some poeple smoke bad weed
         $cid = trim($cache_id, '|');
         if (!$cid) {
             return $t;
@@ -378,30 +421,35 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
             $t[] = 'IVK#CACHE#' . $part;
             $t[] = 'IVK#CID' . $_name . $part . $_compile;
             // skip past delimiter position
-            $i++;
+            $i ++;
         }
+
         return $t;
     }
 
     /**
      * Check is cache is locked for this template
      *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
+     * @param  Smarty                 $smarty Smarty object
+     * @param  Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $key = 'LOCK#' . $cached->filepath;
         $data = $this->read(array($key));
+
         return $data && time() - $data[$key] < $smarty->locking_timeout;
     }
 
     /**
      * Lock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -413,8 +461,10 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Unlock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -426,27 +476,30 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     /**
      * Read values for a set of keys from cache
      *
-     * @param array $keys list of keys to fetch
+     * @param  array $keys list of keys to fetch
+     *
      * @return array list of values with the given keys used as indexes
      */
-    protected abstract function read(array $keys);
+    abstract protected function read(array $keys);
 
     /**
      * Save values for a set of keys to cache
      *
-     * @param array $keys   list of values to save
-     * @param int   $expire expiration time
+     * @param  array $keys   list of values to save
+     * @param  int   $expire expiration time
+     *
      * @return boolean true on success, false on failure
      */
-    protected abstract function write(array $keys, $expire=null);
+    abstract protected function write(array $keys, $expire = null);
 
     /**
      * Remove values from cache
      *
-     * @param array $keys list of keys to delete
+     * @param  array $keys list of keys to delete
+     *
      * @return boolean true on success, false on failure
      */
-    protected abstract function delete(array $keys);
+    abstract protected function delete(array $keys);
 
     /**
      * Remove *all* values from cache
@@ -457,7 +510,4 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
     {
         return false;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_config_source.php b/sources/include/smarty/libs/sysplugins/smarty_config_source.php
deleted file mode 100644
index 043ff13..0000000
--- a/sources/include/smarty/libs/sysplugins/smarty_config_source.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Config Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property string $content
- * @property int    $timestamp
- * @property bool   $exists
- */
-class Smarty_Config_Source extends Smarty_Template_Source {
-
-    /**
-     * create Config Object container
-     *
-     * @param Smarty_Resource $handler          Resource Handler this source object communicates with
-     * @param Smarty          $smarty           Smarty instance this source object belongs to
-     * @param string          $resource         full config_resource
-     * @param string          $type             type of resource
-     * @param string          $name             resource name
-     * @param string          $unique_resource  unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        // Note: these may be ->config_compiler_class etc in the future
-        //$this->config_compiler_class = $handler->config_compiler_class;
-        //$this->config_lexer_class = $handler->config_lexer_class;
-        //$this->config_parser_class = $handler->config_parser_class;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * @param string $property_name valid: content, timestamp, exists
-     * @param mixed  $value         newly assigned value (not check for correct type)
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'content':
-            case 'timestamp':
-            case 'exists':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid config property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param string $property_name valid: content, timestamp, exists
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("config property '$property_name' does not exist.");
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_data.php b/sources/include/smarty/libs/sysplugins/smarty_data.php
new file mode 100644
index 0000000..7cf18a4
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_data.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Smarty Plugin Data
+ * This file contains the data object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * class for the Smarty data object
+ * The Smarty data object will hold Smarty variables in the current scope
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Data extends Smarty_Internal_Data
+{
+    /**
+     * Counter
+     *
+     * @var int
+     */
+    static $count = 0;
+
+    /**
+     * Data block name
+     *
+     * @var string
+     */
+    public $dataObjectName = '';
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * create Smarty data object
+     *
+     * @param Smarty|array                    $_parent parent template
+     * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
+     * @param string                          $name    optional data block name
+     *
+     * @throws SmartyException
+     */
+    public function __construct($_parent = null, $smarty = null, $name = null)
+    {
+        parent::__construct();
+        self::$count ++;
+        $this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
+        $this->smarty = $smarty;
+        if (is_object($_parent)) {
+            // when object set up back pointer
+            $this->parent = $_parent;
+        } elseif (is_array($_parent)) {
+            // set up variable values
+            foreach ($_parent as $_key => $_val) {
+                $this->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        } elseif ($_parent != null) {
+            throw new SmartyException("Wrong type for template variables");
+        }
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/sources/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
index 04194b3..64d02df 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
@@ -2,41 +2,39 @@
 /**
  * Smarty Internal Plugin CacheResource File
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * This class does contain all necessary methods for the HTML cache on file system
- *
  * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Cacher
  */
-class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
-
+class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
+{
     /**
      * populate Cached Object with meta data from Resource
      *
      * @param Smarty_Template_Cached   $cached    cached object
      * @param Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
         $_source_file_path = str_replace(':', '.', $_template->source->filepath);
         $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w]+!', '_', $_template->compile_id) : null;
         $_filepath = $_template->source->uid;
         // if use_sub_dirs, break file into directories
         if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
+            $_filepath = substr($_filepath, 0, 2) . DS . substr($_filepath, 2, 2) . DS . substr($_filepath, 4, 2) . DS .
+                $_filepath;
         }
         $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
         if (isset($_cache_id)) {
@@ -58,36 +56,52 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
             } else {
                 $_lock_dir = $_cache_dir;
             }
-            $cached->lock_id = $_lock_dir.sha1($_cache_id.$_compile_id.$_template->source->uid).'.lock';
+            $cached->lock_id = $_lock_dir . sha1($_cache_id . $_compile_id . $_template->source->uid) . '.lock';
+        }
+        $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) .
+            '.php';
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
         }
-        $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
     }
 
     /**
      * populate Cached Object with timestamp and exists from Resource
      *
      * @param Smarty_Template_Cached $cached cached object
+     *
      * @return void
      */
     public function populateTimestamp(Smarty_Template_Cached $cached)
     {
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
     }
 
     /**
      * Read the cached template and process its header
      *
      * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update flag if called because cache update
+     *
+     * @return boolean true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
+        /** @var Smarty_Internal_Template $_smarty_tpl
+         * used in included file
+         */
         $_smarty_tpl = $_template;
-        return @include $_template->cached->filepath;
+        $_template->cached->valid = false;
+        if ($update && defined('HHVM_VERSION')) {
+            return $_template->smarty->ext->_hhvm->includeHhvm($_template, $_template->cached->filepath);
+        } else {
+            return @include $_template->cached->filepath;
+        }
     }
 
     /**
@@ -95,137 +109,76 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
      *
      * @param Smarty_Internal_Template $_template template object
      * @param string                   $content   content to cache
+     *
      * @return boolean success
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
-            $_template->cached->timestamp = @filemtime($_template->cached->filepath);
-            $_template->cached->exists = !!$_template->cached->timestamp;
-            if ($_template->cached->exists) {
+        if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
+            if (function_exists('opcache_invalidate')) {
+                opcache_invalidate($_template->cached->filepath);
+            }
+            $cached = $_template->cached;
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
                 return true;
             }
         }
         return false;
     }
 
+    /**
+     * Read cached template from cache
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        if (is_file($_template->cached->filepath)) {
+            return file_get_contents($_template->cached->filepath);
+        }
+        return false;
+    }
+
     /**
      * Empty cache
      *
-     * @param Smarty_Internal_Template $_template template object
-     * @param integer                  $exp_time  expiration time (number of seconds, not timestamp)
+     * @param Smarty  $smarty
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
      */
     public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        return $this->clear($smarty, null, null, null, $exp_time);
+        return Smarty_Internal_Extension_Clear::clear($smarty, null, null, null, $exp_time);
     }
 
     /**
      * Empty cache for a specific template
      *
-     * @param Smarty  $_template     template object
+     * @param Smarty  $smarty
      * @param string  $resource_name template name
      * @param string  $cache_id      cache id
      * @param string  $compile_id    compile id
      * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
      * @return integer number of cache files deleted
-    */
+     */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
-        $_dir = $smarty->getCacheDir();
-        $_dir_length = strlen($_dir);
-        if (isset($_cache_id)) {
-            $_cache_id_parts = explode('|', $_cache_id);
-            $_cache_id_parts_count = count($_cache_id_parts);
-            if ($smarty->use_sub_dirs) {
-                foreach ($_cache_id_parts as $id_part) {
-                    $_dir .= $id_part . DS;
-                }
-            }
-        }
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = true;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
-            } else {
-                return 0;
-            }
-        }
-        $_count = 0;
-        $_time = time();
-        if (file_exists($_dir)) {
-            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
-            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($_cache as $_file) {
-                if (substr(basename($_file->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
-                // directory ?
-                if ($_file->isDir()) {
-                    if (!$_cache->isDot()) {
-                        // delete folder if empty
-                        @rmdir($_file->getPathname());
-                    }
-                } else {
-                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length)));
-                    $_parts_count = count($_parts);
-                    // check name
-                    if (isset($resource_name)) {
-                        if ($_parts[$_parts_count-1] != $_resourcename_parts) {
-                            continue;
-                        }
-                    }
-                    // check compile id
-                    if (isset($_compile_id) && (!isset($_parts[$_parts_count-2 - $_compile_id_offset]) || $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id)) {
-                        continue;
-                    }
-                    // check cache id
-                    if (isset($_cache_id)) {
-                        // count of cache id parts
-                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
-                        if ($_parts_count < $_cache_id_parts_count) {
-                            continue;
-                        }
-                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
-                            if ($_parts[$i] != $_cache_id_parts[$i]) continue 2;
-                        }
-                    }
-                    // expired ?
-                    if (isset($exp_time) && $_time - @filemtime($_file) < $exp_time) {
-                        continue;
-                    }
-                    $_count += @unlink((string) $_file) ? 1 : 0;
-                }
-            }
-        }
-        return $_count;
+        return Smarty_Internal_Extension_Clear::clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
     }
 
     /**
      * Check is cache is locked for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
+     *
+     * @return boolean true or false if cache is locked
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -234,15 +187,21 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
         } else {
             clearstatcache();
         }
-        $t = @filemtime($cached->lock_id);
-        return $t && (time() - $t < $smarty->locking_timeout);
+        if (is_file($cached->lock_id)) {
+            $t = @filemtime($cached->lock_id);
+            return $t && (time() - $t < $smarty->locking_timeout);
+        } else {
+            return false;
+        }
     }
 
     /**
      * Lock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -253,8 +212,10 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
     /**
      * Unlock cache for this template
      *
-     * @param Smarty $smarty Smarty object
+     * @param Smarty                 $smarty Smarty object
      * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
      */
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
@@ -262,5 +223,3 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
         @unlink($cached->lock_id);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_append.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_append.php
index f6036e8..bd2ffe4 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_append.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_append.php
@@ -1,31 +1,31 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Append
- *
  * Compiles the {append} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Append Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
-
+class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
+{
     /**
      * Compiles code for the {append} tag
      *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // the following must be assigned at runtime because it will be overwritten in parent class
         $this->required_attributes = array('var', 'value');
@@ -47,7 +47,4 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
         // call compile assign
         return parent::compile($_new_attr, $compiler, $_params);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php
index f2dfedf..5e3fce3 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_assign.php
@@ -1,38 +1,46 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Assign
- *
  * Compiles the {assign} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Assign Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
+{
+    /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
 
     /**
      * Compiles code for the {assign} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
         $this->required_attributes = array('var', 'value');
         $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope');
+        $this->optional_attributes = array('scope', 'bubble_up');
         $_nocache = 'null';
-        $_scope = Smarty::SCOPE_LOCAL;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // nocache ?
@@ -42,47 +50,49 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
             if (isset($compiler->template->tpl_vars[trim($_attr['var'], "'")])) {
                 $compiler->template->tpl_vars[trim($_attr['var'], "'")]->nocache = true;
             } else {
-                $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
+                $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_Variable(null, true);
             }
         }
         // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_scope = Smarty::SCOPE_GLOBAL;
-            } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                $_scope += (isset($_attr['bubble_up']) && $_attr['bubble_up'] == 'false') ? 0 : Smarty::SCOPE_BUBBLE_UP;
             }
         }
         // compiled output
         if (isset($parameter['smarty_internal_index'])) {
-            $output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
+            $output =
+                "<?php \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, $_attr[var], $_nocache);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
         } else {
             // implement Smarty2's behaviour of variables assigned by reference
             if ($compiler->template->smarty instanceof SmartyBC) {
-                $output = "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-                $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache; \$_smarty_tpl->tpl_vars[$_attr[var]]->scope = $_scope;";
-                $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
+                $output =
+                    "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
+                $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache;";
+                $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_Variable($_attr[value], $_nocache);";
             } else {
-                $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
+                $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_Variable($_attr[value], $_nocache);";
             }
         }
-        if ($_scope == Smarty::SCOPE_PARENT) {
-            $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
-        }
-        if ( $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        }
+        $output .= "\n\$_smarty_tpl->ext->_updateScope->updateScope(\$_smarty_tpl, $_attr[var], $_scope);";
         $output .= '?>';
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_block.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_block.php
index f760e55..ab1fc6e 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_block.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_block.php
@@ -1,23 +1,20 @@
 <?php
-
-/**
- * Smarty Internal Plugin Compile Block
+/*
+ * This file is part of Smarty.
  *
- * Compiles the {block}{/block} tags
+ * (c) 2015 Uwe Tews
  *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
  * Smarty Internal Plugin Compile Block Class
  *
- * @package Smarty
- * @subpackage Compiler
+ * @author Uwe Tews <uwe.tews@googlemail.com>
  */
-class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -32,7 +29,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('name', 'hide');
+    public $shorttag_order = array('name');
 
     /**
      * Attribute definition: Overwrites base class.
@@ -40,243 +37,256 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $optional_attributes = array('hide');
+    public $option_flags = array('hide', 'nocache');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * nesting level of block tags
+     *
+     * @var int
+     */
+    public static $blockTagNestingLevel = 0;
+
+    /**
+     * Saved compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
 
     /**
      * Compiles code for the {block} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return boolean true
+     * @param  array                                 $args      array with attributes from parser
+     * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                 $parameter array with compilation parameter
+     *
+     * @return bool true
      */
-    public function compile($args, $compiler) {
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->_cache['blockNesting'] = 0;
+        }
+        if ($compiler->_cache['blockNesting'] == 0) {
+            // make sure that inheritance gets initialized in template code
+            $this->registerInit($compiler);
+            $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
+        } else {
+            $this->option_flags = array('hide', 'nocache');
+        }
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        $save = array($_attr, $compiler->parser->current_buffer, $compiler->nocache, $compiler->smarty->merge_compiled_includes, $compiler->merged_templates, $compiler->smarty->merged_templates_func, $compiler->template->properties, $compiler->template->has_nocache_code);
-        $this->openTag($compiler, 'block', $save);
-        if ($_attr['nocache'] == true) {
-            $compiler->nocache = true;
+        $compiler->_cache['blockNesting'] ++;
+        $compiler->_cache['blockName'][$compiler->_cache['blockNesting']] = $_attr['name'];
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][0] = 'block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][1] = false;
+        $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
+                                                 $compiler->template->compiled->has_nocache_code,
+                                                 $compiler->template->caching));
+        // must whole block be nocache ?
+        if ($compiler->tag_nocache) {
+            $i = 0;
         }
-        // set flag for {block} tag
-        $compiler->inheritance = true;
-        // must merge includes
-        $compiler->smarty->merge_compiled_includes = true;
-
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->has_code = false;
-        return true;
-    }
-
-    /**
-     * Save or replace child block source by block name during parsing
-     *
-     * @param string $block_content     block source content
-     * @param string $block_tag         opening block tag
-     * @param object $template          template object
-     * @param string $filepath          filepath of template source
-     */
-    public static function saveBlockData($block_content, $block_tag, $template, $filepath) {
-        $_rdl = preg_quote($template->smarty->right_delimiter);
-        $_ldl = preg_quote($template->smarty->left_delimiter);
-        if (!$template->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
-        if (0 == preg_match("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)?(\s*)?(hide)?)?(\s*{$_rdl})!", $block_tag, $_match)) {
-            $error_text = 'Syntax Error in template "' . $template->source->filepath . '"   "' . htmlspecialchars($block_tag) . '" illegal options';
-            throw new SmartyCompilerException($error_text);
-        } else {
-            $_name = trim($_match[3], '\'"');
-            if ($_match[8] != 'hide' || isset($template->block_data[$_name])) {        // replace {$smarty.block.child}
-                // get nested block tags
-                if (0 != preg_match_all("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")([\s\S]*?)(hide)?(\s*{$_rdl})([\s\S]*?)(.*)?({$_ldl}{$al}/block\s*{$_rdl})!", $block_content, $_match2)) {
-                    foreach ($_match2[3] as $key => $name) {
-                        // get it's replacement
-                        $_name2 = trim($name, '\'"');
-                        if ($_match2[5][$key] != 'hide' || isset($template->block_data[$_name2])) {
-                            if (isset($template->block_data[$_name2])) {
-                                $replacement = $template->block_data[$_name2]['source'];
-                            } else {
-                                $replacement = '';
-                            }
-                            // replace {$smarty.block.child} tag
-                            if (preg_match("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!",$_match2[7][$key])) {
-                                 $replacement =  preg_replace("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $replacement, $_match2[7][$key]);
-                                 $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl}[\s\S]*?{$_ldl}{$al}/block\s*{$_rdl}))!", $replacement, $block_content);
-                           }
-                             if (preg_match("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!",$_match2[8][$key])) {
-                                 $replacement =  preg_replace("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!", $replacement, $_match2[8][$key]);
-                                 $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl})(.*)?({$_ldl}{$al}/block\s*{$_rdl}))!", $replacement, $block_content);
-                             }
-                        } else {
-                            // remove hidden blocks
-                            $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl}[\s\S]*?{$_ldl}{$al}/block\s*{$_rdl}))!", '', $block_content);
-                        }
-                    }
-                }
-                // do we have not nested {$smart.block.child}
-                if (0 != preg_match("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $block_content, $_match2)) {
-                    // get child replacement for this block
-                    if (isset($template->block_data[$_name])) {
-                        $replacement = $template->block_data[$_name]['source'];
-                        unset($template->block_data[$_name]);
-                    } else {
-                        $replacement = '';
-                    }
-                    $block_content = preg_replace("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $replacement, $block_content);
-                }
-                if (isset($template->block_data[$_name])) {
-                    if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-                        $template->block_data[$_name]['source'] =
-                                str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']);
-                    } elseif ($template->block_data[$_name]['mode'] == 'prepend') {
-                        $template->block_data[$_name]['source'] .= $block_content;
-                    } elseif ($template->block_data[$_name]['mode'] == 'append') {
-                        $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source'];
-                    }
-                } else {
-                    $template->block_data[$_name]['source'] = $block_content;
-                    $template->block_data[$_name]['file'] = $filepath;
-                }
-                if ($_match[6] == 'append') {
-                    $template->block_data[$_name]['mode'] = 'append';
-                } elseif ($_match[6] == 'prepend') {
-                    $template->block_data[$_name]['mode'] = 'prepend';
-                } else {
-                    $template->block_data[$_name]['mode'] = 'replace';
-                }
-            }
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        // $compiler->suppressNocacheProcessing = true;
+        if ($_attr['nocache'] === true) {
+            //$compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->taglineno);
         }
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
+        $compiler->suppressNocacheProcessing = true;
     }
 
     /**
      * Compile saved child block source
      *
-     * @param object $compiler  compiler object
-     * @param string $_name     optional name of child block
-     * @return string   compiled code of schild block
+     * @param \Smarty_Internal_TemplateCompilerBase compiler object
+     * @param string                                $_name   optional name of child block
+     *
+     * @return string   compiled code of child block
      */
-    public static function compileChildBlock($compiler, $_name = null) {
-        $_output = '';
-        // if called by {$smarty.block.child} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "'\"");
-                    break;
-                }
-            }
-            // flag that child is already compile by {$smarty.block.child} inclusion
-            $compiler->template->block_data[$_name]['compiled'] = true;
+    static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
+    {
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
+                                              $compiler->parser->lex->taglineno);
         }
-        if ($_name == null) {
-            $compiler->trigger_template_error('{$smarty.block.child} used out of context', $compiler->lex->taglineno);
-        }
-        // undefined child?
-        if (!isset($compiler->template->block_data[$_name]['source'])) {
-            return '';
-        }
-        $_tpl = new Smarty_Internal_template('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
-                        $compiler->template->compile_id = null, $compiler->template->caching, $compiler->template->cache_lifetime);
-        $_tpl->variable_filters = $compiler->template->variable_filters;
-        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-        $_tpl->source->filepath = $compiler->template->block_data[$_name]['file'];
-        $_tpl->allow_relative_path = true;
-        if ($compiler->nocache) {
-            $_tpl->compiler->forceNocache = 2;
-        } else {
-            $_tpl->compiler->forceNocache = 1;
-        }
-        $_tpl->compiler->suppressHeader = true;
-        $_tpl->compiler->suppressTemplatePropertyHeader = true;
-        $_tpl->compiler->suppressMergedTemplates = true;
-        if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-            $_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl));
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
-            $_output = $_tpl->compiler->compileTemplate($_tpl) . $compiler->parser->current_buffer->to_smarty_php();
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
-            $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl);
-        } elseif (!empty($compiler->template->block_data[$_name])) {
-            $_output = $_tpl->compiler->compileTemplate($_tpl);
-        }
-        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
-        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
-        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
-        $compiler->template->variable_filters = $_tpl->variable_filters;
-        if ($_tpl->has_nocache_code) {
-            $compiler->template->has_nocache_code = true;
-        }
-        foreach ($_tpl->required_plugins as $key => $tmp1) {
-            if ($compiler->nocache && $compiler->template->caching) {
-                $code = 'nocache';
-            } else {
-                $code = $key;
-            }
-            foreach ($tmp1 as $name => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->template->required_plugins[$code][$name][$type] = $data;
-                }
-            }
-        }
-        unset($_tpl);
-        return $_output;
+        $compiler->has_code = true;
+        $compiler->suppressNocacheProcessing = true;
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][1] = true;
+        $output = "<?php \n\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 2, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, null, \$_blockParentStack);\n?>\n";
+        return $output;
     }
 
+    /**
+     * Compile $smarty.block.parent
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param string                                $_name    optional name of child block
+     *
+     * @return string   compiled code of child block
+     */
+    static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
+    {
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
+                                              $compiler->parser->lex->taglineno);
+        }
+        $compiler->suppressNocacheProcessing = true;
+        $compiler->has_code = true;
+        $output = "<?php \n\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 4, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, null, \$_blockParentStack);\n?>\n";
+        return $output;
+    }
 }
 
 /**
  * Smarty Internal Plugin Compile BlockClose Class
  *
- * @package Smarty
- * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
+{
     /**
      * Compiles code for the {/block} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return bool true
      */
-    public function compile($args, $compiler) {
-        $compiler->has_code = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-            // restore to status before {block} tag as new subtemplate code of parent {block} is not needed
-            // TODO: Below code was disabled in 3.1.8 because of problems with {include} in nested {block} tags in child templates
-            //       combined with append/prepend or $smarty.block.parent
-            //       For later versions it should be checked under which conditions it could run for optimisation
-            //
-            //$compiler->merged_templates = $saved_data[4];
-            //$compiler->smarty->merged_templates_func = $saved_data[5];
-            //$compiler->template->properties = $saved_data[6];
-            //$compiler->template->has_nocache_code = $saved_data[7];
-            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
-        } else {
-            if (isset($saved_data[0]['hide']) && !isset($compiler->template->block_data[$_name]['source'])) {
-                $_output = '';
-            } else {
-                $_output = $compiler->parser->current_buffer->to_smarty_php();
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
+        // init block parameter
+        $_block = $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']];
+        unset($compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]);
+        $_block[2] = $_block[3] = 0;
+        $_name =  trim($_attr['name'], "'\"");
+        $_assign = isset($_attr['assign']) ? $_attr['assign'] : null;
+        unset($_attr['assign'], $_attr['name']);
+        foreach ($_attr as $name => $stat) {
+            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
+                $_block[$name] = is_string($stat) ? trim($stat, "'\"") : $stat;
             }
-            unset($compiler->template->block_data[$_name]['compiled']);
         }
-        // reset flags
-        $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->nocache = $saved_data[2];
-        $compiler->smarty->merge_compiled_includes = $saved_data[3];
-        // reset flag for {block} tag
-        $compiler->inheritance = false;
-        // $_output content has already nocache code processed
+        $_funcName = $_block[0];
+        // get compiled block code
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+
+        if ($compiler->template->compiled->has_nocache_code) {
+            //            $compiler->parent_compiler->template->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
+            $_block[6] = $_funcNameCaching = $_funcName . '_nocache';
+            $output = "<?php\n";
+            $output .= "/* {block '{$_name}'} {$compiler->template->source->type}:{$compiler->template->source->name} */\n";
+            $output .= "function {$_funcNameCaching} (\$_smarty_tpl, \$_blockParentStack) {\n";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n";
+            $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
+            if (isset($_assign)) {
+                $output .= "ob_start();\n";
+            }
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                                $output));
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+            $output = "<?php\n";
+            if (isset($_assign)) {
+                $output .= "\$_smarty_tpl->tpl_vars[{$_assign}] = new Smarty_Variable(ob_get_clean());\n";
+            }
+            $output .= "/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n";
+            $output .= "}\n";
+            $output .= "/* {/block '{$_name}'} */\n\n";
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                                $output));
+            $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+            $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+            $this->compiler = $compiler;
+            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                               preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                                                                                     array($this, 'removeNocache'),
+                                                                                     $_functionCode->to_smarty_php($compiler->parser)));
+            $this->compiler = null;
+        }
+        $output = "<?php\n";
+        $output .= "/* {block '{$_name}'}  {$compiler->template->source->type}:{$compiler->template->source->name} */\n";
+        $output .= "function {$_funcName}(\$_smarty_tpl, \$_blockParentStack) {\n";
+        if (isset($_assign)) {
+            $output .= "ob_start();\n";
+        }
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                            $output));
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->tpl_vars[{$_assign}] = new Smarty_Variable(ob_get_clean());\n";
+        }
+        $output .= "}\n";
+        $output .= "/* {/block '{$_name}'} */\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                            $output));
+        $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        // nocache plugins must be copied
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
+                foreach ($tmp as $type => $data) {
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] =
+                        $data;
+                }
+            }
+        }
+
+
+        // restore old status
+        $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
+        $compiler->tag_nocache = $compiler->nocache;
+        $compiler->nocache = $_nocache;
+        $compiler->parser->current_buffer = $_buffer;
+        $output = "<?php \n";
+        if ($compiler->_cache['blockNesting'] == 1) {
+            $output .= "\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 0, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, " .
+                var_export($_block, true) . ");\n";
+        } else {
+            $output .= "\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 0, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, " .
+                var_export($_block, true) . ", \$_blockParentStack);\n";
+
+        }
+        $output .= "?>\n";
+        $compiler->_cache['blockNesting'] --;
+        if ($compiler->_cache['blockNesting'] == 0) {
+            unset($compiler->_cache['blockNesting']);
+        }
+        $compiler->has_code = true;
         $compiler->suppressNocacheProcessing = true;
-        return $_output;
+        return $output;
     }
 
+    /**
+     * @param $match
+     *
+     * @return mixed
+     */
+    function removeNocache($match)
+    {
+        $code =
+            preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                         '', $match[0]);
+        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+        return $code;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_break.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_break.php
index b25bef6..cbc73d3 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_break.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_break.php
@@ -1,21 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Break
- *
  * Compiles the {break} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
+
 /**
  * Smarty Internal Plugin Compile Break Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('levels');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -34,24 +35,26 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {break} tag
      *
-     * @param array  $args array with attributes from parser
-     * @param object $compiler   compiler object
-     * @param array  $parameter  array with compilation parameter
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
         if (isset($_attr['levels'])) {
             if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
             }
             $_levels = $_attr['levels'];
         } else {
@@ -61,17 +64,14 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
         $stack_count = count($compiler->_tag_stack) - 1;
         while ($level_count > 0 && $stack_count >= 0) {
             if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-                $level_count--;
+                $level_count --;
             }
-            $stack_count--;
+            $stack_count --;
         }
         if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("cannot break {$_levels} level(s)", null, true);
         }
-        $compiler->has_code = true;
-        return "<?php break {$_levels}?>";
+
+        return "<?php break {$_levels};?>";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_call.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_call.php
index af12a04..b7204be 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_call.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_call.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function_Call
- *
  * Compiles the calls of user defined tags defined by {function}
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function_Call Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +31,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -42,9 +43,9 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
     /**
      * Compiles the calls of user defined tags defined by {function}
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -53,16 +54,14 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
         $_attr = $this->getAttributes($compiler, $args);
         // save possible attributes
         if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
+            // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
         }
+        //$_name = trim($_attr['name'], "'\"");
         $_name = $_attr['name'];
-        if ($compiler->compiles_template_function) {
-            $compiler->called_functions[] = trim($_name, "'\"");
-        }
         unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
         // set flag (compiled code of {function} must be included in cache file
-        if ($compiler->nocache || $compiler->tag_nocache) {
+        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
             $_nocache = 'true';
         } else {
             $_nocache = 'false';
@@ -75,56 +74,16 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
                 $_paramsArray[] = "'$_key'=>$_value";
             }
         }
-        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
-            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        } elseif (isset($compiler->smarty->template_functions[$_name]['parameter'])) {
-            foreach ($compiler->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        }
-        //varibale name?
-        if (!(strpos($_name, '$') === false)) {
-            $call_cache = $_name;
-            $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
-        } else {
-            $_name = trim($_name, "'\"");
-            $call_cache = "'{$_name}'";
-            $call_function = 'smarty_template_function_' . $_name;
-        }
-
         $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        $_hash = str_replace('-', '_', $compiler->template->properties['nocache_hash']);
+        //$compiler->suppressNocacheProcessing = true;
         // was there an assign attribute
         if (isset($_assign)) {
-            if ($compiler->template->caching) {
-                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            } else {
-                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            }
+            $_output =
+                "<?php ob_start();\n\$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
         } else {
-            if ($compiler->template->caching) {
-                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
-            } else {
-                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
-            }
+            $_output =
+                "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
         }
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php
index 9a5071e..be45f3e 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_capture.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Capture
- *
  * Compiles the {capture} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Capture Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -35,11 +35,12 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {capture} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -51,29 +52,49 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
         $compiler->_capture_stack[0][] = array($buffer, $assign, $append, $compiler->nocache);
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->_capture_stack[0][] = array($buffer, $assign, $append); ob_start(); ?>";
+        $_output = "<?php \$_smarty_tpl->_cache['capture_stack'][] = array($buffer, $assign, $append); ob_start(); ?>";
 
         return $_output;
     }
 
+    /**
+     * Compiles code for the {$smarty.capture.xxx}
+     *
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $tag = strtolower(trim($parameter[ 0 ], '"\''));
+        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+        if (!$name) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+        }
+        return "(isset(\$_smarty_tpl->_cache['__smarty_capture']['{$name}']) ? \$_smarty_tpl->_cache['__smarty_capture']['{$name}'] : null)";
+    }
 }
 
 /**
  * Smarty Internal Plugin Compile Captureclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/capture} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -84,15 +105,13 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
 
         list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack[0]);
 
-        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_capture_stack[0]);\n";
+        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_cache['capture_stack']);\n";
         $_output .= "if (!empty(\$_capture_buffer)) {\n";
         $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n";
         $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
-        $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
+        $_output .= "\$_smarty_tpl->_cache['__smarty_capture'][\$_capture_buffer]=ob_get_clean();\n";
         $_output .= "} else \$_smarty_tpl->capture_error();?>";
+
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
index deaa052..d2e50a0 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Config Load
- *
  * Compiles the {config load} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Config Load Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,62 +23,82 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('file','section');
+    public $shorttag_order = array('file', 'section');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $optional_attributes = array('section', 'scope');
+    public $optional_attributes = array('section', 'scope', 'bubble_up');
+
+    /**
+     * Valid scope names
+     * 
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
 
     /**
      * Compiles code for the {config_load} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        static $_is_legal_scope = array('local' => true,'parent' => true,'root' => true,'global' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
-
-        // save posible attributes
+        // save possible attributes
         $conf_file = $_attr['file'];
         if (isset($_attr['section'])) {
             $section = $_attr['section'];
         } else {
             $section = 'null';
         }
-        $scope = 'local';
-        // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if (isset($_is_legal_scope[$_attr['scope']])) {
-                $scope = $_attr['scope'];
-           } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-           }
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                $_scope += (isset($_attr['bubble_up']) && $_attr['bubble_up'] == 'false') ? 0 : Smarty::SCOPE_BUBBLE_UP;
+            }
         }
+
         // create config object
-        $_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
+        $_output =
+            "<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
+
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php
index 72a5f86..2ee04c9 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_continue.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Continue
- *
  * Compiles the {continue} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Continue Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('levels');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -35,24 +35,26 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {continue} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
         if (isset($_attr['levels'])) {
             if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
             }
             $_levels = $_attr['levels'];
         } else {
@@ -62,17 +64,14 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
         $stack_count = count($compiler->_tag_stack) - 1;
         while ($level_count > 0 && $stack_count >= 0) {
             if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-                $level_count--;
+                $level_count --;
             }
-            $stack_count--;
+            $stack_count --;
         }
         if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", null, true);
         }
-        $compiler->has_code = true;
-        return "<?php continue {$_levels}?>";
+
+        return "<?php continue {$_levels};?>";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php
index f50c7ae..d73c81a 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_debug.php
@@ -1,28 +1,28 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Debug
- *
  * Compiles the {debug} tag.
  * It opens a window the the Smarty Debugging Console.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Debug Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {debug} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -34,10 +34,8 @@ class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
         $compiler->tag_nocache = true;
 
         // display debug template
-        $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
+        $_output = "<?php \$_smarty_debug = new Smarty_Internal_Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
+        $_output .= "unset(\$_smarty_debug);\n?>";
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php
index 6cf481b..407482f 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_eval.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Eval
- *
  * Compiles the {eval} tag.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Eval Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -37,13 +36,14 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('var','assign');
+    public $shorttag_order = array('var', 'assign');
 
     /**
      * Compiles code for the {eval} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -53,21 +53,19 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         if (isset($_attr['assign'])) {
-              // output will be stored in a smarty variable instead of beind displayed
+            // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
         }
 
         // create template object
-        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);";
+        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'." . $_attr['var'] . ", \$_smarty_tpl->smarty, \$_smarty_tpl);";
         //was there an assign attribute?
         if (isset($_assign)) {
             $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
         } else {
             $_output .= "echo \$_template->fetch();";
         }
+
         return "<?php $_output ?>";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php
index fe14a40..7ce3dcf 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_extends.php
@@ -1,133 +1,134 @@
 <?php
 
 /**
-* Smarty Internal Plugin Compile extend
-*
-* Compiles the {extends} tag
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Compile extend
+ * Compiles the {extends} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile extend Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile extend Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inheritance
+{
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('file');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $shorttag_order = array('file');
-    /**
-    * mbstring.overload flag
-    *
-    * @var int
-    */
-    public $mbstring_overload = 0;
 
     /**
-    * Compiles code for the {extends} tag
-    *
-    * @param array  $args     array with attributes from parser
-    * @param object $compiler compiler object
-    * @return string compiled code
-    */
-    public function compile($args, $compiler)
+     * Array of names of optional attribute required by tag
+     * use array('_any') if there is no restriction of attributes names
+     *
+     * @var array
+     */
+    public $optional_attributes = array('extends_resource');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file');
+
+    /**
+     * Compiles code for the {extends} tag extends: resource
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        $this->_rdl = preg_quote($compiler->smarty->right_delimiter);
-        $this->_ldl = preg_quote($compiler->smarty->left_delimiter);
-        if (!$compiler->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
-        $filepath = $compiler->template->source->filepath;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
         }
-
-        $_smarty_tpl = $compiler->template;
-        $include_file = null;
         if (strpos($_attr['file'], '$_tmp') !== false) {
-            $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
         }
-        eval('$include_file = ' . $_attr['file'] . ';');
-        // create template object
-        $_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template);
-        // save file dependency
-        if (isset($_is_stringy[$_template->source->type])) {
-            $template_sha1 = sha1($include_file);
-        } else {
-            $template_sha1 = sha1($_template->source->filepath);
-        }
-        if (isset($compiler->template->properties['file_dependency'][$template_sha1])) {
-            $compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"", $compiler->lex->line - 1);
-        }
-        $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
-        $_content = ($this->mbstring_overload ? mb_substr($compiler->lex->data, $compiler->lex->counter - 1, 20000000, 'latin1') : substr($compiler->lex->data, $compiler->lex->counter - 1));
-        if (preg_match_all("!({$this->_ldl}{$al}block\s(.+?)\s*{$this->_rdl})!", $_content, $s) !=
-        preg_match_all("!({$this->_ldl}{$al}/block\s*{$this->_rdl})!", $_content, $c)) {
-            $compiler->trigger_template_error('unmatched {block} {/block} pairs');
-        }
-        preg_match_all("!{$this->_ldl}{$al}block\s(.+?)\s*{$this->_rdl}|{$this->_ldl}{$al}/block\s*{$this->_rdl}|{$this->_ldl}\*([\S\s]*?)\*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-        $_result_count = count($_result[0]);
-        $_start = 0;
-        while ($_start+1 < $_result_count) {
-            $_end = 0;
-            $_level = 1;
-            if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
-                $_start++;
-                continue;
-            }
-            while ($_level != 0) {
-                $_end++;
-                if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
-                    continue;
-                }
-                if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                    $_level++;
+        // add code to initialize inheritance
+        $this->registerInit($compiler, true);
+        $file = trim($_attr['file'], '\'"');
+        if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
+            // generate code for each template
+            $files = array_reverse(explode('|', substr($file, 8)));
+            $i = 0;
+            foreach ($files as $file) {
+                if ($file[0] == '"') {
+                    $file = trim($file, '".');
                 } else {
-                    $_level--;
+                    $file = "'{$file}'";
                 }
+                $i ++;
+                if ($i == count($files) && isset($_attr['extends_resource'])) {
+                    $this->compileEndChild($compiler);
+                }
+                $this->compileInclude($compiler, $file);
             }
-            $_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-            ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
-            Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
-            $_start = $_start + $_end + 1;
-        }
-        if ($_template->source->type == 'extends') {
-            $_template->block_data = $compiler->template->block_data;
-        }
-        $compiler->template->source->content = $_template->source->content;
-        if ($_template->source->type == 'extends') {
-            $compiler->template->block_data = $_template->block_data;
-            foreach ($_template->source->components as $key => $component) {
-                $compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type);
+            if (!isset($_attr['extends_resource'])) {
+                $this->compileEndChild($compiler);
             }
+        } else {
+            $this->compileEndChild($compiler);
+            $this->compileInclude($compiler, $_attr['file']);
         }
-        $compiler->template->source->filepath = $_template->source->filepath;
-        $compiler->abort_and_recompile = true;
+        $compiler->has_code = false;
         return '';
     }
 
-}
+    /**
+     * Add code for inheritance endChild() method to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                  "<?php \$_smarty_tpl->ext->_inheritance->endChild(\$_smarty_tpl);\n?>\n");
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Add code for including subtemplate to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param  string                               $file subtemplate name
+     */
+    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
+    {
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                  $compiler->compileTag('include',
+                                                                                                        array($file,
+                                                                                                              array('scope' => 'parent'))));
+    }
+
+    /**
+     * Create source code for {extends} from source components array
+     *
+     * @param []\Smarty_Internal_Template_Source $components
+     *
+     * @return string
+     */
+    public static function extendsSourceArrayCode($components)
+    {
+        $resources = array();
+        foreach ($components as $source) {
+            $resources[] = $source->resource;
+        }
+        return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_for.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_for.php
index 057f4fb..7b86d48 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_for.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_for.php
@@ -1,43 +1,40 @@
 <?php
 /**
  * Smarty Internal Plugin Compile For
- *
  * Compiles the {for} {forelse} {/for} tags
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile For Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {for} tag
-     *
-     * Smarty 3 does implement two different sytaxes:
-     *
+     * Smarty 3 does implement two different syntax's:
      * - {for $var in $array}
      * For looping over arrays or iterators
-     *
      * - {for $x=0; $x<$y; $x++}
      * For general loops
+     * The parser is generating different sets of attribute by which this compiler can
+     * determine which syntax is used.
      *
-     * The parser is gereration different sets of attribute by which this compiler can
-     * determin which syntax is used.
+     * @param  array  $args      array with attributes from parser
+     * @param  object $compiler  compiler object
+     * @param  array  $parameter array with compilation parameter
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         if ($parameter == 0) {
             $this->required_attributes = array('start', 'to');
             $this->optional_attributes = array('max', 'step');
@@ -48,30 +45,51 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        $output = "<?php ";
+        $output = "<?php\n";
         if ($parameter == 1) {
             foreach ($_attr['start'] as $_statement) {
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
+                if (is_array($_statement['var'])) {
+                    $var = $_statement['var']['var'];
+                    $index = $_statement['var']['smarty_internal_index'];
+                } else {
+                    $var = $_statement['var'];
+                    $index = '';
+                }
+                $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable;\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
             }
-            $output .= "  if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]){\n";
+            if (is_array($_attr['var'])) {
+                $var = $_attr['var']['var'];
+                $index = $_attr['var']['smarty_internal_index'];
+            } else {
+                $var = $_attr['var'];
+                $index = '';
+            }
+            $output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
         } else {
             $_statement = $_attr['start'];
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-            if (isset($_attr['step'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
+            if (is_array($_statement['var'])) {
+                $var = $_statement['var']['var'];
+                $index = $_statement['var']['smarty_internal_index'];
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
+                $var = $_statement['var'];
+                $index = '';
+            }
+            $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable;";
+            if (isset($_attr['step'])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
             }
             if (isset($_attr['max'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
             }
-            $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0){\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++){\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
+            $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
+            $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;";
         }
         $output .= "?>";
 
@@ -81,55 +99,57 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
         // return compiled code
         return $output;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Forelse Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {forelse} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $args      array with attributes from parser
+     * @param  object $compiler  compiler object
+     * @param  array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
         // check and get attributes
-        $_attr  = $this->getAttributes($compiler, $args);
+        $_attr = $this->getAttributes($compiler, $args);
 
         list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
         $this->openTag($compiler, 'forelse', array('forelse', $nocache));
+
         return "<?php }} else { ?>";
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Forclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/for} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $args      array with attributes from parser
+     * @param  object $compiler  compiler object
+     * @param  array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
     {
+        $compiler->loopNesting--;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // must endblock be nocache?
@@ -139,13 +159,11 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
 
         list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
 
-        if ($openTag == 'forelse') {
-            return "<?php }  ?>";
-        } else {
-            return "<?php }} ?>";
-        }
+        $output = "<?php }\n";
+        if ($openTag != 'forelse') {
+            $output .= "}\n";
+         }
+        $output .= "?>\n";
+        return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
index 1354c89..178a0a5 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
@@ -1,21 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Foreach
- *
  * Compiles the {foreach} {foreachelse} {/foreach} tags
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Foreach Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_ForeachSection
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('from', 'item');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,137 +31,241 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('name', 'key');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $shorttag_order = array('from','item','key','name');
+    public $shorttag_order = array('from', 'item', 'key', 'name');
+
+    /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'foreach';
+
+    /**
+     * Valid properties of $smarty.foreach.name.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total');
+
+    /**
+     * Valid properties of $item@xxx variable
+     *
+     * @var array
+     */
+    public $itemProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'key');
+
+    /**
+     * Flag if tag had name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = false;
 
     /**
      * Compiles code for the {foreach} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $tpl = $compiler->template;
+        $compiler->loopNesting ++;
+        // init
+        $this->isNamed = false;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
         $from = $_attr['from'];
-        $item = $_attr['item'];
-        if (!strncmp("\$_smarty_tpl->tpl_vars[$item]", $from, strlen($item) + 24)) {
-            $compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $compiler->lex->taglineno);
+        $item = $compiler->getId($_attr['item']);
+        if ($item === false) {
+            $item = $compiler->getVariableName($_attr['item']);
         }
-
+        $attributes = array('item' => $item);
         if (isset($_attr['key'])) {
-            $key = $_attr['key'];
-        } else {
-            $key = null;
+            $key = $compiler->getId($_attr['key']);
+            if ($key === false) {
+                $key = $compiler->getVariableName($_attr['key']);
+            }
+            $attributes['key'] = $key;
+        }
+        if (isset($_attr['name'])) {
+            $this->isNamed = true;
+            $attributes['name'] = $compiler->getId($_attr['name']);
+        }
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $fromName = $compiler->getVariableName($_attr['from']);
+        if ($fromName) {
+            foreach (array('item', 'key') as $a) {
+                if (isset($attributes[$a]) && $attributes[$a] == $fromName) {
+                    $compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'",
+                                                      null, true);
+                }
+            }
         }
 
-        $this->openTag($compiler, 'foreach', array('foreach', $compiler->nocache, $item, $key));
+        $itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
+        $local = '$__foreach_' . (isset($attributes['name']) ? $attributes['name'] : $attributes['item']) . '_' .
+            $this->counter ++ . '_';
+        $needIteration = false;
+        // search for used tag attributes
+        $itemAttr = array();
+        $namedAttr = array();
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults['item'])) {
+            $itemAttr = $this->matchResults['item'];
+        }
+        if (!empty($this->matchResults['named'])) {
+            $namedAttr = $this->matchResults['named'];
+        }
+        if (isset($itemAttr['last'])) {
+            $needIteration = true;
+        }
+        if (isset($namedAttr['last'])) {
+            $needIteration = true;
+        }
+
+        $keyTerm = '';
+        if (isset($itemAttr['key'])) {
+            $keyTerm = "{$itemVar}->key => ";
+        } elseif (isset($attributes['key'])) {
+            $keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
+        }
+
+        $saveVars = array();
+        $restoreVars = array();
+        if ($this->isNamed) {
+            $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
+            if (!empty($namedAttr)) {
+                $saveVars['saved'] = "isset({$foreachVar}) ? {$foreachVar} : false;";
+                $restoreVars[] = "if ({$local}saved) {\n{$foreachVar} = {$local}saved;\n}\n";
+            }
+        }
+        foreach (array('item', 'key') as $a) {
+            if (isset($attributes[$a])) {
+                $saveVars['saved_' . $a] =
+                    "isset(\$_smarty_tpl->tpl_vars['{$attributes[$a]}']) ? \$_smarty_tpl->tpl_vars['{$attributes[$a]}'] : false;";
+                $restoreVars[] =
+                    "if ({$local}saved_{$a}) {\n\$_smarty_tpl->tpl_vars['{$attributes[$a]}'] = {$local}saved_{$a};\n}\n";
+            }
+        }
+        $this->openTag($compiler, 'foreach',
+                       array('foreach', $compiler->nocache, $local, $restoreVars, $itemVar, true));
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        if (isset($_attr['name'])) {
-            $name = $_attr['name'];
-            $has_name = true;
-            $SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
-        } else {
-            $name = null;
-            $has_name = false;
-        }
-        $ItemVarName = '$' . trim($item, '\'"') . '@';
-        // evaluates which Smarty variables and properties have to be computed
-        if ($has_name) {
-            $usesSmartyFirst = strpos($tpl->source->content, $SmartyVarName . 'first') !== false;
-            $usesSmartyLast = strpos($tpl->source->content, $SmartyVarName . 'last') !== false;
-            $usesSmartyIndex = strpos($tpl->source->content, $SmartyVarName . 'index') !== false;
-            $usesSmartyIteration = strpos($tpl->source->content, $SmartyVarName . 'iteration') !== false;
-            $usesSmartyShow = strpos($tpl->source->content, $SmartyVarName . 'show') !== false;
-            $usesSmartyTotal = strpos($tpl->source->content, $SmartyVarName . 'total') !== false;
-        } else {
-            $usesSmartyFirst = false;
-            $usesSmartyLast = false;
-            $usesSmartyTotal = false;
-            $usesSmartyShow = false;
-        }
-
-        $usesPropFirst = $usesSmartyFirst || strpos($tpl->source->content, $ItemVarName . 'first') !== false;
-        $usesPropLast = $usesSmartyLast || strpos($tpl->source->content, $ItemVarName . 'last') !== false;
-        $usesPropIndex = $usesPropFirst || strpos($tpl->source->content, $ItemVarName . 'index') !== false;
-        $usesPropIteration = $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'iteration') !== false;
-        $usesPropShow = strpos($tpl->source->content, $ItemVarName . 'show') !== false;
-        $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'total') !== false;
         // generate output code
-        $output = "<?php ";
-        $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
+        $output = "<?php\n";
+        $output .= "\$_from = $from;\n";
+        $output .= "if (!is_array(\$_from) && !is_object(\$_from)) {\n";
+        $output .= "settype(\$_from, 'array');\n";
+        $output .= "}\n";
+        foreach ($saveVars as $k => $code) {
+            $output .= "{$local}{$k} = {$code}\n";
         }
-        $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
-        if ($usesPropTotal) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
+        if (isset($itemAttr['show']) || isset($itemAttr['total']) || isset($namedAttr['total']) || isset($namedAttr['show']) || isset($itemAttr['last']) || isset($namedAttr['last'])) {
+            $output .= "{$local}total = \$_smarty_tpl->smarty->ext->_foreach->count(\$_from);\n";
         }
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
+        $output .= "{$itemVar} = new Smarty_Variable();\n";
+        if (isset($itemAttr['show'])) {
+            $output .= "{$itemVar}->show = ({$local}total > 0);\n";
         }
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
+        if (isset($itemAttr['total'])) {
+            $output .= "{$itemVar}->total= {$local}total;\n";
         }
-        if ($usesPropShow) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-        }
-        if ($has_name) {
-            if ($usesSmartyTotal) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n";
+        if ($this->isNamed) {
+            $prop = array();
+            if (isset($namedAttr['total'])) {
+                $prop['total'] = "'total' => {$local}total";
             }
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n";
+            if (isset($namedAttr['iteration'])) {
+                $prop['iteration'] = "'iteration' => 0";
             }
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n";
+            if (isset($namedAttr['index'])) {
+                $prop['index'] = "'index' => -1";
             }
-            if ($usesSmartyShow) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
+            if (isset($namedAttr['show'])) {
+                $prop['show'] = "'show' => ({$local}total > 0)";
+            }
+            if (!empty($namedAttr)) {
+                $_vars = 'array(' . join(', ', $prop) . ')';
+                $output .= "{$foreachVar} = new Smarty_Variable({$_vars});\n";
             }
         }
-        $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
+        if (isset($attributes['key'])) {
+            $output .= "\$_smarty_tpl->tpl_vars['{$key}'] = new Smarty_Variable();\n";
         }
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
+        if (isset($namedAttr['first']) || isset($itemAttr['first'])) {
+            $output .= "{$local}first = true;\n";
         }
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n";
+        if (isset($itemAttr['iteration'])) {
+            $output .= "{$itemVar}->iteration=0;\n";
         }
-        if ($usesPropFirst) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n";
+        if (isset($itemAttr['index'])) {
+            $output .= "{$itemVar}->index=-1;\n";
         }
-        if ($usesPropLast) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n";
+        if ($needIteration) {
+            $output .= "{$local}iteration=0;\n";
         }
-        if ($has_name) {
-            if ($usesSmartyFirst) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n";
+        $output .= "{$itemVar}->_loop = false;\n";
+        $output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
+        $output .= "{$itemVar}->_loop = true;\n";
+        if (isset($attributes['key']) && isset($itemAttr['key'])) {
+            $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
+        }
+        if (isset($itemAttr['iteration'])) {
+            $output .= "{$itemVar}->iteration++;\n";
+        }
+        if (isset($itemAttr['index'])) {
+            $output .= "{$itemVar}->index++;\n";
+        }
+        if ($needIteration) {
+            $output .= "{$local}iteration++;\n";
+        }
+        if (isset($itemAttr['first'])) {
+            $output .= "{$itemVar}->first = {$local}first;\n";
+        }
+        if (isset($itemAttr['last'])) {
+            $output .= "{$itemVar}->last = {$local}iteration == {$local}total;\n";
+        }
+        if ($this->isNamed) {
+            if (isset($namedAttr['iteration'])) {
+                $output .= "{$foreachVar}->value['iteration']++;\n";
             }
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n";
+            if (isset($namedAttr['index'])) {
+                $output .= "{$foreachVar}->value['index']++;\n";
             }
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n";
+            if (isset($namedAttr['first'])) {
+                $output .= "{$foreachVar}->value['first'] = {$local}first;\n";
             }
-            if ($usesSmartyLast) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n";
+            if (isset($namedAttr['last'])) {
+                $output .= "{$foreachVar}->value['last'] = {$local}iteration == {$local}total;\n";
             }
         }
+        if (isset($namedAttr['first']) || isset($itemAttr['first'])) {
+            $output .= "{$local}first = false;\n";
+        }
+        $output .= "{$local}saved_local_item = {$itemVar};\n";
         $output .= "?>";
 
         return $output;
@@ -170,62 +275,73 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
 /**
  * Smarty Internal Plugin Compile Foreachelse Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {foreachelse} tag
      *
-     * @param array  $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        list($openTag, $nocache, $item, $key) = $this->closeTag($compiler, array('foreach'));
-        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key));
-
-        return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
+        list($openTag, $nocache, $local, $restoreVars, $itemVar, $foo) = $this->closeTag($compiler, array('foreach'));
+        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $restoreVars, $itemVar, false));
+        $output = "<?php\n";
+        $output .= "{$itemVar} = {$local}saved_local_item;\n";
+        $output .= "}\n";
+        $output .= "if (!{$itemVar}->_loop) {\n?>";
+        return $output;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Foreachclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/foreach} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->loopNesting --;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
 
-        list($openTag, $compiler->nocache, $item, $key) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        list($openTag, $compiler->nocache, $local, $restoreVars, $itemVar, $restore) =
+            $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        $output = "<?php\n";
 
-        return "<?php } ?>";
+        if ($restore) {
+            $output .= "{$itemVar} = {$local}saved_local_item;\n";
+        }
+        $output .= "}\n";
+        foreach ($restoreVars as $restore) {
+            $output .= $restore;
+        }
+        $output .= "?>";
+
+        return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_function.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_function.php
index 7821d20..28f3359 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_function.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_function.php
@@ -1,21 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function
- *
  * Compiles the {function} {/function} tags
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
+{
 
     /**
      * Attribute definition: Overwrites base class.
@@ -24,6 +24,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +32,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -42,125 +44,167 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {function} tag
      *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return boolean true
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return bool true
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         unset($_attr['nocache']);
-        $save = array($_attr, $compiler->parser->current_buffer,
-            $compiler->template->has_nocache_code, $compiler->template->required_plugins);
-        $this->openTag($compiler, 'function', $save);
         $_name = trim($_attr['name'], "'\"");
-        unset($_attr['name']);
-        // set flag that we are compiling a template function
-        $compiler->compiles_template_function = true;
-        $compiler->template->properties['function'][$_name]['parameter'] = array();
-        $_smarty_tpl = $compiler->template;
-        foreach ($_attr as $_key => $_data) {
-            eval ('$tmp='.$_data.';');
-            $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp;
-        }
-        $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter'];
-        if ($compiler->template->caching) {
-            $output = '';
-        } else {
-            $output = "<?php if (!function_exists('smarty_template_function_{$_name}')) {
-    function smarty_template_function_{$_name}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-        }
-        // Init temporay context
-        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
-        $compiler->template->has_nocache_code = false;
-        $compiler->has_code = false;
-        $compiler->template->properties['function'][$_name]['compiled'] = '';
+        $compiler->parent_compiler->tpl_function[$_name] = $compiler->parent_compiler->template->tpl_function[$_name] = array();
+        $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
+                      $compiler->template->caching);
+        $this->openTag($compiler, 'function', $save);
+        // Init temporary context
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
         return true;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Functionclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
+{
+
+    /**
+     * Compiler object
+     *
+     * @var object
+     */
+    private $compiler = null;
 
     /**
      * Compiles code for the {/function} tag
      *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return boolean true
+     * @param  array                                       $args      array with attributes from parser
+     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     *
+     * @return bool true
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->loopNesting--;
+        $this->compiler = $compiler;
         $saved_data = $this->closeTag($compiler, array('function'));
-        $_name = trim($saved_data[0]['name'], "'\"");
-        // build plugin include code
-        $plugins_string = '';
-        if (!empty($compiler->template->required_plugins['compiled'])) {
-            $plugins_string = '<?php ';
-            foreach($compiler->template->required_plugins['compiled'] as $tmp) {
-                foreach($tmp as $data) {
-                    $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
-                }
+        $_attr = $saved_data[0];
+        $_name = trim($_attr['name'], "'\"");
+        $compiler->parent_compiler->tpl_function[$_name]['called_functions'] = $compiler->parent_compiler->template->tpl_function[$_name]['called_functions'] = $compiler->called_functions;
+        $compiler->parent_compiler->tpl_function[$_name]['compiled_filepath'] = $compiler->parent_compiler->template->tpl_function[$_name]['compiled_filepath'] = $compiler->parent_compiler->template->compiled->filepath;
+        $compiler->parent_compiler->tpl_function[$_name]['uid'] = $compiler->parent_compiler->template->tpl_function[$_name]['uid'] = $compiler->template->source->uid;
+        $compiler->called_functions = array();
+        $_parameter = $_attr;
+        unset($_parameter['name']);
+        // default parameter
+        $_paramsArray = array();
+        foreach ($_parameter as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
             }
-            $plugins_string .= '?>';
         }
-        if (!empty($compiler->template->required_plugins['nocache'])) {
-            $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-            foreach($compiler->template->required_plugins['nocache'] as $tmp) {
-                foreach($tmp as $data) {
-                    $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
-                }
-            }
-            $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
-        }
-         // remove last line break from function definition
-         $last = count($compiler->parser->current_buffer->subtrees) - 1;
-         if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) {
-             unset($compiler->parser->current_buffer->subtrees[$last]);
-         }
-        // if caching save template function for possible nocache call
-        if ($compiler->template->caching) {
-            $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
-             . $compiler->parser->current_buffer->to_smarty_php();
-            $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-            $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code;
-            $compiler->template->properties['function'][$_name]['called_functions'] = $compiler->called_functions;
-            $compiler->called_functions = array();
-            $compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name];
-            $compiler->has_code = false;
-            $output = true;
+        if (!empty($_paramsArray)) {
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
         } else {
-            $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;
-foreach (Smarty::\$global_tpl_vars as \$key => \$value) if(!isset(\$_smarty_tpl->tpl_vars[\$key])) \$_smarty_tpl->tpl_vars[\$key] = \$value;}}?>\n";
+            $_paramsCode = '';
         }
-        // reset flag that we are compiling a template function
-        $compiler->compiles_template_function = false;
-        // restore old compiler status
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+
+        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
+        $_funcNameCaching = $_funcName . '_nocache';
+        if ($compiler->template->compiled->has_nocache_code) {
+            $compiler->parent_compiler->tpl_function[$_name]['call_name_caching'] = $compiler->parent_compiler->template->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
+            $output = "<?php\n";
+            $output .= "/* {$_funcNameCaching} */\n";
+            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+            $output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
+            $output .= "ob_start();\n";
+            $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
+            $output .= $_paramsCode;
+            $output .= "\$_smarty_tpl->_cache['saved_tpl_vars'][] = \$_smarty_tpl->tpl_vars;\n";
+            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value);\n}";
+            $output .= "\$params = var_export(\$params, true);\n";
+            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "\\\$saved_tpl_vars = \\\$_smarty_tpl->tpl_vars;\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value);\n}\n?>";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "foreach (Smarty::\\\$global_tpl_vars as \\\$key => \\\$value){\n";
+            $output .= "if (!isset(\\\$_smarty_tpl->tpl_vars[\\\$key]) || \\\$_smarty_tpl->tpl_vars[\\\$key] === \\\$value) \\\$saved_tpl_vars[\\\$key] = \\\$value;\n}\n";
+            $output .= "\\\$_smarty_tpl->tpl_vars = \\\$saved_tpl_vars;?>\n";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
+            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
+            $output .= "\$_smarty_tpl->tpl_vars = array_pop(\$_smarty_tpl->_cache['saved_tpl_vars']);\n}\n}\n";
+            $output .= "/*/ {$_funcName}_nocache */\n\n";
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser, preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/", array($this,
+                                                                                                                                                                                                                                                                                                          'removeNocache'), $_functionCode->to_smarty_php($compiler->parser)));
+        }
+        $compiler->parent_compiler->tpl_function[$_name]['call_name'] = $compiler->parent_compiler->template->tpl_function[$_name]['call_name'] = $_funcName;
+        $output = "<?php\n";
+        $output .= "/* {$_funcName} */\n";
+        $output .= "if (!function_exists('{$_funcName}')) {\n";
+        $output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
+        $output .= "\$saved_tpl_vars = \$_smarty_tpl->tpl_vars;\n";
+        $output .= $_paramsCode;
+        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value);\n}?>";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php foreach (Smarty::\$global_tpl_vars as \$key => \$value){\n";
+        $output .= "if (!isset(\$_smarty_tpl->tpl_vars[\$key]) || \$_smarty_tpl->tpl_vars[\$key] === \$value) \$saved_tpl_vars[\$key] = \$value;\n}\n";
+        $output .= "\$_smarty_tpl->tpl_vars = \$saved_tpl_vars;\n}\n}\n";
+        $output .= "/*/ {$_funcName} */\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+        $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        // nocache plugins must be copied
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
+                foreach ($tmp as $type => $data) {
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] = $data;
+                }
+            }
+        }
+        // restore old buffer
+
         $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
-        $compiler->template->required_plugins = $saved_data[3];
-        return $output;
+        // restore old status
+        $compiler->template->compiled->has_nocache_code = $saved_data[2];
+        $compiler->template->caching = $saved_data[3];
+        return true;
     }
 
+    /**
+     * @param $match
+     *
+     * @return mixed
+     */
+    function removeNocache($match)
+    {
+        $code = preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/", '', $match[0]);
+        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+        return $code;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_if.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_if.php
index 8794b01..541e218 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_if.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_if.php
@@ -1,31 +1,32 @@
 <?php
 /**
-* Smarty Internal Plugin Compile If
-*
-* Compiles the {if} {else} {elseif} {/if} tags
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Compile If
+ * Compiles the {if} {else} {elseif} {/if} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile If Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile If Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {if} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {if} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -33,8 +34,8 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
         // must whole block be nocache ?
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing if condition", $compiler->lex->taglineno);
+        if (!array_key_exists("if condition", $parameter)) {
+            $compiler->trigger_template_error("missing if condition", null, true);
         }
 
         if (is_array($parameter['if condition'])) {
@@ -42,79 +43,94 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var'], "'");
+                }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
+                } else {
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
             }
             if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
-                $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
+                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] .
+                    "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] .
+                    "]->value)) \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " . $parameter['if condition']['var']['var'] .
+                    "$_nocache);\n";
+                $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                    $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                    $parameter['if condition']['value'] . ") {?>";
             } else {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."])) \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(null{$_nocache});";
-                $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
+                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "] = new Smarty_Variable(null{$_nocache});";
+                $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                    $parameter['if condition']['value'] . ") {?>";
             }
+
             return $_output;
         } else {
-            return "<?php if ({$parameter['if condition']}){?>";
+            return "<?php if ({$parameter['if condition']}) {?>";
         }
     }
-
 }
 
 /**
-* Smarty Internal Plugin Compile Else Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile Else Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {else} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {else} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
         $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
 
-        return "<?php }else{ ?>";
+        return "<?php } else { ?>";
     }
-
 }
 
 /**
-* Smarty Internal Plugin Compile ElseIf Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile ElseIf Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {elseif} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {elseif} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
 
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing elseif condition", $compiler->lex->taglineno);
+        if (!array_key_exists("if condition", $parameter)) {
+            $compiler->trigger_template_error("missing elseif condition", null, true);
         }
 
         if (is_array($parameter['if condition'])) {
@@ -123,9 +139,14 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var'], "'");
+                }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
+                } else {
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
@@ -138,57 +159,83 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
             if ($condition_by_assign) {
                 $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
                 if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
+                    $_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" .
+                        $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" .
+                        $parameter['if condition']['var']['var'] .
+                        "]->value)) \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " .
+                        $parameter['if condition']['var']['var'] . "$_nocache);\n";
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                        $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                        $parameter['if condition']['value'] . ") {?>";
                 } else {
-                    $_output = "<?php  }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
+                    $_output = "<?php  } else { if (!isset(\$_smarty_tpl->tpl_vars[" .
+                        $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" .
+                        $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                        $parameter['if condition']['value'] . ") {?>";
                 }
+
                 return $_output;
             } else {
                 $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
-                return "<?php }elseif({$parameter['if condition']}){?>";
+
+                return "<?php } elseif ({$parameter['if condition']}) {?>";
             }
         } else {
             $tmp = '';
-            foreach ($compiler->prefix_code as $code)
-            $tmp .= $code;
+            foreach ($compiler->prefix_code as $code) {
+                $tmp = $compiler->appendCode($tmp, $code);
+            }
             $compiler->prefix_code = array();
+            $tmp = $compiler->appendCode("<?php } else {?>", $tmp);
             $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
             if ($condition_by_assign) {
                 if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php }else{?>{$tmp}<?php  if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
+                    $_output = $compiler->appendCode($tmp, "<?php  if (!isset(\$_smarty_tpl->tpl_vars[" .
+                                                         $parameter['if condition']['var']['var'] .
+                                                         "]) || !is_array(\$_smarty_tpl->tpl_vars[" .
+                                                         $parameter['if condition']['var']['var'] .
+                                                         "]->value)) \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " .
+                                                         $parameter['if condition']['var']['var'] . "$_nocache);\n");
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                        $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                        $parameter['if condition']['value'] . ") {?>";
                 } else {
-                    $_output = "<?php }else{?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
+                    $_output = $compiler->appendCode($tmp, "<?php if (!isset(\$_smarty_tpl->tpl_vars[" .
+                                                         $parameter['if condition']['var'] .
+                                                         "])) \$_smarty_tpl->tpl_vars[" .
+                                                         $parameter['if condition']['var'] .
+                                                         "] = new Smarty_Variable(null{$_nocache});");
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                        $parameter['if condition']['value'] . ") {?>";
                 }
+
                 return $_output;
             } else {
-                return "<?php }else{?>{$tmp}<?php if ({$parameter['if condition']}){?>";
+                return $compiler->appendCode($tmp, "<?php if ({$parameter['if condition']}) {?>");
             }
         }
     }
-
 }
 
 /**
-* Smarty Internal Plugin Compile Ifclose Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
-
+ * Smarty Internal Plugin Compile Ifclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
+{
     /**
-    * Compiles code for the {/if} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for the {/if} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // must endblock be nocache?
         if ($compiler->nocache) {
@@ -196,12 +243,10 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
         }
         list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
         $tmp = '';
-        for ($i = 0; $i < $nesting; $i++) {
+        for ($i = 0; $i < $nesting; $i ++) {
             $tmp .= '}';
         }
+
         return "<?php {$tmp}?>";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_include.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_include.php
index 43a144f..09fa11d 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_include.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_include.php
@@ -1,110 +1,213 @@
 <?php
 /**
-* Smarty Internal Plugin Compile Include
-*
-* Compiles the {include} tag
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Compile Include
+ * Compiles the {include} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile Include Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
+ * Smarty Internal Plugin Compile Include Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
+{
+    /**
+     * caching mode to create nocache code but no cache file
+     */
+    const CACHING_NOCACHE_CODE = 9999;
 
     /**
-    * caching mode to create nocache code but no cache file
-    */
-    const CACHING_NOCACHE_CODE = 9999;
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $required_attributes = array('file');
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $shorttag_order = array('file');
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $option_flags = array('nocache', 'inline', 'caching');
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'inline', 'caching', 'bubble_up');
+
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $optional_attributes = array('_any');
 
     /**
-    * Compiles code for the {include} tag
-    *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
+
+    /**
+     * Compiles code for the {include} tag
+     *
+     * @param  array                                  $args      array with attributes from parser
+     * @param  Smarty_Internal_SmartyTemplateCompiler $compiler  compiler object
+     * @param  array                                  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        // save posible attributes
-        $include_file = $_attr['file'];
+
+        $hashResourceName = $fullResourceName = $source_resource = $_attr['file'];
+        $variable_template = false;
+        $cache_tpl = false;
+        // parse resource_name
+        if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
+            $type = !empty($match[3]) ? $match[3] : $compiler->template->smarty->default_resource_type;
+            $name = !empty($match[5]) ? $match[5] : $match[6];
+            $handler = Smarty_Resource::load($compiler->smarty, $type);
+            if ($handler->recompiled || $handler->uncompiled) {
+                $variable_template = true;
+            }
+            if (!$variable_template) {
+                if ($type != 'string') {
+                    $fullResourceName = "{$type}:{$name}";
+                    $compiled = $compiler->parent_compiler->template->compiled;
+                    if (isset($compiled->includes[$fullResourceName])) {
+                        $compiled->includes[$fullResourceName] ++;
+                        $cache_tpl = true;
+                    } else {
+                        $compiled->includes[$fullResourceName] = 1;
+                    }
+                    $fullResourceName = '"' . $fullResourceName . '"';
+                }
+            }
+            if (empty($match[5])) {
+                $variable_template = true;
+            }
+        } else {
+            $variable_template = true;
+        }
 
         if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
+            // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
         }
 
-        $_parent_scope = Smarty::SCOPE_LOCAL;
+        // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_parent_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_parent_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_parent_scope = Smarty::SCOPE_GLOBAL;
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                if ($_attr['bubble_up'] === true) {
+                    $_scope = $_scope + Smarty::SCOPE_BUBBLE_UP;
+                }
             }
         }
-        $_caching = 'null';
-        if ($compiler->nocache || $compiler->tag_nocache) {
-            $_caching = Smarty::CACHING_OFF;
+
+        // set flag to cache subtemplate object when called within loop or template name is variable.
+        if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
+            $_cache_tpl = 'true';
+        } else {
+            $_cache_tpl = 'false';
         }
-        // default for included templates
+        // assume caching is off
+        $_caching = Smarty::CACHING_OFF;
+
+        if ($_attr['nocache'] === true) {
+            $compiler->tag_nocache = true;
+        }
+
+        $call_nocache = $compiler->tag_nocache || $compiler->nocache;
+
+        // caching was on and {include} is not in nocache mode
         if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
             $_caching = self::CACHING_NOCACHE_CODE;
         }
+
+        // flag if included template code should be merged into caller
+        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) &&
+            !$compiler->template->source->handler->recompiled;
+
+        if ($merge_compiled_includes && $_attr['inline'] !== true) {
+            // variable template name ?
+            if ($variable_template) {
+                $merge_compiled_includes = false;
+                if ($compiler->template->caching) {
+                    // must use individual cache file
+                    //$_attr['caching'] = 1;
+                }
+            }
+            // variable compile_id?
+            if (isset($_attr['compile_id'])) {
+                if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2 ||
+                        is_numeric($_attr['compile_id']))) || substr_count($_attr['compile_id'], '(') != 0 ||
+                    substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0
+                ) {
+                    $merge_compiled_includes = false;
+                    if ($compiler->template->caching) {
+                        // must use individual cache file
+                        //$_attr['caching'] = 1;
+                    }
+                }
+            }
+        }
+
         /*
-        * if the {include} tag provides individual parameter for caching
-        * it will not be included into the common cache file and treated like
-        * a nocache section
+        * if the {include} tag provides individual parameter for caching or compile_id
+        * the subtemplate must not be included into the common cache file and is treated like
+        * a call in nocache mode.
+        *
         */
+        if ($_attr['nocache'] !== true && $_attr['caching']) {
+            $_caching = $_new_caching = (int) $_attr['caching'];
+            $call_nocache = true;
+        } else {
+            $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
         if (isset($_attr['cache_lifetime'])) {
             $_cache_lifetime = $_attr['cache_lifetime'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $call_nocache = true;
+            $_caching = $_new_caching;
         } else {
-            $_cache_lifetime = 'null';
+            $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
         }
         if (isset($_attr['cache_id'])) {
             $_cache_id = $_attr['cache_id'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $call_nocache = true;
+            $_caching = $_new_caching;
         } else {
             $_cache_id = '$_smarty_tpl->cache_id';
         }
@@ -113,103 +216,151 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
         } else {
             $_compile_id = '$_smarty_tpl->compile_id';
         }
-        if ($_attr['caching'] === true) {
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_OFF;
+
+        // if subtemplate will be called in nocache mode do not merge
+        if ($compiler->template->caching && $call_nocache) {
+            $merge_compiled_includes = false;
         }
 
         $has_compiled_template = false;
-        if (($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled
-            && !($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache)) && $_caching != Smarty::CACHING_LIFETIME_CURRENT) {
-            // check if compiled code can be merged (contains no variable part)
-            if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2)
-               and substr_count($include_file, '(') == 0 and substr_count($include_file, '$_smarty_tpl->') == 0) {
-                $tpl_name = null;
-                eval("\$tpl_name = $include_file;");
-                if (!isset($compiler->smarty->merged_templates_func[$tpl_name]) || $compiler->inheritance) {
-                    $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
-                    // save unique function name
-                    $compiler->smarty->merged_templates_func[$tpl_name]['func'] = $tpl->properties['unifunc'] = 'content_'. str_replace('.', '_', uniqid('', true));
-                    // use current nocache hash for inlined code
-                    $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-                    if ($compiler->template->caching) {
-                        // needs code for cached page but no cache file
-                        $tpl->caching = self::CACHING_NOCACHE_CODE;
-                    }
-                    // make sure whole chain gest compiled
-                    $tpl->mustCompile = true;
-                    if (!($tpl->source->uncompiled) && $tpl->source->exists) {
-                        // get compiled code
-                        $compiled_code = $tpl->compiler->compileTemplate($tpl);
-                        // release compiler object to free memory
-                        unset($tpl->compiler);
-                        // merge compiled code for {function} tags
-                        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
-                        // merge filedependency
-                        $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp,$tpl->source->type);
-                        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
-                        // remove header code
-                        $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
-                        if ($tpl->has_nocache_code) {
-                            // replace nocache_hash
-                            $compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
-                            $compiler->template->has_nocache_code = true;
-                        }
-                        $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
-                        $has_compiled_template = true;
-                    }
-                } else {
-                    $has_compiled_template = true;
-                }
+        if ($merge_compiled_includes) {
+            $c_id = isset($_attr['compile_id']) ? $_attr['compile_id'] : $compiler->template->compile_id;
+            // we must observe different compile_id and caching
+            $t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
+            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash])) {
+                $has_compiled_template =
+                    $this->compileInlineTemplate($compiler, $fullResourceName, $_caching, $hashResourceName, $t_hash,
+                                                 $c_id);
+            } else {
+                $has_compiled_template = true;
             }
         }
         // delete {include} standard attributes
-        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
+        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline'], $_attr['bubble_up']);
         // remaining attributes must be assigned as smarty variable
+        $_vars_nc = '';
         if (!empty($_attr)) {
-            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
+            if ($_scope == Smarty::SCOPE_LOCAL) {
+                $_pairs = array();
                 // create variables
                 foreach ($_attr as $key => $value) {
                     $_pairs[] = "'$key'=>$value";
+                    $_vars_nc .= "\$_smarty_tpl->tpl_vars['$key'] =  new Smarty_Variable($value);\n";
                 }
-                $_vars = 'array('.join(',',$_pairs).')';
-                $_has_vars = true;
+                $_vars = 'array(' . join(',', $_pairs) . ')';
             } else {
-                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', null, true);
             }
         } else {
             $_vars = 'array()';
-            $_has_vars = false;
         }
-        if ($has_compiled_template) {
-            $_hash = $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'];
-            $_output = "<?php /*  Call merged included template \"" . $tpl_name . "\" */\n";
-            $_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n";
-            $_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n";
-            if (isset($_assign)) {
-                $_output .= 'ob_start(); ';
+        $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
+            $_compile_id != '$_smarty_tpl->compile_id';
+        if ($has_compiled_template && !$call_nocache) {
+            $_output = "<?php\n";
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
             }
-            $_output .= $compiler->smarty->merged_templates_func[$tpl_name]['func']. "(\$_smarty_tpl);\n";
-            $_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); ";
-            if (isset($_assign)) {
-                $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());";
+            if (!empty($_vars_nc) && $_caching == 9999 && $compiler->template->caching) {
+                //$compiler->suppressNocacheProcessing = false;
+                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, - 3);
+                //$compiler->suppressNocacheProcessing = true;
             }
-            $_output .= "/*  End of included template \"" . $tpl_name . "\" */?>";
+            if (isset($_assign)) {
+                $_output .= "ob_start();\n";
+            }
+            $_output .= "\$_smarty_tpl->smarty->ext->_subtemplate->render(\$_smarty_tpl, {$fullResourceName}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_scope}, {$_cache_tpl}, '{$compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['uid']}', '{$compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['func']}');\n";
+            if (isset($_assign)) {
+                $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+            }
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
+            }
+            $_output .= "?>\n";
+
             return $_output;
         }
 
+        if ($call_nocache) {
+            $compiler->tag_nocache = true;
+        }
+        $_output = "<?php ";
+        if ($update_compile_id) {
+            $_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
+        }
         // was there an assign attribute
         if (isset($_assign)) {
-            $_output = "<?php \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";;
-        } else {
-            $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
+            $_output .= "ob_start();\n";
         }
+        $_output .= "\$_smarty_tpl->smarty->ext->_subtemplate->render(\$_smarty_tpl, {$fullResourceName}, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_scope, {$_cache_tpl});\n";
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        if ($update_compile_id) {
+            $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
+        }
+        $_output .= "?>\n";
         return $_output;
     }
 
+    /**
+     * Compile inline sub template
+     *
+     * @param \Smarty_Internal_SmartyTemplateCompiler $compiler
+     * @param                                         $fullResourceName
+     * @param                                         $_caching
+     * @param                                         $hashResourceName
+     * @param                                         $t_hash
+     * @param                                         $c_id
+     *
+     * @return bool
+     */
+    public function compileInlineTemplate(Smarty_Internal_SmartyTemplateCompiler $compiler, $fullResourceName,
+                                          $_caching, $hashResourceName, $t_hash, $c_id)
+    {
+        $compiler->smarty->allow_ambiguous_resources = true;
+        /* @var Smarty_Internal_Template $tpl */
+        $tpl =
+            new $compiler->smarty->template_class (trim($fullResourceName, '"\''), $compiler->smarty, $compiler->template,
+                                                   $compiler->template->cache_id, $c_id, $_caching);
+        if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['uid'] = $tpl->source->uid;
+            if (isset($compiler->template->_inheritance)) {
+                $tpl->_inheritance = clone $compiler->template->_inheritance;
+            }
+            $tpl->compiled = new Smarty_Template_Compiled();
+            $tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
+            $tpl->loadCompiler();
+            // save unique function name
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['func'] =
+            $tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+            // make sure whole chain gets compiled
+            $tpl->mustCompile = true;
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['nocache_hash'] =
+                $tpl->compiled->nocache_hash;
+            // get compiled code
+            $compiled_code = "<?php\n\n";
+            $compiled_code .= "/* Start inline template \"{$tpl->source->type}:{$tpl->source->name}\" =============================*/\n";
+            $compiled_code .= "function {$tpl->compiled->unifunc} (\$_smarty_tpl) {\n";
+            $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
+            $compiled_code .= "<?php\n";
+            $compiled_code .= "}\n?>\n";
+            $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
+            $compiled_code .= "<?php\n\n";
+            $compiled_code .= "/* End inline template \"{$tpl->source->type}:{$tpl->source->name}\" =============================*/\n";
+            $compiled_code .= "?>";
+            unset($tpl->compiler);
+            if ($tpl->compiled->has_nocache_code) {
+                // replace nocache_hash
+                $compiled_code =
+                    str_replace("{$tpl->compiled->nocache_hash}", $compiler->template->compiled->nocache_hash,
+                                $compiled_code);
+                $compiler->template->compiled->has_nocache_code = true;
+            }
+            $compiler->parent_compiler->mergedSubTemplatesCode[$tpl->compiled->unifunc] = $compiled_code;
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
index d527123..e7e6299 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Include PHP
- *
  * Compiles the {include_php} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +31,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -42,11 +43,14 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {include_php} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         if (!($compiler->smarty instanceof SmartyBC)) {
             throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
@@ -54,13 +58,15 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        $_output = '<?php ';
-
+        /** @var Smarty_Internal_Template $_smarty_tpl
+         * used in evaluated code
+         */
         $_smarty_tpl = $compiler->template;
         $_filepath = false;
-        eval('$_file = ' . $_attr['file'] . ';');
+        $_file = null;
+        eval('$_file = @' . $_attr['file'] . ';');
         if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
-            $_filepath = $_file;
+            $_filepath = $compiler->smarty->_realpath($_file, true);
         } else {
             if (isset($compiler->smarty->security_policy)) {
                 $_dir = $compiler->smarty->security_policy->trusted_dir;
@@ -68,17 +74,17 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
                 $_dir = $compiler->smarty->trusted_dir;
             }
             if (!empty($_dir)) {
-                foreach((array)$_dir as $_script_dir) {
-                    $_script_dir = rtrim($_script_dir, '/\\') . DS;
-                    if (file_exists($_script_dir . $_file)) {
-                        $_filepath = $_script_dir .  $_file;
+                foreach ((array) $_dir as $_script_dir) {
+                    $_path = $compiler->smarty->_realpath($_script_dir . DS . $_file, true);
+                    if (file_exists($_path)) {
+                        $_filepath = $_path;
                         break;
                     }
                 }
             }
         }
         if ($_filepath == false) {
-            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
         }
 
         if (isset($compiler->smarty->security_policy)) {
@@ -97,12 +103,9 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
         }
 
         if (isset($_assign)) {
-            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
+            return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
         } else {
             return "<?php include{$_once} ('{$_filepath}');?>\n";
         }
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php
index e4d3f93..2ebde16 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_insert.php
@@ -2,22 +2,21 @@
 
 /**
  * Smarty Internal Plugin Compile Insert
- *
  * Compiles the {insert} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -25,6 +24,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -32,6 +32,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -43,36 +44,46 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {insert} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        // never compile as nocache code
-        $compiler->suppressNocacheProcessing = true;
+        $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
+        if (!$nocacheParam) {
+            // do not compile as nocache code
+            $compiler->suppressNocacheProcessing = true;
+        }
         $compiler->tag_nocache = true;
         $_smarty_tpl = $compiler->template;
         $_name = null;
         $_script = null;
 
         $_output = '<?php ';
-        // save posible attributes
-        eval('$_name = ' . $_attr['name'] . ';');
+        // save possible attributes
+        eval('$_name = @' . $_attr['name'] . ';');
         if (isset($_attr['assign'])) {
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
-            // create variable to make shure that the compiler knows about its nocache status
-            $compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
+            // create variable to make sure that the compiler knows about its nocache status
+            $var = trim($_attr['assign'], "'");
+            if (isset($compiler->template->tpl_vars[$var])) {
+                $compiler->template->tpl_vars[$var]->nocache = true;
+            } else {
+                $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
+            }
         }
         if (isset($_attr['script'])) {
             // script which must be included
             $_function = "smarty_insert_{$_name}";
             $_smarty_tpl = $compiler->template;
             $_filepath = false;
-            eval('$_script = ' . $_attr['script'] . ';');
+            eval('$_script = @' . $_attr['script'] . ';');
             if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
                 $_filepath = $_script;
             } else {
@@ -82,7 +93,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
                     $_dir = $compiler->smarty->trusted_dir;
                 }
                 if (!empty($_dir)) {
-                    foreach((array)$_dir as $_script_dir) {
+                    foreach ((array) $_dir as $_script_dir) {
                         $_script_dir = rtrim($_script_dir, '/\\') . DS;
                         if (file_exists($_script_dir . $_script)) {
                             $_filepath = $_script_dir . $_script;
@@ -92,13 +103,13 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
                 }
             }
             if ($_filepath == false) {
-                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true);
             }
             // code for script file loading
             $_output .= "require_once '{$_filepath}' ;";
             require_once $_filepath;
             if (!is_callable($_function)) {
-                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $compiler->lex->taglineno);
+                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", null, true);
             }
         } else {
             $_filepath = 'null';
@@ -107,7 +118,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
             if (!is_callable($_function)) {
                 // try plugin
                 if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $compiler->lex->taglineno);
+                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", null, true);
                 }
             }
         }
@@ -121,22 +132,20 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
         $_params = 'array(' . implode(", ", $_paramsArray) . ')';
         // call insert
         if (isset($_assign)) {
-            if ($_smarty_tpl->caching) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
                 $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
             } else {
                 $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
             }
         } else {
             $compiler->has_output = true;
-            if ($_smarty_tpl->caching) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
                 $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
             } else {
                 $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
             }
         }
+
         return $_output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
index 9906325..8c6b701 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
@@ -1,41 +1,40 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Ldelim
- *
  * Compiles the {ldelim} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Ldelim Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {ldelim} tag
-     *
      * This tag does output the left delimiter
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     *
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         // this tag does not return compiled code
         $compiler->has_code = true;
+
         return $compiler->smarty->left_delimiter;
     }
-
 }
-
-?>
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
index 5fb71b7..b29a993 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
@@ -1,73 +1,75 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Nocache
- *
  * Compiles the {nocache} {/nocache} tags.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
- * Smarty Internal Plugin Compile Nocache Classv
+ * Smarty Internal Plugin Compile Nocache Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
+class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
+{
+    /**
+     * Array of names of valid option flags
+     *
+     * @var array
+     */
+    public $option_flags = array();
 
     /**
      * Compiles code for the {nocache} tag
-     *
      * This tag does not generate compiled output. It only sets a compiler flag.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return bool
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
+        $this->openTag($compiler, 'nocache', array($compiler->nocache));
         // enter nocache mode
         $compiler->nocache = true;
         // this tag does not return compiled code
         $compiler->has_code = false;
+
         return true;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Nocacheclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/nocache} tag
-     *
      * This tag does not generate compiled output. It only sets a compiler flag.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return bool
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         // leave nocache mode
-        $compiler->nocache = false;
+        list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
         // this tag does not return compiled code
         $compiler->has_code = false;
+
         return true;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
index 5288f45..9e2eea2 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Block Plugin
- *
  * Compiles code for the execution of block plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Block Plugin Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,23 +27,24 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
     /**
      * Compiles code for the execution of block plugin
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block plugin
-     * @param string $function  PHP function name
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     * @param  string                               $tag       name of block plugin
+     * @param  string                               $function  PHP function name
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $function)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function)
     {
-        if (!isset($tag[5]) || substr($tag, -5) != 'close') {
+        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
             // check and get attributes
             $_attr = $this->getAttributes($compiler, $args);
             if ($_attr['nocache'] === true) {
                 $compiler->tag_nocache = true;
             }
-               unset($_attr['nocache']);
+            unset($_attr['nocache']);
             // convert attributes into parameter array string
             $_paramsArray = array();
             foreach ($_attr as $_key => $_value) {
@@ -60,28 +60,30 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
             // maybe nocache because of nocache variables or nocache plugin
             $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
             // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
         } else {
             // must endblock be nocache?
             if ($compiler->nocache) {
                 $compiler->tag_nocache = true;
             }
             // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, -5));
+            list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, - 5));
             // This tag does create output
             $compiler->has_output = true;
             // compile code
             if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post ='';
+                $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+                $mod_post = 'echo ' .
+                    $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'],
+                                                                             'value'        => 'ob_get_clean()')) . ';';
             }
-            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post .
+                " } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
         }
+
         return $output . "\n";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
new file mode 100644
index 0000000..16f2333
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile ForeachSection
+ * Shared methods for {foreach} {section} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile ForeachSection Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_CompileBase
+{
+
+    /**
+     * Preg search pattern
+     *
+     * @var string
+     */
+    private $propertyPreg = '';
+
+    /**
+     * Offsets in preg match result
+     *
+     * @var array
+     */
+    private $resultOffsets = array();
+
+    /**
+     * Start offset
+     *
+     * @var int
+     */
+    private $startOffset = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = '';
+
+    /**
+     * Valid properties of $smarty.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array();
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
+    /**
+     * @var array
+     */
+    public $matchResults = array();
+
+    /**
+     * Scan sources for used tag attributes
+     *
+     * @param  array                                $attributes
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->propertyPreg = '~(';
+        $this->startOffset = 0;
+        $this->resultOffsets = array();
+        $this->matchResults = array('named' => array(), 'item' => array());
+        if ($this->isNamed) {
+            $this->buildPropertyPreg(true, $attributes);
+        }
+        if (isset($this->itemProperties)) {
+            if ($this->isNamed) {
+                $this->propertyPreg .= '|';
+            }
+            $this->buildPropertyPreg(false, $attributes);
+        }
+        $this->propertyPreg .= ')\W~i';
+        // Template source
+        $this->matchTemplateSource($compiler);
+        // Parent template source
+        $this->matchParentTemplateSource($compiler);
+        // {block} source
+        $this->matchBlockSource($compiler);
+    }
+
+    /**
+     * Build property preg string
+     *
+     * @param bool  $named
+     * @param array $attributes
+     */
+    public function buildPropertyPreg($named, $attributes)
+    {
+        if ($named) {
+            $this->resultOffsets['named'] = $this->startOffset + 3;
+            $this->propertyPreg .= "([\$]smarty[.]{$this->tagName}[.]{$attributes['name']}[.](";
+            $properties = $this->nameProperties;
+        } else {
+            $this->resultOffsets['item'] = $this->startOffset + 3;
+            $this->propertyPreg .= "([\$]{$attributes['item']}[@](";
+            $properties = $this->itemProperties;
+        }
+        $this->startOffset += count($properties) + 2;
+        $propName = reset($properties);
+        while ($propName) {
+            $this->propertyPreg .= "({$propName})";
+            $propName = next($properties);
+            if ($propName) {
+                $this->propertyPreg .= '|';
+            }
+        }
+        $this->propertyPreg .= '))';
+    }
+
+    /**
+     * Find matches in source string
+     *
+     * @param string $source
+     */
+    public function matchProperty($source)
+    {
+        preg_match_all($this->propertyPreg, $source, $match, PREG_SET_ORDER);
+        foreach ($this->resultOffsets as $key => $offset) {
+            foreach ($match as $m) {
+                if (isset($m[$offset]) && !empty($m[$offset])) {
+                    $this->matchResults[$key][strtolower($m[$offset])] = true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->matchProperty($compiler->parser->lex->data);
+    }
+
+    /**
+     * Find matches in all parent template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // search parent compiler template source
+        $nextCompiler = $compiler;
+        while ($nextCompiler !== $nextCompiler->parent_compiler) {
+            $nextCompiler = $nextCompiler->parent_compiler;
+            if ($compiler !== $nextCompiler) {
+                // get template source
+                $_content = $nextCompiler->template->source->getContent();
+                if ($_content != '') {
+                    // run pre filter if required
+                    if ((isset($nextCompiler->smarty->autoload_filters['pre']) ||
+                            isset($nextCompiler->smarty->registered_filters['pre']))) {
+                        $_content = $nextCompiler->smarty->ext->_filter_Handler->runFilter('pre', $_content, $nextCompiler->template);
+                    }
+                    $this->matchProperty($_content);
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in {block} tag source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+
+    }
+
+    /**
+     * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
+     *
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $tag = strtolower(trim($parameter[ 0 ], '"\''));
+        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+        if (!$name) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+        }
+        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
+        if (!$property || !in_array($property, $this->nameProperties)) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
+        }
+        $tagVar = "'__smarty_{$tag}_{$name}'";
+        return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
index 70e7643..0d0ab81 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Function Plugin
- *
  * Compiles code for the execution of function plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Function Plugin Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array();
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -35,14 +35,15 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
     /**
      * Compiles code for the execution of function plugin
      *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of function plugin
-     * @param string $function PHP function name
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param  array  $parameter array with compilation parameter
+     * @param  string $tag       name of function plugin
+     * @param  string                               $function PHP function name
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $function)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase  $compiler, $parameter, $tag, $function)
     {
         // This tag does create output
         $compiler->has_output = true;
@@ -65,9 +66,7 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
         $_params = 'array(' . implode(",", $_paramsArray) . ')';
         // compile code
         $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
index a33109c..9594d2a 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
@@ -2,31 +2,33 @@
 
 /**
  * Smarty Internal Plugin Compile Modifier
- *
  * Compiles code for modifier execution
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Modifier Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for modifier execution
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter) {
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         $output = $parameter['value'];
@@ -51,7 +53,8 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                                 $output = "{$function}({$params})";
                             } else {
                                 if (is_object($function[0])) {
-                                    $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
+                                    $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' .
+                                        $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
                                 } else {
                                     $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
                                 }
@@ -72,7 +75,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // modifiercompiler plugin
                         if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 $plugin = 'smarty_modifiercompiler_' . $modifier;
                                 $output = $plugin($single_modifier, $compiler);
                             }
@@ -84,7 +89,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // modifier plugin
                         if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 $output = "{$function}({$params})";
                             }
                             $compiler->known_modifier_type[$modifier] = $type;
@@ -95,7 +102,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // PHP function
                         if (is_callable($modifier)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
+                            ) {
                                 $output = "{$modifier}({$params})";
                             }
                             $compiler->known_modifier_type[$modifier] = $type;
@@ -104,21 +113,29 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         break;
                     case 6:
                         // default plugin handler
-                        if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) || (is_callable($compiler->smarty->default_plugin_handler_func) && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))) {
+                        if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) ||
+                            (is_callable($compiler->smarty->default_plugin_handler_func) &&
+                                $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))
+                        ) {
                             $function = $compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 if (!is_array($function)) {
                                     $output = "{$function}({$params})";
                                 } else {
                                     if (is_object($function[0])) {
-                                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
+                                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' .
+                                            $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
                                     } else {
                                         $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
                                     }
                                 }
                             }
-                            if (isset($compiler->template->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) || isset($compiler->template->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])) {
+                            if (isset($compiler->parent_compiler->template->compiled->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) ||
+                                isset($compiler->parent_compiler->template->compiled->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])
+                            ) {
                                 // was a plugin
                                 $compiler->known_modifier_type[$modifier] = 4;
                             } else {
@@ -129,12 +146,10 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                 }
             }
             if (!isset($compiler->known_modifier_type[$modifier])) {
-                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", null, true);
             }
         }
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
index cca924d..d2bc5d6 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Object Block Function
- *
  * Compiles code for registered objects as block function
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Object Block Function Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,16 +27,17 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
     /**
      * Compiles code for the execution of block plugin
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block object
-     * @param string $method    name of method to call
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     * @param  string                               $tag       name of block object
+     * @param  string                               $method    name of method to call
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $method)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
     {
-        if (!isset($tag[5]) || substr($tag, -5) != 'close') {
+        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
             // check and get attributes
             $_attr = $this->getAttributes($compiler, $args);
@@ -60,9 +60,10 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
             // maybe nocache because of nocache variables or nocache plugin
             $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
             // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            $output =
+                "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
         } else {
-            $base_tag = substr($tag, 0, -5);
+            $base_tag = substr($tag, 0, - 5);
             // must endblock be nocache?
             if ($compiler->nocache) {
                 $compiler->tag_nocache = true;
@@ -76,13 +77,15 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
                 $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
+                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(),
+                                                            array('modifierlist' => $parameter['modifier_list'],
+                                                                  'value'        => 'ob_get_clean()')) . ';';
             }
-            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
         }
+
         return $output . "\n";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
index f649084..e306e0f 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
@@ -1,22 +1,21 @@
 <?php
 /**
- * Smarty Internal Plugin Compile Object Funtion
- *
+ * Smarty Internal Plugin Compile Object Function
  * Compiles code for registered objects as function
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Object Function Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,14 +27,15 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
     /**
      * Compiles code for the execution of function plugin
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of function
-     * @param string $method    name of method to call
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of function
+     * @param  string                                      $method    name of method to call
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $method)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -48,22 +48,29 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
             $_assign = $_attr['assign'];
             unset($_attr['assign']);
         }
-        // convert attributes into parameter array string
-        if ($compiler->smarty->registered_objects[$tag][2]) {
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
+        // method or property ?
+        if (method_exists($compiler->smarty->registered_objects[$tag][0], $method)) {
+            // convert attributes into parameter array string
+            if ($compiler->smarty->registered_objects[$tag][2]) {
+                $_paramsArray = array();
+                foreach ($_attr as $_key => $_value) {
+                    if (is_int($_key)) {
+                        $_paramsArray[] = "$_key=>$_value";
+                    } else {
+                        $_paramsArray[] = "'$_key'=>$_value";
+                    }
                 }
+                $_params = 'array(' . implode(",", $_paramsArray) . ')';
+                $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
+            } else {
+                $_params = implode(",", $_attr);
+                $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
             }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
         } else {
-            $_params = implode(",", $_attr);
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
+            // object property
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
         }
+
         if (empty($_assign)) {
             // This tag does create output
             $compiler->has_output = true;
@@ -71,9 +78,7 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
         } else {
             $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
         }
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_php.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_php.php
new file mode 100644
index 0000000..3ca63a5
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_php.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile PHP Expression
+ * Compiles any tag which will output an expression or variable
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile PHP Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
+{
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('code', 'type');
+
+    /**
+     * Compiles code for generating output from any expression
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->has_code = false;
+        if ($_attr['type'] == 'xml') {
+            $compiler->tag_nocache = true;
+            $save = $compiler->template->compiled->has_nocache_code;
+            $output = addcslashes($_attr['code'], "'\\");
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" .
+                                                                                                                                                                    $output .
+                                                                                                                                                                    "';?>", $compiler, true)));
+            $compiler->template->compiled->has_nocache_code = $save;
+            return '';
+        }
+        if ($_attr['type'] != 'tag') {
+            if ($compiler->php_handling == Smarty::PHP_REMOVE) {
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
+                $output = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i', array($this,
+                                                                                                                                                              'quote'), $_attr['code']);
+                $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Text($output));
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr['type'] == 'unmatched') {
+                $compiler->tag_nocache = true;
+                $save = $compiler->template->compiled->has_nocache_code;
+                $output = addcslashes($_attr['code'], "'\\");
+                $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" .
+                                                                                                                                                                        $output .
+                                                                                                                                                                        "';?>", $compiler, true)));
+                $compiler->template->compiled->has_nocache_code = $save;
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
+                if (!($compiler->smarty instanceof SmartyBC)) {
+                    $compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it', null, true);
+                }
+                $compiler->has_code = true;
+                return $_attr['code'];
+            } else {
+                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
+            }
+        } else {
+            $compiler->has_code = true;
+            if (!($compiler->smarty instanceof SmartyBC)) {
+                $compiler->trigger_template_error('{php}{/php} tags not allowed. Use SmartyBC to enable them', null, true);
+            }
+            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
+            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
+            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr['code'], $match);
+            if (!empty($match[2])) {
+                if ('nocache' == trim($match[2])) {
+                    $compiler->tag_nocache = true;
+                } else {
+                    $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
+                }
+            }
+            return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#",
+                                      "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"), array('<?php ', '?>'), $_attr['code']);
+        }
+    }
+
+    /**
+     * Lexer code for PHP tags
+     *
+     * This code has been moved from lexer here fo easier debugging and maintenance
+     *
+     * @param $lex
+     */
+    public function parsePhp($lex)
+    {
+        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
+        $close = 0;
+        $lex->taglineno = $lex->line;
+        $closeTag = '?>';
+        if (strpos($lex->value, '<?xml') === 0) {
+            $lex->is_xml = true;
+            $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+            return;
+        } elseif (strpos($lex->value, '<?') === 0) {
+            $lex->phpType = 'php';
+        } elseif (strpos($lex->value, '<%') === 0) {
+            $lex->phpType = 'asp';
+            $closeTag = '%>';
+        } elseif (strpos($lex->value, '%>') === 0) {
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '?>') === 0) {
+            if ($lex->is_xml) {
+                $lex->is_xml = false;
+                $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+                return;
+            }
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '<s') === 0) {
+            $lex->phpType = 'script';
+            $closeTag = '</script>';
+        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
+            if ($lex->isAutoLiteral()) {
+                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
+                return;
+            }
+            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
+            if ($lex->value == $closeTag) {
+                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
+            }
+            $lex->phpType = 'tag';
+        }
+        if ($lex->phpType == 'unmatched') {
+            return;
+        }
+        if (($lex->phpType == 'php' || $lex->phpType == 'asp') &&
+            ($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)
+        ) {
+            return;
+        }
+        $start = $lex->counter + strlen($lex->value);
+        $body = true;
+        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+            $close = $match[0][1];
+        } else {
+            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+        }
+        while ($body) {
+            if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+                $value = $match[0][0];
+                $from = $pos = $match[0][1];
+                if ($pos > $close) {
+                    $body = false;
+                } else {
+                    $start = $pos + strlen($value);
+                    $phpCommentStart = $value == '/*';
+                    if ($phpCommentStart) {
+                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
+                        if ($phpCommentEnd) {
+                            $pos2 = $match[0][1];
+                            $start = $pos2 + strlen($match[0][0]);
+                        }
+                    }
+                    while ($close > $pos && $close < $start) {
+                        if (preg_match('~' . preg_quote($closeTag, '~') .
+                                       '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $from)) {
+                            $close = $match[0][1];
+                            $from = $close + strlen($match[0][0]);
+                        } else {
+                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+                        }
+                    }
+                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
+                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
+                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
+                    }
+                }
+            } else {
+                $body = false;
+            }
+        }
+        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
+    }
+
+    /*
+     * Call back function for $php_handling = PHP_QUOTE
+     *
+     */
+    /**
+     * @param $match
+     *
+     * @return string
+     */
+    private function quote($match)
+    {
+        return htmlspecialchars($match[0], ENT_QUOTES);
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
index a371195..c0c089b 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -1,46 +1,48 @@
 <?php
 /**
-* Smarty Internal Plugin Compile Print Expression
-*
-* Compiles any tag which will output an expression or variable
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Compile Print Expression
+ * Compiles any tag which will output an expression or variable
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 
 /**
-* Smarty Internal Plugin Compile Print Expression Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase {
+ * Smarty Internal Plugin Compile Print Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
 
     /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $optional_attributes = array('assign');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
     public $option_flags = array('nocache', 'nofilter');
 
     /**
-    * Compiles code for gererting output from any expression
-    *
-    * @param array  $args      array with attributes from parser
-    * @param object $compiler  compiler object
-    * @param array  $parameter array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
+     * Compiles code for generating output from any expression
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -48,12 +50,6 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
         if ($_attr['nocache'] === true) {
             $compiler->tag_nocache = true;
         }
-        // filter handling
-        if ($_attr['nofilter'] === true) {
-            $_filter = 'false';
-        } else {
-            $_filter = 'true';
-        }
         if (isset($_attr['assign'])) {
             // assign output to variable
             $output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
@@ -62,7 +58,8 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
             $output = $parameter['value'];
             // tag modifier
             if (!empty($parameter['modifierlist'])) {
-                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
+                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'],
+                                                                                   'value'        => $output));
             }
             if (!$_attr['nofilter']) {
                 // default modifier
@@ -71,27 +68,29 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                         $modifierlist = array();
                         foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
                             preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array);
-                            for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) {
+                            for ($i = 0, $count = count($mod_array[0]); $i < $count; $i ++) {
                                 if ($mod_array[0][$i] != ':') {
                                     $modifierlist[$key][] = $mod_array[0][$i];
                                 }
                             }
                         }
-                        $compiler->default_modifier_list  = $modifierlist;
+                        $compiler->default_modifier_list = $modifierlist;
                     }
-                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output));
+                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list,
+                                                                                       'value'        => $output));
                 }
                 // autoescape html
                 if ($compiler->template->smarty->escape_html) {
                     $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
                 }
-                // loop over registerd filters
+                // loop over registered filters
                 if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) {
+                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key =>
+                             $function) {
                         if (!is_array($function)) {
                             $output = "{$function}({$output},\$_smarty_tpl)";
-                        } else if (is_object($function[0])) {
-                            $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE][{$key}][0]->{$function[1]}({$output},\$_smarty_tpl)";
+                        } elseif (is_object($function[0])) {
+                            $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)";
                         } else {
                             $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
                         }
@@ -99,7 +98,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                 }
                 // auto loaded filters
                 if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
+                    foreach ((array) $compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
                         $result = $this->compile_output_filter($compiler, $name, $output);
                         if ($result !== false) {
                             $output = $result;
@@ -109,13 +108,14 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                         }
                     }
                 }
-                if (isset($compiler->template->variable_filters)) {
-                    foreach ($compiler->template->variable_filters as $filter) {
-                        if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) {
-                            $output = $result;
-                        } else {
-                            $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output));
-                        }
+                foreach ($compiler->variable_filters as $filter) {
+                    if (count($filter) == 1 &&
+                        ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false
+                    ) {
+                        $output = $result;
+                    } else {
+                        $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter),
+                                                                                           'value'        => $output));
                     }
                 }
             }
@@ -123,34 +123,34 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
             $compiler->has_output = true;
             $output = "<?php echo {$output};?>";
         }
+
         return $output;
     }
 
     /**
-    * @param object $compiler compiler object
-    * @param string $name     name of variable filter
-    * @param type   $output   embedded output
-    * @return string
-    */
-    private function compile_output_filter($compiler, $name, $output)
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param string                                $name     name of variable filter
+     * @param string                                $output   embedded output
+     *
+     * @return string
+     */
+    private function compile_output_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output)
     {
         $plugin_name = "smarty_variablefilter_{$name}";
         $path = $compiler->smarty->loadPlugin($plugin_name, false);
         if ($path) {
             if ($compiler->template->caching) {
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
+                $compiler->parent_compiler->template->compiled->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
+                $compiler->parent_compiler->template->compiled->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
             } else {
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
+                $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
+                $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
             }
         } else {
             // not found
             return false;
         }
+
         return "{$plugin_name}({$output},\$_smarty_tpl)";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
index f104853..78d95f7 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Registered Block
- *
  * Compiles code for the execution of a registered block function
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Registered Block Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,34 +27,35 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
     /**
      * Compiles code for the execution of a block function
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block function
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of block function
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
     {
-        if (!isset($tag[5]) || substr($tag,-5) != 'close') {
+        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
             // check and get attributes
             $_attr = $this->getAttributes($compiler, $args);
             if ($_attr['nocache']) {
                 $compiler->tag_nocache = true;
             }
-               unset($_attr['nocache']);
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) {
-                   $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag];
-               } else {
-                   $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag];
-               }
+            unset($_attr['nocache']);
+            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) {
+                $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag];
+            } else {
+                $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag];
+            }
             // convert attributes into parameter array string
             $_paramsArray = array();
             foreach ($_attr as $_key => $_value) {
                 if (is_int($_key)) {
                     $_paramsArray[] = "$_key=>$_value";
-                } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) {
-                    $_value = str_replace("'","^#^",$_value);
+                } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) {
+                    $_value = str_replace("'", "^#^", $_value);
                     $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
                 } else {
                     $_paramsArray[] = "'$_key'=>$_value";
@@ -69,45 +69,51 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
             $function = $tag_info[0];
             // compile code
             if (!is_array($function)) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } else if (is_object($function[0])) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            } elseif (is_object($function[0])) {
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
             } else {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
             }
         } else {
             // must endblock be nocache?
             if ($compiler->nocache) {
                 $compiler->tag_nocache = true;
             }
-            $base_tag = substr($tag, 0, -5);
+            $base_tag = substr($tag, 0, - 5);
             // closing tag of block plugin, restore nocache
             list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag);
             // This tag does create output
             $compiler->has_output = true;
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
-                   $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-               } else {
-                   $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-               }
+            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
+            } else {
+                $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
+            }
             // compile code
             if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post ='';
+                $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+                $mod_post = 'echo ' .
+                    $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'],
+                                                                             'value'        => 'ob_get_clean()')) . ';';
             }
             if (!is_array($function)) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } else if (is_object($function[0])) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);" . $mod_post .
+                    " } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
+            } elseif (is_object($function[0])) {
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                    $mod_post . "} array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
             } else {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                    $mod_post . "} array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
             }
         }
+
         return $output . "\n";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
index e68a024..6bddc75 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Registered Function
- *
  * Compiles code for the execution of a registered function
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Registered Function Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -28,13 +27,14 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
     /**
      * Compiles code for the execution of a registered function
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of function
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of function
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
     {
         // This tag does create output
         $compiler->has_output = true;
@@ -44,20 +44,20 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
             $compiler->tag_nocache = true;
         }
         unset($_attr['nocache']);
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
-                   $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-               } else {
-                   $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-               }
+        if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
+            $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag];
+        } else {
+            $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag];
+        }
         // not cachable?
-        $compiler->tag_nocache =  $compiler->tag_nocache || !$tag_info[1];
+        $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[1];
         // convert attributes into parameter array string
         $_paramsArray = array();
         foreach ($_attr as $_key => $_value) {
             if (is_int($_key)) {
                 $_paramsArray[] = "$_key=>$_value";
-            } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) {
-                $_value = str_replace("'","^#^",$_value);
+            } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) {
+                $_value = str_replace("'", "^#^", $_value);
                 $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
             } else {
                 $_paramsArray[] = "'$_key'=>$_value";
@@ -68,14 +68,12 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
         // compile code
         if (!is_array($function)) {
             $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-        } else if (is_object($function[0])) {
+        } elseif (is_object($function[0])) {
             $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
         } else {
             $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
         }
+
         return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
index af8fcd3..b83e824 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -1,111 +1,126 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Special Smarty Variable
- *
  * Compiles the special $smarty variables
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile special Smarty Variable Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase
+{
     /**
-     * Compiles code for the speical $smarty variables
+     * Compiles code for the special $smarty variables
+     *
+     * @param  array                                       $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase        $compiler compiler object
+     * @param                                              $parameter
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $_index = preg_split("/\]\[/",substr($parameter, 1, strlen($parameter)-2));
-        $compiled_ref = ' ';
-        $variable = trim($_index[0], "'");
-        switch ($variable) {
-            case 'foreach':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'section':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'capture':
-                return "Smarty::\$_smarty_vars$parameter";
-            case 'now':
-                return 'time()';
-            case 'cookies':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                    break;
-                }
-                $compiled_ref = '$_COOKIE';
-                break;
-
-            case 'get':
-            case 'post':
-            case 'env':
-            case 'server':
-            case 'session':
-            case 'request':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                    break;
-                }
-                $compiled_ref = '$_'.strtoupper($variable);
-                break;
-
-            case 'template':
-                return 'basename($_smarty_tpl->source->filepath)';
-
-            case 'template_object':
-                return '$_smarty_tpl';
-
-            case 'current_dir':
-                return 'dirname($_smarty_tpl->source->filepath)';
-
-            case 'version':
-                $_version = Smarty::SMARTY_VERSION;
-                return "'$_version'";
-
-            case 'const':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
-                    $compiler->trigger_template_error("(secure mode) constants not permitted");
-                    break;
-                }
-                return "@constant({$_index[1]})";
-
-            case 'config':
-                if (isset($_index[2])) {
-                    return "(is_array(\$tmp = \$_smarty_tpl->getConfigVariable($_index[1])) ? \$tmp[$_index[2]] : null)";
-                } else {
-                    return "\$_smarty_tpl->getConfigVariable($_index[1])";
-                }
-            case 'ldelim':
-                $_ldelim = $compiler->smarty->left_delimiter;
-                return "'$_ldelim'";
-
-            case 'rdelim':
-                $_rdelim = $compiler->smarty->right_delimiter;
-                return "'$_rdelim'";
-
-            default:
-                $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
-                break;
+        $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
+        $variable = strtolower($compiler->getId($_index[ 0 ]));
+        if ($variable === false) {
+            $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
         }
-        if (isset($_index[1])) {
-            array_shift($_index);
-            foreach ($_index as $_ind) {
-                $compiled_ref = $compiled_ref . "[$_ind]";
+        if (!isset($compiler->smarty->security_policy) ||
+            $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
+        ) {
+            switch ($variable) {
+                case 'foreach':
+                case 'section':
+                    if (!isset($compiler->_tag_objects[ $variable ])) {
+                        $class = 'Smarty_Internal_Compile_' . ucfirst($variable);
+                        $compiler->_tag_objects[ $variable ] = new $class;
+                    }
+                    return $compiler->_tag_objects[ $variable ]->compileSpecialVariable(array(), $compiler, $_index);
+                case 'capture':
+                    if (class_exists('Smarty_Internal_Compile_Capture')) {
+                        return Smarty_Internal_Compile_Capture::compileSpecialVariable(array(), $compiler, $_index);
+                    }
+                    return '';
+                case 'now':
+                    return 'time()';
+                case 'cookies':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    $compiled_ref = '$_COOKIE';
+                    break;
+                case 'get':
+                case 'post':
+                case 'env':
+                case 'server':
+                case 'session':
+                case 'request':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    $compiled_ref = '$_' . strtoupper($variable);
+                    break;
+
+                case 'template':
+                    return 'basename($_smarty_tpl->source->filepath)';
+
+                case 'template_object':
+                    return '$_smarty_tpl';
+
+                case 'current_dir':
+                    return 'dirname($_smarty_tpl->source->filepath)';
+
+                case 'version':
+                     return "Smarty::SMARTY_VERSION";
+
+                case 'const':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_constants
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) constants not permitted");
+                        break;
+                    }
+                    if (strpos($_index[ 1 ], '$') === false && strpos($_index[ 1 ], '\'') === false) {
+                        return "@constant('{$_index[1]}')";
+                    } else {
+                        return "@constant({$_index[1]})";
+                    }
+
+                case 'config':
+                    if (isset($_index[ 2 ])) {
+                        return "(is_array(\$tmp = \$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])) ? \$tmp[$_index[2]] : null)";
+                    } else {
+                        return "\$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])";
+                    }
+                case 'ldelim':
+                    return "\$_smarty_tpl->smarty->left_delimiter";
+                case 'rdelim':
+                    return "\$_smarty_tpl->smarty->right_delimiter";
+                default:
+                    $compiler->trigger_template_error('$smarty.' . trim($_index[ 0 ], "'") . ' is not defined');
+                    break;
             }
+            if (isset($_index[ 1 ])) {
+                array_shift($_index);
+                foreach ($_index as $_ind) {
+                    $compiled_ref = $compiled_ref . "[$_ind]";
+                }
+            }
+            return $compiled_ref;
         }
-        return $compiled_ref;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
index 807c7e2..22b33ea 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
@@ -1,41 +1,39 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Rdelim
- *
  * Compiles the {rdelim} tag
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Rdelim Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {rdelim} tag
-     *
      * This tag does output the right delimiter.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         // this tag does not return compiled code
         $compiler->has_code = true;
+
         return $compiler->smarty->right_delimiter;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_section.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_section.php
index ccb7673..40b297a 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_section.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_section.php
@@ -1,22 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Section
- *
  * Compiles the {section} {sectionelse} {/section} tags
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Section Class
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_ForeachSection
+{
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -24,6 +23,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name', 'loop');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +31,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name', 'loop');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -39,165 +40,415 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
      */
     public $optional_attributes = array('start', 'step', 'max', 'show');
 
+    /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'section';
+
+    /**
+     * Valid properties of $smarty.section.name.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'rownum',
+                                          'index_prev', 'index_next');
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
     /**
      * Compiles code for the {section} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                 $args     array with attributes from parser
+     * @param  \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
-        $this->openTag($compiler, 'section', array('section', $compiler->nocache));
+        $attributes = array('name' => $compiler->getId($_attr['name']));
+        unset($_attr['name']);
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $local = "\$__section_{$attributes['name']}_" . $this->counter ++ . '_';
+        $sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
+        $this->openTag($compiler, 'section', array('section', $compiler->nocache, $local, $sectionVar));
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        $output = "<?php ";
-
-        $section_name = $_attr['name'];
-
-        $output .= "if (isset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name])) unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
-        $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
+        $initLocal = array('saved' => "isset(\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']) ? \$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}'] : false",);
+        $initNamedProperty = array();
+        $initFor = array();
+        $incFor = array();
+        $cmpFor = array();
+        $propValue = array('index'     => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
+                           'iteration' => "{$local}iteration",
 
+        );
+        $propType = array('index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,);
+        // search for used tag attributes
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults['named'])) {
+            $namedAttr = $this->matchResults['named'];
+        }
+        $namedAttr['index'] = true;
+        $output = "<?php\n";
         foreach ($_attr as $attr_name => $attr_value) {
             switch ($attr_name) {
                 case 'loop':
-                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $t = 0;
+                    } else {
+                        $v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
+                        $t = 1;
+                    }
+                    if (isset($namedAttr['loop'])) {
+                        $initNamedProperty['loop'] = "'loop' => {$v}";
+                        if ($t == 1) {
+                            $v = "{$sectionVar}->value['loop']";
+                        }
+                    } elseif ($t == 1) {
+                        $initLocal['loop'] = $v;
+                        $v = "{$local}loop";
+                    }
                     break;
-
                 case 'show':
-                    if (is_bool($attr_value))
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    else
-                        $show_attr_value = "(bool)$attr_value";
-                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
+                    if (is_bool($attr_value)) {
+                        $v = $attr_value ? 'true' : 'false';
+                        $t = 0;
+                    } else {
+                        $v = "(bool) $attr_value";
+                        $t = 3;
+                    }
                     break;
-
-                case 'name':
-                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
+                case 'step':
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $v = ($v == 0) ? 1 : $v;
+                        $t = 0;
+                        break;
+                    }
+                    $initLocal['step'] = "((int)@$attr_value) == 0 ? 1 : (int)@$attr_value";
+                    $v = "{$local}step";
+                    $t = 2;
                     break;
 
                 case 'max':
                 case 'start':
-                    $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $t = 0;
+                        break;
+                    }
+                    $v = "(int)@$attr_value";
+                    $t = 3;
                     break;
+            }
+            if ($t == 3 && $compiler->getId($attr_value)) {
+                $t = 1;
+            }
+            $propValue[$attr_name] = $v;
+            $propType[$attr_name] = $t;
+        }
 
-                case 'step':
-                    $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
-                    break;
+        if (isset($namedAttr['step'])) {
+            $initNamedProperty['step'] = $propValue['step'];
+        }
+        if (isset($namedAttr['iteration'])) {
+            $propValue['iteration'] = "{$sectionVar}->value['iteration']";
+        }
+        $incFor['iteration'] = "{$propValue['iteration']}++";
+        $initFor['iteration'] = "{$propValue['iteration']} = 1";
+
+        if ($propType['step'] == 0) {
+            if ($propValue['step'] == 1) {
+                $incFor['index'] = "{$sectionVar}->value['index']++";
+            } elseif ($propValue['step'] > 1) {
+                $incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+            } else {
+                $incFor['index'] = "{$sectionVar}->value['index'] -= " . - $propValue['step'];
+            }
+        } else {
+            $incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+        }
+
+        if (!isset($propValue['max'])) {
+            $propValue['max'] = $propValue['loop'];
+            $propType['max'] = $propType['loop'];
+        } elseif ($propType['max'] != 0) {
+            $propValue['max'] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
+            $propType['max'] = 1;
+        } else {
+            if ($propValue['max'] < 0) {
+                $propValue['max'] = $propValue['loop'];
+                $propType['max'] = $propType['loop'];
             }
         }
 
-        if (!isset($_attr['show']))
-            $output .= "{$section_props}['show'] = true;\n";
-
-        if (!isset($_attr['loop']))
-            $output .= "{$section_props}['loop'] = 1;\n";
-
-        if (!isset($_attr['max']))
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        else
-            $output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
-
-        if (!isset($_attr['step']))
-            $output .= "{$section_props}['step'] = 1;\n";
-
-        if (!isset($_attr['start']))
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        else {
-            $output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
-        }
-
-        $output .= "if ({$section_props}['show']) {\n";
-        if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
-            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
+        if (!isset($propValue['start'])) {
+            $start_code = array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue['loop'],
+                                5 => ' - 1');
+            if ($propType['loop'] == 0) {
+                $start_code[5] = '';
+                $start_code[4] = $propValue['loop'] - 1;
+            }
+            if ($propType['step'] == 0) {
+                if ($propValue['step'] > 0) {
+                    $start_code = array(1 => '0');
+                    $propType['start'] = 0;
+                } else {
+                    $start_code[1] = $start_code[2] = $start_code[3] = '';
+                    $propType['start'] = $propType['loop'];
+                }
+            } else {
+                $propType['start'] = 1;
+            }
+            $propValue['start'] = join('', $start_code);
         } else {
-            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
+            $start_code = array(1  => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ",
+                                4  => '0', 5 => ' : ', 6 => '-1', 7 => ', ',
+                                8  => "{$propValue['start']} + {$propValue['loop']}", 10 => ')', 11 => ' : ',
+                                12 => 'min(', 13 => $propValue['start'], 14 => ', ',
+                                15 => "{$propValue['step']} > 0 ? ", 16 => $propValue['loop'], 17 => ' : ',
+                                18 => $propType['loop'] == 0 ? $propValue['loop'] - 1 : "{$propValue['loop']} - 1",
+                                19 => ')');
+            if ($propType['step'] == 0) {
+                $start_code[3] = $start_code[5] = $start_code[15] = $start_code[17] = '';
+                if ($propValue['step'] > 0) {
+                    $start_code[6] = $start_code[18] = '';
+                } else {
+                    $start_code[4] = $start_code[16] = '';
+                }
+            }
+            if ($propType['start'] == 0) {
+                if ($propType['loop'] == 0) {
+                    $start_code[8] = $propValue['start'] + $propValue['loop'];
+                }
+                $propType['start'] = $propType['step'] + $propType['loop'];
+                $start_code[1] = '';
+                if ($propValue['start'] < 0) {
+                    for ($i = 11; $i <= 19; $i ++) {
+                        $start_code[$i] = '';
+                    }
+                    if ($propType['start'] == 0) {
+                        $start_code = array(max($propValue['step'] > 0 ? 0 : - 1, $propValue['start'] +
+                                                                                $propValue['loop']));
+                    }
+                } else {
+                    for ($i = 1; $i <= 11; $i ++) {
+                        $start_code[$i] = '';
+                    }
+                    if ($propType['start'] == 0) {
+                        $start_code = array(min($propValue['step'] > 0 ? $propValue['loop'] : $propValue['loop'] -
+                            1, $propValue['start']));
+                    }
+                }
+            }
+            $propValue['start'] = join('', $start_code);
+        }
+        if ($propType['start'] != 0) {
+            $initLocal['start'] = $propValue['start'];
+            $propValue['start'] = "{$local}start";
         }
-        $output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
 
-        $output .= "if ({$section_props}['show']):\n";
-        $output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
+        $initFor['index'] = "{$sectionVar}->value['index'] = {$propValue['start']}";
 
+        if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
+            $propValue['total'] = $propValue['loop'];
+            $propType['total'] = $propType['loop'];
+        } else {
+            $propType['total'] = $propType['start'] + $propType['loop'] + $propType['step'] + $propType['max'];
+            if ($propType['total'] == 0) {
+                $propValue['total'] = min(ceil(($propValue['step'] > 0 ? $propValue['loop'] -
+                                                   $propValue['start'] : (int) $propValue['start'] + 1) /
+                                               abs($propValue['step'])), $propValue['max']);
+            } else {
+                $total_code = array(1  => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
+                                    5  => $propValue['loop'], 6 => ' - ', 7 => $propValue['start'], 8 => ' : ',
+                                    9  => $propValue['start'], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
+                                    14 => $propValue['step'], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",);
+                if (!isset($propValue['max'])) {
+                    $total_code[1] = $total_code[17] = '';
+                }
+                if ($propType['loop'] + $propType['start'] == 0) {
+                    $total_code[5] = $propValue['loop'] - $propValue['start'];
+                    $total_code[6] = $total_code[7] = '';
+                }
+                if ($propType['start'] == 0) {
+                    $total_code[9] = (int) $propValue['start'] + 1;
+                    $total_code[10] = '';
+                }
+                if ($propType['step'] == 0) {
+                    $total_code[13] = $total_code[15] = '';
+                    if ($propValue['step'] == 1 || $propValue['step'] == - 1) {
+                        $total_code[2] = $total_code[12] = $total_code[14] = $total_code[16] = '';
+                    } elseif ($propValue['step'] < 0) {
+                        $total_code[14] = - $propValue['step'];
+                    }
+                    $total_code[4] = '';
+                    if ($propValue['step'] > 0) {
+                        $total_code[8] = $total_code[9] = $total_code[10] = '';
+                    } else {
+                        $total_code[5] = $total_code[6] = $total_code[7] = $total_code[8] = '';
+                    }
+                }
+                $propValue['total'] = join('', $total_code);
+            }
+        }
+
+        if (isset($namedAttr['total'])) {
+            $initNamedProperty['total'] = "'total' => {$propValue['total']}";
+            if ($propType['total'] > 0) {
+                $propValue['total'] = "{$sectionVar}->value['total']";
+            }
+        } elseif ($propType['total'] > 0) {
+            $initLocal['total'] = $propValue['total'];
+            $propValue['total'] = "{$local}total";
+        }
+
+        $cmpFor['iteration'] = "{$propValue['iteration']} <= {$propValue['total']}";
+
+        foreach ($initLocal as $key => $code) {
+            $output .= "{$local}{$key} = {$code};\n";
+        }
+
+        $_vars = 'array(' . join(', ', $initNamedProperty) . ')';
+        $output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n";
+        $cond_code = "{$propValue['total']} != 0";
+        if ($propType['total'] == 0) {
+            if ($propValue['total'] == 0) {
+                $cond_code = 'false';
+            } else {
+                $cond_code = 'true';
+            }
+        }
+        if ($propType['show'] > 0) {
+            $output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
+            $output .= "if ({$local}show) {\n";
+        } elseif ($propValue['show'] == 'true') {
+            $output .= "if ({$cond_code}) {\n";
+        } else {
+            $output .= "if (false) {\n";
+        }
+        $jinit = join(', ', $initFor);
+        $jcmp = join(', ', $cmpFor);
+        $jinc = join(', ', $incFor);
+        $output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
+        if (isset($namedAttr['rownum'])) {
+            $output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
+        }
+        if (isset($namedAttr['index_prev'])) {
+            $output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
+        }
+        if (isset($namedAttr['index_next'])) {
+            $output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
+        }
+        if (isset($namedAttr['first'])) {
+            $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} == 1);\n";
+        }
+        if (isset($namedAttr['last'])) {
+            $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} == {$propValue['total']});\n";
+        }
         $output .= "?>";
+
         return $output;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Sectionelse Class
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {sectionelse} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        list($openTag, $nocache) = $this->closeTag($compiler, array('section'));
-        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache));
+        list($openTag, $nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section'));
+        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache, $local, $sectionVar));
 
-        return "<?php endfor; else: ?>";
+        return "<?php }} else {\n ?>";
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Sectionclose Class
- * 
- * @package Smarty
+ *
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/section} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
+        $compiler->loopNesting--;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
 
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('section', 'sectionelse'));
+        list($openTag, $compiler->nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section',
+                                                                                                   'sectionelse'));
 
+        $output = "<?php\n";
         if ($openTag == 'sectionelse') {
-            return "<?php endif; ?>";
+            $output .= "}\n";
         } else {
-            return "<?php endfor; endif; ?>";
+            $output .= "}\n}\n";
         }
+        $output .= "if ({$local}saved) {\n";
+        $output .= "{$sectionVar} = {$local}saved;\n";
+        $output .= "}\n";
+        $output .= "?>";
+
+        return $output;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
index 50b4cab..b4932c1 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
@@ -1,72 +1,70 @@
 <?php
 /**
  * Smarty Internal Plugin Compile Setfilter
- *
  * Compiles code for setfilter tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Setfilter Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for setfilter tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $args      array with attributes from parser
+     * @param  object $compiler  compiler object
+     * @param  array  $parameter array with compilation parameter
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $compiler->variable_filter_stack[] = $compiler->template->variable_filters;
-        $compiler->template->variable_filters = $parameter['modifier_list'];
+        $compiler->variable_filter_stack[] = $compiler->variable_filters;
+        $compiler->variable_filters = $parameter['modifier_list'];
         // this tag does not return compiled code
         $compiler->has_code = false;
+
         return true;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Setfilterclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/setfilter} tag
-     *
      * This tag does not generate compiled output. It resets variable filter.
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array  $args     array with attributes from parser
+     * @param  object $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         // reset variable filter to previous state
         if (count($compiler->variable_filter_stack)) {
-            $compiler->template->variable_filters = array_pop($compiler->variable_filter_stack);
+            $compiler->variable_filters = array_pop($compiler->variable_filter_stack);
         } else {
-            $compiler->template->variable_filters = array();
+            $compiler->variable_filters = array();
         }
         // this tag does not return compiled code
         $compiler->has_code = false;
+
         return true;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
new file mode 100644
index 0000000..c7bf1f8
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance
+ * Shared methods for {extends} and {block} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
+{
+    /**
+     * Register post compile callback to compile inheritance initialization code
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        if ($initChildSequence || !isset($compiler->_cache['inheritanceInit'])) {
+            $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
+                                                   array($initChildSequence), 'inheritanceInit', $initChildSequence);
+
+            $compiler->_cache['inheritanceInit'] = true;
+        }
+    }
+
+    /**
+     * Compile inheritance initialization code as prefix
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->ext->_inheritance->init(\$_smarty_tpl, " .
+            var_export($initChildSequence, true) . ");\n?>\n";
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_while.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_while.php
index d7d986c..bd31f66 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compile_while.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compile_while.php
@@ -1,94 +1,108 @@
 <?php
 /**
  * Smarty Internal Plugin Compile While
- *
  * Compiles the {while} tag
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile While Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {while} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         $this->openTag($compiler, 'while', $compiler->nocache);
 
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing while condition", $compiler->lex->taglineno);
+        if (!array_key_exists("if condition", $parameter)) {
+            $compiler->trigger_template_error("missing while condition", null, true);
         }
 
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $_output = "<?php\n";
         if (is_array($parameter['if condition'])) {
             if ($compiler->nocache) {
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var'], "'");
+                }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
+                } else {
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
             }
             if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
+                $_output .= "if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] .
+                    "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] .
+                    "]->value)) \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " . $parameter['if condition']['var']['var'] .
+                    "$_nocache);\n";
+                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                    $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                    $parameter['if condition']['value'] . ") {?>";
             } else {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
+                $_output .= "if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "] = new Smarty_Variable(null{$_nocache});";
+                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                    $parameter['if condition']['value'] . ") {?>";
             }
-            return $_output;
         } else {
-            return "<?php while ({$parameter['if condition']}){?>";
-        }
+            $_output .= "while ({$parameter['if condition']}) {?>";
+         }
+        return $_output;
     }
-
 }
 
 /**
  * Smarty Internal Plugin Compile Whileclose Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase {
-
+class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
+{
     /**
      * Compiles code for the {/while} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                       $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
+        $compiler->loopNesting--;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
         $compiler->nocache = $this->closeTag($compiler, array('while'));
-        return "<?php }?>";
+        return "<?php }?>\n";
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_compilebase.php b/sources/include/smarty/libs/sysplugins/smarty_internal_compilebase.php
index 5fb56f3..0803f27 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_compilebase.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_compilebase.php
@@ -2,25 +2,26 @@
 /**
  * Smarty Internal Plugin CompileBase
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * This class does extend all internal compile plugins
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-abstract class Smarty_Internal_CompileBase {
-
+abstract class Smarty_Internal_CompileBase
+{
     /**
      * Array of names of required attribute required by tag
      *
      * @var array
      */
     public $required_attributes = array();
+
     /**
      * Array of names of optional attribute required by tag
      * use array('_any') if there is no restriction of attributes names
@@ -28,12 +29,14 @@ abstract class Smarty_Internal_CompileBase {
      * @var array
      */
     public $optional_attributes = array();
+
     /**
      * Shorttag attribute order defined by its names
      *
      * @var array
      */
     public $shorttag_order = array();
+
     /**
      * Array of names of valid option flags
      *
@@ -43,15 +46,15 @@ abstract class Smarty_Internal_CompileBase {
 
     /**
      * This function checks if the attributes passed are valid
-     *
      * The attributes passed for the tag to compile are checked against the list of required and
      * optional attributes. Required attributes must be present. Optional attributes are check against
      * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
      * as valid
      *
-     * @param object $compiler   compiler object
-     * @param array  $attributes attributes applied to the tag
-     * @return array of mapped attributes for further processing
+     * @param  object $compiler   compiler object
+     * @param  array  $attributes attributes applied to the tag
+     *
+     * @return array  of mapped attributes for further processing
      */
     public function getAttributes($compiler, $attributes)
     {
@@ -64,11 +67,11 @@ abstract class Smarty_Internal_CompileBase {
                 if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
                     $_indexed_attr[trim($mixed, '\'"')] = true;
                     // shorthand attribute ?
-                } else if (isset($this->shorttag_order[$key])) {
+                } elseif (isset($this->shorttag_order[$key])) {
                     $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
                 } else {
                     // too many shorthands
-                    $compiler->trigger_template_error('too many shorthand attributes', $compiler->lex->taglineno);
+                    $compiler->trigger_template_error('too many shorthand attributes', null, true);
                 }
                 // named attribute
             } else {
@@ -77,20 +80,20 @@ abstract class Smarty_Internal_CompileBase {
                 if (in_array($kv['key'], $this->option_flags)) {
                     if (is_bool($kv['value'])) {
                         $_indexed_attr[$kv['key']] = $kv['value'];
-                    } else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
+                    } elseif (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
                         if (trim($kv['value']) == 'true') {
                             $_indexed_attr[$kv['key']] = true;
                         } else {
                             $_indexed_attr[$kv['key']] = false;
                         }
-                    } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
+                    } elseif (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
                         if ($kv['value'] == 1) {
                             $_indexed_attr[$kv['key']] = true;
                         } else {
                             $_indexed_attr[$kv['key']] = false;
                         }
                     } else {
-                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $compiler->lex->taglineno);
+                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", null, true);
                     }
                     // must be named attribute
                 } else {
@@ -102,15 +105,15 @@ abstract class Smarty_Internal_CompileBase {
         // check if all required attributes present
         foreach ($this->required_attributes as $attr) {
             if (!array_key_exists($attr, $_indexed_attr)) {
-                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
             }
         }
-        // check for unallowed attributes
+        // check for not allowed attributes
         if ($this->optional_attributes != array('_any')) {
             $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
             foreach ($_indexed_attr as $key => $dummy) {
                 if (!in_array($key, $tmp_array) && $key !== 0) {
-                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $compiler->lex->taglineno);
+                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
                 }
             }
         }
@@ -126,12 +129,11 @@ abstract class Smarty_Internal_CompileBase {
 
     /**
      * Push opening tag name on stack
-     *
      * Optionally additional data can be saved on stack
      *
-     * @param object    $compiler   compiler object
-     * @param string    $openTag    the opening tag's name
-     * @param mixed     $data       optional data saved
+     * @param object $compiler compiler object
+     * @param string $openTag  the opening tag's name
+     * @param mixed  $data     optional data saved
      */
     public function openTag($compiler, $openTag, $data = null)
     {
@@ -140,12 +142,12 @@ abstract class Smarty_Internal_CompileBase {
 
     /**
      * Pop closing tag
-     *
      * Raise an error if this stack-top doesn't match with expected opening tags
      *
-     * @param object       $compiler    compiler object
-     * @param array|string $expectedTag the expected opening tag names
-     * @return mixed any type the opening tag's name or saved data
+     * @param  object       $compiler    compiler object
+     * @param  array|string $expectedTag the expected opening tag names
+     *
+     * @return mixed        any type the opening tag's name or saved data
      */
     public function closeTag($compiler, $expectedTag)
     {
@@ -163,14 +165,14 @@ abstract class Smarty_Internal_CompileBase {
                 }
             }
             // wrong nesting of tags
-            $compiler->trigger_template_error("unclosed {" . $_openTag . "} tag");
+            $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag .
+                                              "{$compiler->smarty->right_delimiter} tag");
+
             return;
         }
         // wrong nesting of tags
-        $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno);
+        $compiler->trigger_template_error("unexpected closing tag", null, true);
+
         return;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_config.php b/sources/include/smarty/libs/sysplugins/smarty_internal_config.php
deleted file mode 100644
index bcb3ce0..0000000
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_config.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config
- *
- * @package Smarty
- * @subpackage Config
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Config
- *
- * Main class for config variables
- *
- * @package Smarty
- * @subpackage Config
- *
- * @property Smarty_Config_Source   $source
- * @property Smarty_Config_Compiled $compiled
- * @ignore
- */
-class Smarty_Internal_Config {
-
-    /**
-     * Samrty instance
-     *
-     * @var Smarty object
-     */
-    public $smarty = null;
-    /**
-     * Object of config var storage
-     *
-     * @var object
-     */
-    public $data = null;
-    /**
-     * Config resource
-     * @var string
-     */
-    public $config_resource = null;
-    /**
-     * Compiled config file
-     *
-     * @var string
-     */
-    public $compiled_config = null;
-    /**
-     * filepath of compiled config file
-     *
-     * @var string
-     */
-    public $compiled_filepath = null;
-    /**
-     * Filemtime of compiled config Filemtime
-     *
-     * @var int
-     */
-    public $compiled_timestamp = null;
-    /**
-     * flag if compiled config file is invalid and must be (re)compiled
-     * @var bool
-     */
-    public $mustCompile = null;
-    /**
-     * Config file compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler object
-     */
-    public $compiler_object = null;
-
-    /**
-     * Constructor of config file object
-     *
-     * @param string $config_resource config file resource name
-     * @param Smarty $smarty Smarty instance
-     * @param object $data object for config vars storage
-     */
-    public function __construct($config_resource, $smarty, $data = null)
-    {
-        $this->data = $data;
-        $this->smarty = $smarty;
-        $this->config_resource = $config_resource;
-    }
-
-    /**
-     * Returns the compiled  filepath
-     *
-     * @return string the compiled filepath
-     */
-    public function getCompiledFilepath()
-    {
-        return $this->compiled_filepath === null ?
-                ($this->compiled_filepath = $this->buildCompiledFilepath()) :
-                $this->compiled_filepath;
-    }
-
-    /**
-     * Get file path.
-     *
-     * @return string
-     */
-    public function buildCompiledFilepath()
-    {
-        $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
-        $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2
-                + (int) $this->smarty->config_overwrite * 4;
-        $_filepath = sha1($this->source->name . $_flag);
-        // if use_sub_dirs, break file into directories
-        if ($this->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                    . substr($_filepath, 2, 2) . DS
-                    . substr($_filepath, 4, 2) . DS
-                    . $_filepath;
-        }
-        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        $_compile_dir = $this->smarty->getCompileDir();
-        return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php';
-    }
-
-    /**
-     * Returns the timpestamp of the compiled file
-     *
-     * @return integer the file timestamp
-     */
-    public function getCompiledTimestamp()
-    {
-        return $this->compiled_timestamp === null
-            ? ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false)
-            : $this->compiled_timestamp;
-    }
-
-    /**
-     * Returns if the current config file must be compiled
-     *
-     * It does compare the timestamps of config source and the compiled config and checks the force compile configuration
-     *
-     * @return boolean true if the file must be compiled
-     */
-    public function mustCompile()
-    {
-        return $this->mustCompile === null ?
-            $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->source->timestamp):
-            $this->mustCompile;
-    }
-
-    /**
-     * Returns the compiled config file
-     *
-     * It checks if the config file must be compiled or just read the compiled version
-     *
-     * @return string the compiled config file
-     */
-    public function getCompiledConfig()
-    {
-        if ($this->compiled_config === null) {
-            // see if template needs compiling.
-            if ($this->mustCompile()) {
-                $this->compileConfigSource();
-            } else {
-                $this->compiled_config = file_get_contents($this->getCompiledFilepath());
-            }
-        }
-        return $this->compiled_config;
-    }
-
-    /**
-     * Compiles the config files
-     *
-     * @throws Exception
-     */
-    public function compileConfigSource()
-    {
-        // compile template
-        if (!is_object($this->compiler_object)) {
-            // load compiler
-            $this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty);
-        }
-        // compile locking
-        if ($this->smarty->compile_locking) {
-            if ($saved_timestamp = $this->getCompiledTimestamp()) {
-                touch($this->getCompiledFilepath());
-            }
-        }
-        // call compiler
-        try {
-            $this->compiler_object->compileSource($this);
-        } catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && $saved_timestamp) {
-                touch($this->getCompiledFilepath(), $saved_timestamp);
-            }
-            throw $e;
-        }
-        // compiling succeded
-        // write compiled template
-        Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty);
-    }
-
-    /**
-     * load config variables
-     *
-     * @param mixed $sections array of section names, single section or null
-     * @param object $scope global,parent or local
-     */
-    public function loadConfigVars($sections = null, $scope = 'local')
-    {
-        if ($this->data instanceof Smarty_Internal_Template) {
-            $this->data->properties['file_dependency'][sha1($this->source->filepath)] = array($this->source->filepath, $this->source->timestamp, 'file');
-        }
-        if ($this->mustCompile()) {
-            $this->compileConfigSource();
-        }
-        // pointer to scope
-        if ($scope == 'local') {
-            $scope_ptr = $this->data;
-        } elseif ($scope == 'parent') {
-            if (isset($this->data->parent)) {
-                $scope_ptr = $this->data->parent;
-            } else {
-                $scope_ptr = $this->data;
-            }
-        } elseif ($scope == 'root' || $scope == 'global') {
-            $scope_ptr = $this->data;
-            while (isset($scope_ptr->parent)) {
-                $scope_ptr = $scope_ptr->parent;
-            }
-        }
-        $_config_vars = array();
-        include($this->getCompiledFilepath());
-        // copy global config vars
-        foreach ($_config_vars['vars'] as $variable => $value) {
-            if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                $scope_ptr->config_vars[$variable] = $value;
-            } else {
-                $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-            }
-        }
-        // scan sections
-        if (!empty($sections)) {
-            foreach ((array) $sections as $this_section) {
-                if (isset($_config_vars['sections'][$this_section])) {
-                    foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
-                        if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                            $scope_ptr->config_vars[$variable] = $value;
-                        } else {
-                            $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * set Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @param mixed  $value         value
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'source':
-            case 'compiled':
-                $this->$property_name = $value;
-                return;
-        }
-
-        throw new SmartyException("invalid config property '$property_name'.");
-    }
-
-    /**
-     * get Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'source':
-                if (empty($this->config_resource)) {
-                    throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\"");
-                }
-                $this->source = Smarty_Resource::config($this);
-                return $this->source;
-
-            case 'compiled':
-                $this->compiled = $this->source->getCompiled($this);
-                return $this->compiled;
-        }
-
-        throw new SmartyException("config attribute '$property_name' does not exist.");
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
index b16a694..56d3b06 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
@@ -1,22 +1,35 @@
 <?php
 /**
  * Smarty Internal Plugin Config File Compiler
- *
  * This is the config file compiler class. It calls the lexer and parser to
  * perform the compiling.
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Config
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Main config file compiler class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Config
  */
-class Smarty_Internal_Config_File_Compiler {
+class Smarty_Internal_Config_File_Compiler
+{
+    /**
+     * Lexer class name
+     *
+     * @var string
+     */
+    public $lexer_class;
+
+    /**
+     * Parser class name
+     *
+     * @var string
+     */
+    public $parser_class;
 
     /**
      * Lexer object
@@ -42,9 +55,9 @@ class Smarty_Internal_Config_File_Compiler {
     /**
      * Smarty object
      *
-     * @var Smarty_Internal_Config object
+     * @var Smarty_Internal_Template object
      */
-    public $config;
+    public $template;
 
     /**
      * Compiled config data sections and variables
@@ -53,76 +66,116 @@ class Smarty_Internal_Config_File_Compiler {
      */
     public $config_data = array();
 
+    /**
+     * compiled config data must always be written
+     *
+     * @var bool
+     */
+    public $write_compiled_code = true;
+
     /**
      * Initialize compiler
      *
-     * @param Smarty $smarty base instance
+     * @param string $lexer_class  class name
+     * @param string $parser_class class name
+     * @param Smarty $smarty       global instance
      */
-    public function __construct($smarty)
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
     {
+        $this->smarty = $smarty;
+        // get required plugins
+        $this->lexer_class = $lexer_class;
+        $this->parser_class = $parser_class;
         $this->smarty = $smarty;
         $this->config_data['sections'] = array();
         $this->config_data['vars'] = array();
     }
 
     /**
-     * Method to compile a Smarty template.
+     * Method to compile Smarty config source.
+     *
+     * @param Smarty_Internal_Template $template
      *
-     * @param  Smarty_Internal_Config $config config object
      * @return bool true if compiling succeeded, false if it failed
      */
-    public function compileSource(Smarty_Internal_Config $config)
+    public function compileTemplate(Smarty_Internal_Template $template)
     {
-        /* here is where the compiling takes place. Smarty
-          tags in the templates are replaces with PHP code,
-          then written to compiled files. */
-        $this->config = $config;
-        // get config file source
-        $_content = $config->source->content . "\n";
-        // on empty template just return
-        if ($_content == '') {
-            return true;
+        $this->template = $template;
+        $this->template->compiled->file_dependency[$this->template->source->uid] = array($this->template->source->filepath,
+                                                                                             $this->template->source->getTimeStamp(),
+                                                                                             $this->template->source->type);
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->start_compile($this->template);
         }
         // init the lexer/parser to compile the config file
-        $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty);
-        $parser = new Smarty_Internal_Configfileparser($lex, $this);
-        if ($this->smarty->_parserdebug) $parser->PrintTrace();
+        /* @var Smarty_Internal_ConfigFileLexer $lex */
+        $lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $template->source->getContent()) .
+                                      "\n", $this);
+        /* @var Smarty_Internal_ConfigFileParser $parser */
+        $parser = new $this->parser_class($lex, $this);
+
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+
+        if ($this->smarty->_parserdebug) {
+            $parser->PrintTrace();
+        }
         // get tokens from lexer and parse them
         while ($lex->yylex()) {
-            if ($this->smarty->_parserdebug) echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+            if ($this->smarty->_parserdebug) {
+                echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+            }
             $parser->doParse($lex->token, $lex->value);
         }
         // finish parsing process
         $parser->doParse(0, 0);
-        $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
+
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        // template header code
+        $template_header = "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " .
+            strftime("%Y-%m-%d %H:%M:%S") . "\n";
+        $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
+
+        $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
+            var_export($this->config_data, true) . '); ?>';
+        return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
     }
 
     /**
      * display compiler error messages without dying
-     *
      * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about exspected tokens.
-     *
+     * In this case the parser is called to obtain information about expected tokens.
      * If parameter $args contains a string this is used as error message
      *
      * @param string $args individual error message or null
+     *
+     * @throws SmartyCompilerException
      */
     public function trigger_config_file_error($args = null)
     {
         $this->lex = Smarty_Internal_Configfilelexer::instance();
         $this->parser = Smarty_Internal_Configfileparser::instance();
-        // get template source line which has error
+        // get config source line which has error
         $line = $this->lex->line;
         if (isset($args)) {
             // $line--;
         }
         $match = preg_split("/\n/", $this->lex->data);
-        $error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line-1]}' ";
+        $error_text = "Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
         if (isset($args)) {
             // individual error message
             $error_text .= $args;
         } else {
-            // exspected token from parser
+            // expected token from parser
             foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
                 $exp_token = $this->parser->yyTokenName[$token];
                 if (isset($this->lex->smarty_token_names[$exp_token])) {
@@ -138,7 +191,4 @@ class Smarty_Internal_Config_File_Compiler {
         }
         throw new SmartyCompilerException($error_text);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/sources/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
index bade2fe..e62728c 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
@@ -1,115 +1,238 @@
 <?php
 /**
-* Smarty Internal Plugin Configfilelexer
-*
-* This is the lexer to break the config file source into tokens
-* @package Smarty
-* @subpackage Config
-* @author Uwe Tews
-*/
+ * Smarty Internal Plugin Configfilelexer
+ *
+ * This is the lexer to break the config file source into tokens
+ *
+ * @package    Smarty
+ * @subpackage Config
+ * @author     Uwe Tews
+ */
+
 /**
-* Smarty Internal Plugin Configfilelexer
-*/
+ * Smarty_Internal_Configfilelexer
+ *
+ * This is the config file lexer.
+ * It is generated from the smarty_internal_configfilelexer.plex file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
 class Smarty_Internal_Configfilelexer
 {
-
+    /**
+     * Source
+     *
+     * @var string
+     */
     public $data;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
     public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
     public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
     public $value;
-    public $node;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
     public $line;
-    private $state = 1;
-    public $smarty_token_names = array (		// Text for parser error messages
-   				);
 
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
 
-    function __construct($data, $smarty)
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    private $compiler = null;
+
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION',
+                               6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var sring
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    private $yy_global_pattern6 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
     {
         // set instance object
         self::instance($this);
         $this->data = $data . "\n"; //now all lines are \n-terminated
         $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
         $this->line = 1;
-        $this->smarty = $smarty;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
     }
+
     public static function &instance($new_instance = null)
     {
         static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
+        if (isset($new_instance) && is_object($new_instance)) {
             $instance = $new_instance;
+        }
         return $instance;
     }
 
-
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
 
     private $_yy_state = 1;
+
     private $_yy_stack = array();
 
-    function yylex()
+    public function yylex()
     {
         return $this->{'yylex' . $this->_yy_state}();
     }
 
-    function yypushstate($state)
+    public function yypushstate($state)
     {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
     }
 
-    function yypopstate()
+    public function yypopstate()
     {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
         $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
     }
 
-    function yybegin($state)
+    public function yybegin($state)
     {
         $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
     }
 
-
-
-
-    function yylex1()
+    public function yylex1()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state START');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state START');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r1_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -118,110 +241,100 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const START = 1;
-    function yy_r1_1($yy_subpatterns)
+
+    function yy_r1_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-    $this->yypushstate(self::COMMENT);
-    }
-    function yy_r1_2($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-    $this->yypushstate(self::SECTION);
-    }
-    function yy_r1_3($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
-    }
-    function yy_r1_4($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-    $this->yypushstate(self::VALUE);
-    }
-    function yy_r1_5($yy_subpatterns)
-    {
-
-    return false;
-    }
-    function yy_r1_6($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    }
-    function yy_r1_7($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
-    }
-    function yy_r1_8($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+        $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+        $this->yypushstate(self::COMMENT);
     }
 
-
-
-    function yylex2()
+    function yy_r1_2()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+        $this->yypushstate(self::SECTION);
+    }
+
+    function yy_r1_3()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+    }
+
+    function yy_r1_4()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+        $this->yypushstate(self::VALUE);
+    }
+
+    function yy_r1_5()
+    {
+
+        return false;
+    }
+
+    function yy_r1_6()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    }
+
+    function yy_r1_7()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+    }
+
+    function yy_r1_8()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+    }
+
+    public function yylex2()
+    {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state VALUE');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r2_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -230,119 +343,120 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const VALUE = 2;
-    function yy_r2_1($yy_subpatterns)
+
+    function yy_r2_1()
     {
 
-    return false;
+        return false;
     }
-    function yy_r2_2($yy_subpatterns)
+
+    function yy_r2_2()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-    $this->yypopstate();
-    }
-    function yy_r2_3($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
-    $this->yypopstate();
-    }
-    function yy_r2_4($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
-    $this->yypushstate(self::TRIPPLE);
-    }
-    function yy_r2_5($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_6($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_7($yy_subpatterns)
-    {
-
-    if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
-        $this->yypopstate();
-        $this->yypushstate(self::NAKED_STRING_VALUE);
-        return true; //reprocess in new state
-    } else {
-        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+        $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
         $this->yypopstate();
     }
-    }
-    function yy_r2_8($yy_subpatterns)
+
+    function yy_r2_3()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_9($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->value = "";
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+        $this->yypopstate();
     }
 
-
-
-    function yylex3()
+    function yy_r2_4()
     {
-        $tokenMap = array (
-              1 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+        $this->yypushstate(self::TRIPPLE);
+    }
+
+    function yy_r2_5()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+        $this->yypopstate();
+    }
+
+    function yy_r2_6()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+        $this->yypopstate();
+    }
+
+    function yy_r2_7()
+    {
+
+        if (!$this->configBooleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes",
+                "no"))
+        ) {
+            $this->yypopstate();
+            $this->yypushstate(self::NAKED_STRING_VALUE);
+            return true; //reprocess in new state
+        } else {
+            $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+            $this->yypopstate();
+        }
+    }
+
+    function yy_r2_8()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->yypopstate();
+    }
+
+    function yy_r2_9()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->value = "";
+        $this->yypopstate();
+    }
+
+    public function yylex3()
+    {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state NAKED_STRING_VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r3_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -351,67 +465,56 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const NAKED_STRING_VALUE = 3;
-    function yy_r3_1($yy_subpatterns)
+
+    function yy_r3_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->yypopstate();
     }
 
-
-
-    function yylex4()
+    public function yylex4()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state COMMENT');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state COMMENT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -420,76 +523,68 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const COMMENT = 4;
-    function yy_r4_1($yy_subpatterns)
+
+    function yy_r4_1()
     {
 
-    return false;
-    }
-    function yy_r4_2($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    }
-    function yy_r4_3($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    $this->yypopstate();
+        return false;
     }
 
-
-
-    function yylex5()
+    function yy_r4_2()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    }
+
+    function yy_r4_3()
+    {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+        $this->yypopstate();
+    }
+
+    public function yylex5()
+    {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state SECTION');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state SECTION');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r5_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -498,70 +593,62 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const SECTION = 5;
-    function yy_r5_1($yy_subpatterns)
+
+    function yy_r5_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
-    }
-    function yy_r5_2($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
-    $this->yypopstate();
+        $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
     }
 
-
-    function yylex6()
+    function yy_r5_2()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+
+        $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+        $this->yypopstate();
+    }
+
+    public function yylex6()
+    {
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state TRIPPLE');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TRIPPLE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r6_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -570,53 +657,43 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const TRIPPLE = 6;
-    function yy_r6_1($yy_subpatterns)
+
+    function yy_r6_1()
     {
 
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
-    $this->yypopstate();
-    $this->yypushstate(self::START);
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+        $this->yypopstate();
+        $this->yypushstate(self::START);
     }
-    function yy_r6_2($yy_subpatterns)
+
+    function yy_r6_2()
     {
 
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-  if (isset($match[0][1])) {
-    $to = $match[0][1];
-  } else {
-    $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+        $to = strlen($this->data);
+        preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1];
+        } else {
+            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
     }
 
-
 }
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/sources/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php
index 784bc68..69aaf99 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_configfileparser.php
@@ -1,20 +1,12 @@
 <?php
-/**
-* Smarty Internal Plugin Configfileparser
-*
-* This is the config file parser.
-* It is generated from the internal.configfileparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
 
 class TPC_yyToken implements ArrayAccess
 {
     public $string = '';
+
     public $metadata = array();
 
-    function __construct($s, $m = array())
+    public function __construct($s, $m = array())
     {
         if ($s instanceof TPC_yyToken) {
             $this->string = $s->string;
@@ -29,28 +21,28 @@ class TPC_yyToken implements ArrayAccess
         }
     }
 
-    function __toString()
+    public function __toString()
     {
-        return $this->_string;
+        return $this->string;
     }
 
-    function offsetExists($offset)
+    public function offsetExists($offset)
     {
         return isset($this->metadata[$offset]);
     }
 
-    function offsetGet($offset)
+    public function offsetGet($offset)
     {
         return $this->metadata[$offset];
     }
 
-    function offsetSet($offset, $value)
+    public function offsetSet($offset, $value)
     {
         if ($offset === null) {
             if (isset($value[0])) {
-                $x = ($value instanceof TPC_yyToken) ?
-                    $value->metadata : $value;
+                $x = ($value instanceof TPC_yyToken) ? $value->metadata : $value;
                 $this->metadata = array_merge($this->metadata, $x);
+
                 return;
             }
             $offset = count($this->metadata);
@@ -67,7 +59,7 @@ class TPC_yyToken implements ArrayAccess
         }
     }
 
-    function offsetUnset($offset)
+    public function offsetUnset($offset)
     {
         unset($this->metadata[$offset]);
     }
@@ -80,37 +72,136 @@ class TPC_yyStackEntry
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-};
+}
 
+;
 
-#line 12 "smarty_internal_configfileparser.y"
-class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php"
+#line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
+
+/**
+ * Smarty Internal Plugin Configfileparse
+ *
+ * This is the config file parser.
+ * It is generated from the smarty_internal_configfileparser.y file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Configfileparser
 {
-#line 14 "smarty_internal_configfileparser.y"
+    #line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    // states whether the parse was successful or not
+    /**
+     * result status
+     *
+     * @var bool
+     */
     public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
     public $retvalue = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Configfilelexer
+     */
     private $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
     private $internalError = false;
 
-    function __construct($lex, $compiler) {
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = Array('\\' => '\\', '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    {
         // set instance object
         self::instance($this);
         $this->lex = $lex;
         $this->smarty = $compiler->smarty;
         $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
     }
+
+    /**
+     * @param null $new_instance
+     *
+     * @return null
+     */
     public static function &instance($new_instance = null)
     {
         static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
+        if (isset($new_instance) && is_object($new_instance)) {
             $instance = $new_instance;
+        }
         return $instance;
     }
 
-    private function parse_bool($str) {
-        if (in_array(strtolower($str) ,array('on','yes','true'))) {
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
             $res = true;
         } else {
             $res = false;
@@ -118,12 +209,20 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
         return $res;
     }
 
-    private static $escapes_single = Array('\\' => '\\',
-                                          '\'' => '\'');
-    private static function parse_single_quoted_string($qstr) {
-        $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
 
-        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
 
         $str = "";
         foreach ($ss as $s) {
@@ -131,28 +230,49 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
                 if (isset(self::$escapes_single[$s[1]])) {
                     $s = self::$escapes_single[$s[1]];
                 }
-             }
-
-             $str .= $s;
+            }
+            $str .= $s;
         }
-
         return $str;
     }
 
-    private static function parse_double_quoted_string($qstr) {
-        $inner_str = substr($qstr, 1, strlen($qstr)-2);
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
         return stripcslashes($inner_str);
     }
 
-    private static function parse_tripple_double_quoted_string($qstr) {
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
         return stripcslashes($qstr);
     }
 
-    private function set_var(Array $var, Array &$target_array) {
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(Array $var, Array &$target_array)
+    {
         $key = $var["key"];
         $value = $var["value"];
 
-        if ($this->smarty->config_overwrite || !isset($target_array['vars'][$key])) {
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
             $target_array['vars'][$key] = $value;
         } else {
             settype($target_array['vars'][$key], 'array');
@@ -160,16 +280,29 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
         }
     }
 
-    private function add_global_vars(Array $vars) {
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(Array $vars)
+    {
         if (!isset($this->compiler->config_data['vars'])) {
-      $this->compiler->config_data['vars'] = Array();
+            $this->compiler->config_data['vars'] = Array();
         }
         foreach ($vars as $var) {
             $this->set_var($var, $this->compiler->config_data);
         }
     }
 
-    private function add_section_vars($section_name, Array $vars) {
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, Array $vars)
+    {
         if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
             $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
         }
@@ -177,167 +310,135 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
             $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
         }
     }
-#line 173 "smarty_internal_configfileparser.php"
 
-    const TPC_OPENB                          =  1;
-    const TPC_SECTION                        =  2;
-    const TPC_CLOSEB                         =  3;
-    const TPC_DOT                            =  4;
-    const TPC_ID                             =  5;
-    const TPC_EQUAL                          =  6;
-    const TPC_FLOAT                          =  7;
-    const TPC_INT                            =  8;
-    const TPC_BOOL                           =  9;
-    const TPC_SINGLE_QUOTED_STRING           = 10;
-    const TPC_DOUBLE_QUOTED_STRING           = 11;
-    const TPC_TRIPPLE_QUOTES                 = 12;
-    const TPC_TRIPPLE_TEXT                   = 13;
-    const TPC_TRIPPLE_QUOTES_END             = 14;
-    const TPC_NAKED_STRING                   = 15;
-    const TPC_OTHER                          = 16;
-    const TPC_NEWLINE                        = 17;
-    const TPC_COMMENTSTART                   = 18;
+    const TPC_OPENB = 1;
+
+    const TPC_SECTION = 2;
+
+    const TPC_CLOSEB = 3;
+
+    const TPC_DOT = 4;
+
+    const TPC_ID = 5;
+
+    const TPC_EQUAL = 6;
+
+    const TPC_FLOAT = 7;
+
+    const TPC_INT = 8;
+
+    const TPC_BOOL = 9;
+
+    const TPC_SINGLE_QUOTED_STRING = 10;
+
+    const TPC_DOUBLE_QUOTED_STRING = 11;
+
+    const TPC_TRIPPLE_QUOTES = 12;
+
+    const TPC_TRIPPLE_TEXT = 13;
+
+    const TPC_TRIPPLE_QUOTES_END = 14;
+
+    const TPC_NAKED_STRING = 15;
+
+    const TPC_OTHER = 16;
+
+    const TPC_NEWLINE = 17;
+
+    const TPC_COMMENTSTART = 18;
+
     const YY_NO_ACTION = 60;
+
     const YY_ACCEPT_ACTION = 59;
+
     const YY_ERROR_ACTION = 58;
 
     const YY_SZ_ACTTAB = 38;
-static public $yy_action = array(
- /*     0 */    29,   30,   34,   33,   24,   13,   19,   25,   35,   21,
- /*    10 */    59,    8,    3,    1,   20,   12,   14,   31,   20,   12,
- /*    20 */    15,   17,   23,   18,   27,   26,    4,    5,    6,   32,
- /*    30 */     2,   11,   28,   22,   16,    9,    7,   10,
-    );
-    static public $yy_lookahead = array(
- /*     0 */     7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
- /*    10 */    20,   21,   23,   23,   17,   18,   13,   14,   17,   18,
- /*    20 */    15,    2,   17,    4,   25,   26,    6,    3,    3,   14,
- /*    30 */    23,    1,   24,   17,    2,   25,   22,   25,
-);
-    const YY_SHIFT_USE_DFLT = -8;
+
+    static public $yy_action = array(29, 30, 34, 33, 24, 13, 19, 25, 35, 21, 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, 15,
+        17, 23, 18, 27, 26, 4, 5, 6, 32, 2, 11, 28, 22, 16, 9, 7, 10,);
+
+    static public $yy_lookahead = array(7, 8, 9, 10, 11, 12, 5, 27, 15, 16, 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, 15,
+        2, 17, 4, 25, 26, 6, 3, 3, 14, 23, 1, 24, 17, 2, 25, 22, 25,);
+
+    const YY_SHIFT_USE_DFLT = - 8;
+
     const YY_SHIFT_MAX = 19;
-    static public $yy_shift_ofst = array(
- /*     0 */    -8,    1,    1,    1,   -7,   -3,   -3,   30,   -8,   -8,
- /*    10 */    -8,   19,    5,    3,   15,   16,   24,   25,   32,   20,
-);
-    const YY_REDUCE_USE_DFLT = -21;
+
+    static public $yy_shift_ofst = array(- 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32,
+        20,);
+
+    const YY_REDUCE_USE_DFLT = - 21;
+
     const YY_REDUCE_MAX = 10;
-    static public $yy_reduce_ofst = array(
- /*     0 */   -10,   -1,   -1,   -1,  -20,   10,   12,    8,   14,    7,
- /*    10 */   -11,
-);
-    static public $yyExpectedTokens = array(
-        /* 0 */ array(),
-        /* 1 */ array(5, 17, 18, ),
-        /* 2 */ array(5, 17, 18, ),
-        /* 3 */ array(5, 17, 18, ),
-        /* 4 */ array(7, 8, 9, 10, 11, 12, 15, 16, ),
-        /* 5 */ array(17, 18, ),
-        /* 6 */ array(17, 18, ),
-        /* 7 */ array(1, ),
-        /* 8 */ array(),
-        /* 9 */ array(),
-        /* 10 */ array(),
-        /* 11 */ array(2, 4, ),
-        /* 12 */ array(15, 17, ),
-        /* 13 */ array(13, 14, ),
-        /* 14 */ array(14, ),
-        /* 15 */ array(17, ),
-        /* 16 */ array(3, ),
-        /* 17 */ array(3, ),
-        /* 18 */ array(2, ),
-        /* 19 */ array(6, ),
-        /* 20 */ array(),
-        /* 21 */ array(),
-        /* 22 */ array(),
-        /* 23 */ array(),
-        /* 24 */ array(),
-        /* 25 */ array(),
-        /* 26 */ array(),
-        /* 27 */ array(),
-        /* 28 */ array(),
-        /* 29 */ array(),
-        /* 30 */ array(),
-        /* 31 */ array(),
-        /* 32 */ array(),
-        /* 33 */ array(),
-        /* 34 */ array(),
-        /* 35 */ array(),
-);
-    static public $yy_default = array(
- /*     0 */    44,   37,   41,   40,   58,   58,   58,   36,   39,   44,
- /*    10 */    44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
- /*    20 */    55,   54,   57,   56,   50,   45,   43,   42,   38,   46,
- /*    30 */    47,   52,   51,   49,   48,   53,
-);
+
+    static public $yy_reduce_ofst = array(- 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,);
+
+    static public $yyExpectedTokens = array(array(), array(5, 17, 18,), array(5, 17, 18,), array(5, 17, 18,),
+        array(7, 8, 9, 10, 11, 12, 15, 16,), array(17, 18,), array(17, 18,), array(1,), array(), array(), array(),
+        array(2, 4,), array(15, 17,), array(13, 14,), array(14,), array(17,), array(3,), array(3,), array(2,),
+        array(6,), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(),);
+
+    static public $yy_default = array(44, 37, 41, 40, 58, 58, 58, 36, 39, 44, 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+        55, 54, 57, 56, 50, 45, 43, 42, 38, 46, 47, 52, 51, 49, 48, 53,);
+
     const YYNOCODE = 29;
+
     const YYSTACKDEPTH = 100;
+
     const YYNSTATE = 36;
+
     const YYNRULE = 22;
+
     const YYERRORSYMBOL = 19;
+
     const YYERRSYMDT = 'yy0';
+
     const YYFALLBACK = 0;
-    static public $yyFallback = array(
-    );
-    static function Trace($TraceFILE, $zTracePrompt)
+
+    public static $yyFallback = array();
+
+    public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
             $zTracePrompt = 0;
         } elseif (!$zTracePrompt) {
             $TraceFILE = 0;
         }
-        self::$yyTraceFILE = $TraceFILE;
-        self::$yyTracePrompt = $zTracePrompt;
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
     }
 
-    static function PrintTrace()
+    public function PrintTrace()
     {
-        self::$yyTraceFILE = fopen('php://output', 'w');
-        self::$yyTracePrompt = '<br>';
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
     }
 
-    static public $yyTraceFILE;
-    static public $yyTracePrompt;
+    public $yyTraceFILE;
+
+    public $yyTracePrompt;
+
     public $yyidx;                    /* Index of top element in stack */
     public $yyerrcnt;                 /* Shifts left before out of the error */
     public $yystack = array();  /* The parser's stack */
 
-    public $yyTokenName = array(
-  '$',             'OPENB',         'SECTION',       'CLOSEB',
-  'DOT',           'ID',            'EQUAL',         'FLOAT',
-  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
-  'TRIPPLE_QUOTES',  'TRIPPLE_TEXT',  'TRIPPLE_QUOTES_END',  'NAKED_STRING',
-  'OTHER',         'NEWLINE',       'COMMENTSTART',  'error',
-  'start',         'global_vars',   'sections',      'var_list',
-  'section',       'newline',       'var',           'value',
-    );
+    public $yyTokenName = array('$', 'OPENB', 'SECTION', 'CLOSEB', 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL',
+        'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END',
+        'NAKED_STRING', 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', 'start', 'global_vars', 'sections', 'var_list',
+        'section', 'newline', 'var', 'value',);
 
-    static public $yyRuleName = array(
- /*   0 */ "start ::= global_vars sections",
- /*   1 */ "global_vars ::= var_list",
- /*   2 */ "sections ::= sections section",
- /*   3 */ "sections ::=",
- /*   4 */ "section ::= OPENB SECTION CLOSEB newline var_list",
- /*   5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list",
- /*   6 */ "var_list ::= var_list newline",
- /*   7 */ "var_list ::= var_list var",
- /*   8 */ "var_list ::=",
- /*   9 */ "var ::= ID EQUAL value",
- /*  10 */ "value ::= FLOAT",
- /*  11 */ "value ::= INT",
- /*  12 */ "value ::= BOOL",
- /*  13 */ "value ::= SINGLE_QUOTED_STRING",
- /*  14 */ "value ::= DOUBLE_QUOTED_STRING",
- /*  15 */ "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
- /*  16 */ "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
- /*  17 */ "value ::= NAKED_STRING",
- /*  18 */ "value ::= OTHER",
- /*  19 */ "newline ::= NEWLINE",
- /*  20 */ "newline ::= COMMENTSTART NEWLINE",
- /*  21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
-    );
+    public static $yyRuleName = array('start ::= global_vars sections', 'global_vars ::= var_list',
+        'sections ::= sections section', 'sections ::=', 'section ::= OPENB SECTION CLOSEB newline var_list',
+        'section ::= OPENB DOT SECTION CLOSEB newline var_list', 'var_list ::= var_list newline',
+        'var_list ::= var_list var', 'var_list ::=', 'var ::= ID EQUAL value', 'value ::= FLOAT', 'value ::= INT',
+        'value ::= BOOL', 'value ::= SINGLE_QUOTED_STRING', 'value ::= DOUBLE_QUOTED_STRING',
+        'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END', 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
+        'value ::= NAKED_STRING', 'value ::= OTHER', 'newline ::= NEWLINE', 'newline ::= COMMENTSTART NEWLINE',
+        'newline ::= COMMENTSTART NAKED_STRING NEWLINE',);
 
-    function tokenName($tokenType)
+    public function tokenName($tokenType)
     {
         if ($tokenType === 0) {
             return 'End of Input';
@@ -349,46 +450,54 @@ static public $yy_action = array(
         }
     }
 
-    static function yy_destructor($yymajor, $yypminor)
+    public static function yy_destructor($yymajor, $yypminor)
     {
         switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
+            default:
+                break;   /* If no destructor action specified: do nothing */
         }
     }
 
-    function yy_pop_parser_stack()
+    public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
-        if (self::$yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(self::$yyTraceFILE,
-                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx--;
+        $this->yyidx --;
+
         return $yymajor;
     }
 
-    function __destruct()
+    public function __destruct()
     {
         while ($this->yystack !== Array()) {
             $this->yy_pop_parser_stack();
         }
-        if (is_resource(self::$yyTraceFILE)) {
-            fclose(self::$yyTraceFILE);
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
         }
     }
 
-    function yy_get_expected_tokens($token)
+    public function yy_get_expected_tokens($token)
     {
+        static $res3 = array();
+        static $res4 = array();
         $state = $this->yystack[$this->yyidx]->stateno;
         $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -398,7 +507,7 @@ static public $yy_action = array(
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done ++ == 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -406,25 +515,30 @@ static public $yy_action = array(
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
                     if (isset(self::$yyExpectedTokens[$nextstate])) {
-		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                            if (in_array($token,
-                                  self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return array_unique($expected);
+                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
                         }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
-                        $this->yyidx++;
+                        $this->yyidx ++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -446,19 +560,28 @@ static public $yy_action = array(
             }
             break;
         } while (true);
-	$this->yyidx = $yyidx;
-	$this->yystack = $stack;
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
         return array_unique($expected);
     }
 
-    function yy_is_expected_token($token)
+    public function yy_is_expected_token($token)
     {
+        static $res = array();
+        static $res2 = array();
         if ($token === 0) {
             return true; // 0 is not part of this
         }
         $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -468,7 +591,7 @@ static public $yy_action = array(
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done ++ == 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -476,22 +599,27 @@ static public $yy_action = array(
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        return true;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
-                        $this->yyidx++;
+                        $this->yyidx ++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -519,10 +647,11 @@ static public $yy_action = array(
         } while (true);
         $this->yyidx = $yyidx;
         $this->yystack = $stack;
+
         return true;
     }
 
-   function yy_find_shift_action($iLookAhead)
+    public function yy_find_shift_action($iLookAhead)
     {
         $stateno = $this->yystack[$this->yyidx]->stateno;
 
@@ -539,24 +668,22 @@ static public $yy_action = array(
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if (self::$yyTraceFILE) {
-                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n");
                 }
+
                 return $this->yy_find_shift_action($iFallback);
             }
+
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
         }
     }
 
-    function yy_find_reduce_action($stateno, $iLookAhead)
+    public function yy_find_reduce_action($stateno, $iLookAhead)
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
 
@@ -571,213 +698,185 @@ static public $yy_action = array(
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
         }
     }
 
-    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
-        $this->yyidx++;
+        $this->yyidx ++;
         if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
-            if (self::$yyTraceFILE) {
-                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            $this->yyidx --;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
             }
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-#line 125 "smarty_internal_configfileparser.y"
+            #line 255 "../smarty/lexer/smarty_internal_configfileparser.y"
+
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
 
-    $this->internalError = true;
-    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
-#line 593 "smarty_internal_configfileparser.php"
             return;
         }
         $yytos = new TPC_yyStackEntry;
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
-        if (self::$yyTraceFILE && $this->yyidx > 0) {
-            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
-                $yyNewState);
-            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
-            for($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(self::$yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i ++) {
+                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]);
             }
-            fwrite(self::$yyTraceFILE,"\n");
+            fwrite($this->yyTraceFILE, "\n");
         }
     }
 
-    static public $yyRuleInfo = array(
-  array( 'lhs' => 20, 'rhs' => 2 ),
-  array( 'lhs' => 21, 'rhs' => 1 ),
-  array( 'lhs' => 22, 'rhs' => 2 ),
-  array( 'lhs' => 22, 'rhs' => 0 ),
-  array( 'lhs' => 24, 'rhs' => 5 ),
-  array( 'lhs' => 24, 'rhs' => 6 ),
-  array( 'lhs' => 23, 'rhs' => 2 ),
-  array( 'lhs' => 23, 'rhs' => 2 ),
-  array( 'lhs' => 23, 'rhs' => 0 ),
-  array( 'lhs' => 26, 'rhs' => 3 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 3 ),
-  array( 'lhs' => 27, 'rhs' => 2 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 25, 'rhs' => 1 ),
-  array( 'lhs' => 25, 'rhs' => 2 ),
-  array( 'lhs' => 25, 'rhs' => 3 ),
-    );
+    public static $yyRuleInfo = array(array(0 => 20, 1 => 2), array(0 => 21, 1 => 1), array(0 => 22, 1 => 2),
+        array(0 => 22, 1 => 0), array(0 => 24, 1 => 5), array(0 => 24, 1 => 6), array(0 => 23, 1 => 2),
+        array(0 => 23, 1 => 2), array(0 => 23, 1 => 0), array(0 => 26, 1 => 3), array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 3), array(0 => 27, 1 => 2), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
+        array(0 => 25, 1 => 1), array(0 => 25, 1 => 2), array(0 => 25, 1 => 3),);
 
-    static public $yyReduceMap = array(
-        0 => 0,
-        2 => 0,
-        3 => 0,
-        19 => 0,
-        20 => 0,
-        21 => 0,
-        1 => 1,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-        17 => 17,
-        18 => 17,
-    );
-#line 131 "smarty_internal_configfileparser.y"
-    function yy_r0(){
-    $this->_retvalue = null;
+    public static $yyReduceMap = array(0  => 0, 2 => 0, 3 => 0, 19 => 0, 20 => 0, 21 => 0, 1 => 1, 4 => 4, 5 => 5,
+                                       6  => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13,
+                                       14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 17,);
+
+    #line 261 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r0()
+    {
+        $this->_retvalue = null;
     }
-#line 666 "smarty_internal_configfileparser.php"
-#line 136 "smarty_internal_configfileparser.y"
-    function yy_r1(){
-    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;
+
+    #line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r1()
+    {
+        $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = null;
     }
-#line 671 "smarty_internal_configfileparser.php"
-#line 149 "smarty_internal_configfileparser.y"
-    function yy_r4(){
-    $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-    $this->_retvalue = null;
+
+    #line 280 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r4()
+    {
+        $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = null;
     }
-#line 677 "smarty_internal_configfileparser.php"
-#line 154 "smarty_internal_configfileparser.y"
-    function yy_r5(){
-    if ($this->smarty->config_read_hidden) {
-        $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+
+    #line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r5()
+    {
+        if ($this->configReadHidden) {
+            $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+        }
+        $this->_retvalue = null;
     }
-    $this->_retvalue = null;
+
+    #line 293 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r6()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
-#line 685 "smarty_internal_configfileparser.php"
-#line 162 "smarty_internal_configfileparser.y"
-    function yy_r6(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+
+    #line 297 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r7()
+    {
+        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
     }
-#line 690 "smarty_internal_configfileparser.php"
-#line 166 "smarty_internal_configfileparser.y"
-    function yy_r7(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
+
+    #line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r8()
+    {
+        $this->_retvalue = Array();
     }
-#line 695 "smarty_internal_configfileparser.php"
-#line 170 "smarty_internal_configfileparser.y"
-    function yy_r8(){
-    $this->_retvalue = Array();
+
+    #line 307 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r9()
+    {
+        $this->_retvalue = Array("key"   => $this->yystack[$this->yyidx + - 2]->minor,
+                                 "value" => $this->yystack[$this->yyidx + 0]->minor);
     }
-#line 700 "smarty_internal_configfileparser.php"
-#line 176 "smarty_internal_configfileparser.y"
-    function yy_r9(){
-    $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
+
+    #line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r10()
+    {
+        $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
     }
-#line 705 "smarty_internal_configfileparser.php"
-#line 181 "smarty_internal_configfileparser.y"
-    function yy_r10(){
-    $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
+
+    #line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r11()
+    {
+        $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
     }
-#line 710 "smarty_internal_configfileparser.php"
-#line 185 "smarty_internal_configfileparser.y"
-    function yy_r11(){
-    $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
+
+    #line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r12()
+    {
+        $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 715 "smarty_internal_configfileparser.php"
-#line 189 "smarty_internal_configfileparser.y"
-    function yy_r12(){
-    $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
+
+    #line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r13()
+    {
+        $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 720 "smarty_internal_configfileparser.php"
-#line 193 "smarty_internal_configfileparser.y"
-    function yy_r13(){
-    $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+
+    #line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r14()
+    {
+        $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
-#line 725 "smarty_internal_configfileparser.php"
-#line 197 "smarty_internal_configfileparser.y"
-    function yy_r14(){
-    $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+
+    #line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r15()
+    {
+        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor);
     }
-#line 730 "smarty_internal_configfileparser.php"
-#line 201 "smarty_internal_configfileparser.y"
-    function yy_r15(){
-    $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
+
+    #line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r16()
+    {
+        $this->_retvalue = '';
     }
-#line 735 "smarty_internal_configfileparser.php"
-#line 205 "smarty_internal_configfileparser.y"
-    function yy_r16(){
-    $this->_retvalue = '';
+
+    #line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
+    function yy_r17()
+    {
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
-#line 740 "smarty_internal_configfileparser.php"
-#line 209 "smarty_internal_configfileparser.y"
-    function yy_r17(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 745 "smarty_internal_configfileparser.php"
 
     private $_retvalue;
 
-    function yy_reduce($yyruleno)
+    public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$yyTracePrompt, $yyruleno,
-                self::$yyRuleName[$yyruleno]);
+        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno, self::$yyRuleName[$yyruleno]);
         }
 
         $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+        if (isset(self::$yyReduceMap[$yyruleno])) {
             // call the action
             $this->_retvalue = null;
             $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
         $this->yyidx -= $yysize;
-        for($i = $yysize; $i; $i--) {
+        for ($i = $yysize; $i; $i --) {
             // pop all of the right-hand side parameters
             array_pop($this->yystack);
         }
         $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
         if ($yyact < self::YYNSTATE) {
-            if (!self::$yyTraceFILE && $yysize) {
-                $this->yyidx++;
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx ++;
                 $x = new TPC_yyStackEntry;
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
@@ -791,73 +890,68 @@ static public $yy_action = array(
         }
     }
 
-    function yy_parse_failed()
+    public function yy_parse_failed()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
 
-    function yy_syntax_error($yymajor, $TOKEN)
+    public function yy_syntax_error($yymajor, $TOKEN)
     {
-#line 118 "smarty_internal_configfileparser.y"
+        #line 248 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_config_file_error();
-#line 808 "smarty_internal_configfileparser.php"
+        $this->internalError = true;
+        $this->yymajor = $yymajor;
+        $this->compiler->trigger_config_file_error();
     }
 
-    function yy_accept()
+    public function yy_accept()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+            $this->yy_pop_parser_stack();
         }
-#line 110 "smarty_internal_configfileparser.y"
+        #line 241 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    //echo $this->retvalue."\n\n";
-#line 826 "smarty_internal_configfileparser.php"
+        $this->successful = !$this->internalError;
+        $this->internalError = false;
+        $this->retvalue = $this->_retvalue;
     }
 
-    function doParse($yymajor, $yytokenvalue)
+    public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
 
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
-            $this->yyerrcnt = -1;
+            $this->yyerrcnt = - 1;
             $x = new TPC_yyStackEntry;
             $x->stateno = 0;
             $x->major = 0;
             $this->yystack = array();
-            array_push($this->yystack, $x);
+            $this->yystack[] = $x;
         }
-        $yyendofinput = ($yymajor==0);
+        $yyendofinput = ($yymajor == 0);
 
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sInput %s\n",
-                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
         }
 
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
+            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
             if ($yyact < self::YYNSTATE) {
                 $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt--;
+                $this->yyerrcnt --;
                 if ($yyendofinput && $this->yyidx >= 0) {
                     $yymajor = 0;
                 } else {
@@ -866,30 +960,25 @@ static public $yy_action = array(
             } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
                 $this->yy_reduce($yyact - self::YYNSTATE);
             } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if (self::$yyTraceFILE) {
-                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
-                        self::$yyTracePrompt);
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
                     $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
-                        if (self::$yyTraceFILE) {
-                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
-                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
-                        while ($this->yyidx >= 0 &&
-                                 $yymx != self::YYERRORSYMBOL &&
-        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                              ){
+                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL && ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
                             $this->yy_pop_parser_stack();
                         }
-                        if ($this->yyidx < 0 || $yymajor==0) {
+                        if ($this->yyidx < 0 || $yymajor == 0) {
                             $this->yy_destructor($yymajor, $yytokenvalue);
                             $this->yy_parse_failed();
                             $yymajor = self::YYNOCODE;
@@ -918,4 +1007,4 @@ static public $yy_action = array(
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
-?>
\ No newline at end of file
+
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_data.php b/sources/include/smarty/libs/sysplugins/smarty_internal_data.php
index 1d7b1d3..bba95d3 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_data.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_data.php
@@ -1,21 +1,35 @@
 <?php
 /**
  * Smarty Internal Plugin Data
+ * This file contains the basic classes and methods for template and variable creation
  *
- * This file contains the basic classes and methodes for template and variable creation
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
- * Base class with template and variable methodes
+ * Base class with template and variable methods
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
+ *
+ * @method mixed getConfigVars(string $varName = null, bool $searchParents = true)
+ * @method mixed getStreamVariable(string $variable)
+ * @method Smarty_Internal_Data clearAssign(mixed $tpl_var)
+ * @method Smarty_Internal_Data clearAllAssign()
+ * @method Smarty_Internal_Data clearConfig(string $varName = null)
+ * @method Smarty_Internal_Data configLoad(string $config_file, mixed $sections = null, string $scope = 'local')
+ * @property int $scope
  */
-class Smarty_Internal_Data {
+class Smarty_Internal_Data
+{
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 4;
 
     /**
      * name of class used for templates
@@ -23,534 +37,204 @@ class Smarty_Internal_Data {
      * @var string
      */
     public $template_class = 'Smarty_Internal_Template';
+
     /**
      * template variables
      *
-     * @var array
+     * @var Smarty_Variable[]
      */
     public $tpl_vars = array();
+
     /**
      * parent template (if any)
      *
-     * @var Smarty_Internal_Template
+     * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data
      */
     public $parent = null;
+
     /**
      * configuration settings
      *
-     * @var array
+     * @var string[]
      */
     public $config_vars = array();
 
+    /**
+     * extension handler
+     *
+     * @var Smarty_Internal_Extension_Handler
+     */
+    public $ext = null;
+
+    /**
+     * Smarty_Internal_Data constructor.
+     *
+     * Install extension handler
+     */
+    public function __construct()
+    {
+        $this->ext = new Smarty_Internal_Extension_Handler();
+        $this->ext->objType = $this->_objType;
+    }
+
     /**
      * assigns a Smarty variable
      *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed        $value   the value to assign
-     * @param boolean      $nocache if true any output of this variable will be not cached
-     * @param boolean $scope the scope the variable will have  (local,parent or root)
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @param  array|string $tpl_var the template variable name(s)
+     * @param  mixed        $value   the value to assign
+     * @param  boolean      $nocache if true any output of this variable will be not cached
+     *
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
+     *                              chaining
      */
     public function assign($tpl_var, $value = null, $nocache = false)
     {
         if (is_array($tpl_var)) {
             foreach ($tpl_var as $_key => $_val) {
                 if ($_key != '') {
-                    $this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache);
+                    $this->tpl_vars[$_key] = new Smarty_Variable($_val, $nocache);
+                    if ($this->_objType == 2 && $this->scope) {
+                        $this->ext->_updateScope->updateScope($this, $_key);
+                    }
                 }
             }
         } else {
             if ($tpl_var != '') {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache);
+                $this->tpl_vars[$tpl_var] = new Smarty_Variable($value, $nocache);
+                if ($this->_objType == 2 && $this->scope) {
+                    $this->ext->_updateScope->updateScope($this, $tpl_var);
+                }
             }
         }
-
-        return $this;
-    }
-
-    /**
-     * assigns a global Smarty variable
-     *
-     * @param string $varname the global variable name
-     * @param mixed  $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assignGlobal($varname, $value = null, $nocache = false)
-    {
-        if ($varname != '') {
-            Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
-            $ptr = $this;
-            while ($ptr instanceof Smarty_Internal_Template) {
-                $ptr->tpl_vars[$varname] = clone Smarty::$global_tpl_vars[$varname];
-                $ptr = $ptr->parent;
-            }
-        }
-
-        return $this;
-    }
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed $ &$value the referenced value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
-    {
-        if ($tpl_var != '') {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-            $this->tpl_vars[$tpl_var]->value = &$value;
-        }
-
         return $this;
     }
 
     /**
      * appends values to template variables
      *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed        $value   the value to append
-     * @param boolean      $merge   flag if array elements shall be merged
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @api  Smarty::append()
+     * @link http://www.smarty.net/docs/en/api.append.tpl
+     *
+     * @param  array|string $tpl_var                                           the template variable name(s)
+     * @param  mixed        $value                                             the value to append
+     * @param  bool         $merge                                             flag if array elements shall be merged
+     * @param  bool         $nocache                                           if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
     public function append($tpl_var, $value = null, $merge = false, $nocache = false)
     {
-        if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    if (!isset($this->tpl_vars[$_key])) {
-                        $tpl_var_inst = $this->getVariable($_key, null, true, false);
-                        if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                            $this->tpl_vars[$_key] = new Smarty_variable(null, $nocache);
-                        } else {
-                            $this->tpl_vars[$_key] = clone $tpl_var_inst;
-                        }
-                    }
-                    if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
-                        settype($this->tpl_vars[$_key]->value, 'array');
-                    }
-                    if ($merge && is_array($_val)) {
-                        foreach($_val as $_mkey => $_mval) {
-                            $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
-                        }
-                    } else {
-                        $this->tpl_vars[$_key]->value[] = $_val;
-                    }
-                }
-            }
-        } else {
-            if ($tpl_var != '' && isset($value)) {
-                if (!isset($this->tpl_vars[$tpl_var])) {
-                    $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
-                    if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                        $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-                    } else {
-                        $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
-                    }
-                }
-                if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                    settype($this->tpl_vars[$tpl_var]->value, 'array');
-                }
-                if ($merge && is_array($value)) {
-                    foreach($value as $_mkey => $_mval) {
-                        $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
-                    }
-                } else {
-                    $this->tpl_vars[$tpl_var]->value[] = $value;
-                }
-            }
-        }
+        return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
+    }
 
-        return $this;
+    /**
+     * assigns a global Smarty variable
+     *
+     * @param  string  $varName the global variable name
+     * @param  mixed   $value   the value to assign
+     * @param  boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignGlobal($varName, $value = null, $nocache = false)
+    {
+        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
     }
 
     /**
      * appends values to template variables by reference
      *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to append
-     * @param boolean $merge  flag if array elements shall be merged
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @param  string  $tpl_var the template variable name
+     * @param  mixed   &$value  the referenced value to append
+     * @param  boolean $merge   flag if array elements shall be merged
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
     public function appendByRef($tpl_var, &$value, $merge = false)
     {
-        if ($tpl_var != '' && isset($value)) {
-            if (!isset($this->tpl_vars[$tpl_var])) {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable();
-            }
-            if (!is_array($this->tpl_vars[$tpl_var]->value)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
-            if ($merge && is_array($value)) {
-                foreach($value as $_key => $_val) {
-                    $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
-                }
-            } else {
-                $this->tpl_vars[$tpl_var]->value[] = &$value;
-            }
-        }
+        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
+    }
 
-        return $this;
+    /**
+     * assigns values to template variables by reference
+     *
+     * @param string   $tpl_var the template variable name
+     * @param          $value
+     * @param  boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignByRef($tpl_var, &$value, $nocache = false)
+    {
+        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
     }
 
     /**
      * Returns a single or all template variables
      *
-     * @param string  $varname        variable name or null
-     * @param string  $_ptr           optional pointer to data object
-     * @param boolean $search_parents include parent templates?
-     * @return string variable value or or array of variables
-     */
-    public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
-    {
-        if (isset($varname)) {
-            $_var = $this->getVariable($varname, $_ptr, $search_parents, false);
-            if (is_object($_var)) {
-                return $_var->value;
-            } else {
-                return null;
-            }
-        } else {
-            $_result = array();
-            if ($_ptr === null) {
-                $_ptr = $this;
-            } while ($_ptr !== null) {
-                foreach ($_ptr->tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-                // not found, try at parent
-                if ($search_parents) {
-                    $_ptr = $_ptr->parent;
-                } else {
-                    $_ptr = null;
-                }
-            }
-            if ($search_parents && isset(Smarty::$global_tpl_vars)) {
-                foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-            }
-            return $_result;
-        }
-    }
-
-    /**
-     * clear the given assigned template variable.
+     * @api  Smarty::getTemplateVars()
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
-     * @param string|array $tpl_var the template variable(s) to clear
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearAssign($tpl_var)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $curr_var) {
-                unset($this->tpl_vars[$curr_var]);
-            }
-        } else {
-            unset($this->tpl_vars[$tpl_var]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * clear all the assigned template variables.
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearAllAssign()
-    {
-        $this->tpl_vars = array();
-        return $this;
-    }
-
-    /**
-     * load a config file, optionally load just selected sections
+     * @param  string                                                 $varName       variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param  bool                                                   $searchParents include parent templates?
      *
-     * @param string $config_file filename
-     * @param mixed  $sections    array of section names, single section or null
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return mixed variable value or or array of variables
      */
-    public function configLoad($config_file, $sections = null)
+    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
     {
-        // load Config class
-        $config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
-        $config->loadConfigVars($sections);
-        return $this;
+        return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
     }
 
     /**
      * gets the object of a Smarty variable
      *
-     * @param string  $variable the name of the Smarty variable
-     * @param object  $_ptr     optional pointer to data object
-     * @param boolean $search_parents search also in parent data
-     * @return object the object of the variable
-     */
-    public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
-    {
-        if ($_ptr === null) {
-            $_ptr = $this;
-        } while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[$variable])) {
-                // found it, return it
-                return $_ptr->tpl_vars[$variable];
-            }
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset(Smarty::$global_tpl_vars[$variable])) {
-            // found it, return it
-            return Smarty::$global_tpl_vars[$variable];
-        }
-        if ($this->smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-        return new Undefined_Smarty_Variable;
-    }
-
-    /**
-     * gets  a config variable
+     * @param  string  $variable       the name of the Smarty variable
+     * @param  Smarty_Internal_Data  $_ptr           optional pointer to data object
+     * @param  boolean $searchParents search also in parent data
+     * @param bool     $error_enable
      *
-     * @param string $variable the name of the config variable
-     * @return mixed the value of the config variable
+     * @return Smarty_Variable|Smarty_Undefined_Variable the object of the variable
+     * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
      */
-    public function getConfigVariable($variable, $error_enable = true)
-    {
-        $_ptr = $this;
-        while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[$variable])) {
-                // found it, return it
-                return $_ptr->config_vars[$variable];
-            }
-            // not found, try at parent
-            $_ptr = $_ptr->parent;
-        }
-        if ($this->smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-        return null;
+    public function getVariable($variable = null, Smarty_Internal_Data $_ptr = null, $searchParents = true, $error_enable = true){
+        return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
     }
-
+    
     /**
-     * gets  a stream variable
+     * Follow the parent chain an merge template and config variables
      *
-     * @param string $variable the stream of the variable
-     * @return mixed the value of the stream variable
+     * @param \Smarty_Internal_Data|null $data
      */
-    public function getStreamVariable($variable)
+    public function _mergeVars(Smarty_Internal_Data $data = null)
     {
-        $_result = '';
-        $fp = fopen($variable, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false ) {
-                $_result .= $current_line;
+        if (isset($data)) {
+            if (!empty($this->tpl_vars)) {
+                $data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
+            }
+            if (!empty($this->config_vars)) {
+                $data->config_vars = array_merge($this->config_vars, $data->config_vars);
             }
-            fclose($fp);
-            return $_result;
-        }
-
-        if ($this->smarty->error_unassigned) {
-            throw new SmartyException('Undefined stream variable "' . $variable . '"');
         } else {
-            return null;
+            $data = $this;
+        }
+        if (isset($this->parent)) {
+            $this->parent->_mergeVars($data);
         }
     }
 
     /**
-     * Returns a single or all config variables
+     * Handle unknown class methods
      *
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
-     */
-    public function getConfigVars($varname = null, $search_parents = true)
-    {
-        $_ptr = $this;
-        $var_array = array();
-        while ($_ptr !== null) {
-            if (isset($varname)) {
-                if (isset($_ptr->config_vars[$varname])) {
-                    return $_ptr->config_vars[$varname];
-                }
-            } else {
-                $var_array = array_merge($_ptr->config_vars, $var_array);
-            }
-             // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset($varname)) {
-            return '';
-        } else {
-            return $var_array;
-        }
-    }
-
-    /**
-     * Deassigns a single or all config variables
+     * @param string $name unknown method-name
+     * @param array  $args argument array
      *
-     * @param string $varname variable name or null
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return mixed
+     * @throws SmartyException
      */
-    public function clearConfig($varname = null)
+    public function __call($name, $args)
     {
-        if (isset($varname)) {
-            unset($this->config_vars[$varname]);
-        } else {
-            $this->config_vars = array();
-        }
-        return $this;
+        return $this->ext->_callExternalMethod($this, $name, $args);
     }
-
 }
-
-/**
- * class for the Smarty data object
- *
- * The Smarty data object will hold Smarty variables in the current scope
- *
- * @package Smarty
- * @subpackage Template
- */
-class Smarty_Data extends Smarty_Internal_Data {
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Smarty data object
-     *
-     * @param Smarty|array $_parent  parent template
-     * @param Smarty       $smarty   global smarty instance
-     */
-    public function __construct ($_parent = null, $smarty = null)
-    {
-        $this->smarty = $smarty;
-        if (is_object($_parent)) {
-            // when object set up back pointer
-            $this->parent = $_parent;
-        } elseif (is_array($_parent)) {
-            // set up variable values
-            foreach ($_parent as $_key => $_val) {
-                $this->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        } elseif ($_parent != null) {
-            throw new SmartyException("Wrong type for template variables");
-        }
-    }
-
-}
-
-/**
- * class for the Smarty variable object
- *
- * This class defines the Smarty variable object
- *
- * @package Smarty
- * @subpackage Template
- */
-class Smarty_Variable {
-
-    /**
-     * template variable
-     *
-     * @var mixed
-     */
-    public $value = null;
-    /**
-     * if true any output of this variable will be not cached
-     *
-     * @var boolean
-     */
-    public $nocache = false;
-    /**
-     * the scope the variable will have  (local,parent or root)
-     *
-     * @var int
-     */
-    public $scope = Smarty::SCOPE_LOCAL;
-
-    /**
-     * create Smarty variable object
-     *
-     * @param mixed   $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @param int     $scope   the scope the variable will have  (local,parent or root)
-     */
-    public function __construct($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        $this->value = $value;
-        $this->nocache = $nocache;
-        $this->scope = $scope;
-    }
-
-    /**
-     * <<magic>> String conversion
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->value;
-    }
-
-}
-
-/**
- * class for undefined variable object
- *
- * This class defines an object for undefined variable handling
- *
- * @package Smarty
- * @subpackage Template
- */
-class Undefined_Smarty_Variable {
-
-    /**
-     * Returns FALSE for 'nocache' and NULL otherwise.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function __get($name)
-    {
-        if ($name == 'nocache') {
-            return false;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Always returns an empty string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return "";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_debug.php b/sources/include/smarty/libs/sysplugins/smarty_internal_debug.php
index 2aea13f..0cbd549 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_debug.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_debug.php
@@ -1,184 +1,362 @@
 <?php
 /**
  * Smarty Internal Plugin Debug
+ * Class to collect data for the Smarty Debugging Console
  *
- * Class to collect data for the Smarty Debugging Consol
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Debug
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Debug Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Debug
  */
-class Smarty_Internal_Debug extends Smarty_Internal_Data {
-
+class Smarty_Internal_Debug extends Smarty_Internal_Data
+{
     /**
      * template data
      *
      * @var array
      */
-    public static $template_data = array();
+    public $template_data = array();
 
     /**
-     * Start logging of compile time
+     * List of uid's which shall be ignored
      *
-     * @param object $template
+     * @var array
      */
-    public static function start_compile($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
-    }
+    public $ignore_uid = array();
 
     /**
-     * End logging of compile time
+     * Index of display() and fetch() calls
      *
-     * @param object $template
+     * @var int
      */
-    public static function end_compile($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-    }
+    public $index = 0;
 
     /**
-     * Start logging of render time
+     * Counter for window offset
      *
-     * @param object $template
+     * @var int
      */
-    public static function start_render($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
-    }
+    public $offset = 0;
 
     /**
-     * End logging of compile time
+     * Start logging template
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template template
+     * @param null                      $mode     true: display   false: fetch  null: subtemplate
      */
-    public static function end_render($template)
+    public function start_template(Smarty_Internal_Template $template, $mode = null)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-    }
-
-    /**
-     * Start logging of cache time
-     *
-     * @param object $template cached template
-     */
-    public static function start_cache($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
+        if (isset($mode)) {
+            $this->index ++;
+            $this->offset ++;
+            $this->template_data[$this->index] = null;
+        }
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['start_template_time'] = microtime(true);
     }
 
     /**
      * End logging of cache time
      *
-     * @param object $template cached template
+     * @param \Smarty_Internal_Template $template cached template
      */
-    public static function end_cache($template)
+    public function end_template(Smarty_Internal_Template $template)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['total_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_template_time'];
+        //$this->template_data[$this->index][$key]['properties'] = $template->properties;
     }
 
     /**
-     * Opens a window for the Smarty Debugging Consol and display the data
+     * Start logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function start_compile(Smarty_Internal_Template $template)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        if (!empty($template->compiler->trace_uid)) {
+            $key = $template->compiler->trace_uid;
+            if (!isset($this->template_data[$this->index][$key])) {
+                if (isset($_is_stringy[$template->source->type])) {
+                    $this->template_data[$this->index][$key]['name'] =
+                        '\'' . substr($template->source->name, 0, 25) . '...\'';
+                } else {
+                    $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
+                }
+                $this->template_data[$this->index][$key]['compile_time'] = 0;
+                $this->template_data[$this->index][$key]['render_time'] = 0;
+                $this->template_data[$this->index][$key]['cache_time'] = 0;
+            }
+        } else {
+            if (isset($this->ignore_uid[$template->source->uid])) {
+                return;
+            }
+            $key = $this->get_key($template);
+        }
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function end_compile(Smarty_Internal_Template $template)
+    {
+        if (!empty($template->compiler->trace_uid)) {
+            $key = $template->compiler->trace_uid;
+        } else {
+            if (isset($this->ignore_uid[$template->source->uid])) {
+                return;
+            }
+
+            $key = $this->get_key($template);
+        }
+        $this->template_data[$this->index][$key]['compile_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
+    }
+
+    /**
+     * Start logging of render time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function start_render(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function end_render(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['render_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
+    }
+
+    /**
+     * Start logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function start_cache(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_cache(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['cache_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
+    }
+
+    /**
+     * Register template object
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function register_template(Smarty_Internal_Template $template)
+    {
+    }
+
+    /**
+     * Register data object
+     *
+     * @param \Smarty_Data $data data object
+     */
+    public static function register_data(Smarty_Data $data)
+    {
+    }
+
+    /**
+     * Opens a window for the Smarty Debugging Console and display the data
      *
      * @param Smarty_Internal_Template|Smarty $obj object to debug
+     * @param bool                            $full
      */
-    public static function display_debug($obj)
+    public function display_debug($obj, $full = false)
     {
-        // prepare information of assigned variables
-        $ptr = self::get_debug_vars($obj);
-        if ($obj instanceof Smarty) {
-            $smarty = clone $obj;
-        } else {
-            $smarty = clone $obj->smarty;
+        if (!$full) {
+            $this->offset ++;
+            $savedIndex = $this->index;
+            $this->index = 9999;
         }
+        if ($obj->_objType == 1) {
+            $smarty = $obj;
+        } else {
+            $smarty = $obj->smarty;
+        }
+        // create fresh instance of smarty for displaying the debug console
+        // to avoid problems if the application did overload the Smarty class
+        $debObj = new Smarty();
+        // copy the working dirs from application
+        $debObj->setCompileDir($smarty->getCompileDir());
+        // init properties by hand as user may have edited the original Smarty class
+        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
+        $debObj->force_compile = false;
+        $debObj->compile_check = true;
+        $debObj->left_delimiter = '{';
+        $debObj->right_delimiter = '}';
+        $debObj->security_policy = null;
+        $debObj->debugging = false;
+        $debObj->debugging_ctrl = 'NONE';
+        $debObj->error_reporting = E_ALL & ~E_NOTICE;
+        $debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
+        $debObj->registered_plugins = array();
+        $debObj->registered_resources = array();
+        $debObj->registered_filters = array();
+        $debObj->autoload_filters = array();
+        $debObj->default_modifiers = array();
+        $debObj->escape_html = true;
+        $debObj->caching = false;
+        $debObj->compile_id = null;
+        $debObj->cache_id = null;
+        // prepare information of assigned variables
+        $ptr = $this->get_debug_vars($obj);
         $_assigned_vars = $ptr->tpl_vars;
         ksort($_assigned_vars);
         $_config_vars = $ptr->config_vars;
         ksort($_config_vars);
-        $smarty->registered_filters = array();
-        $smarty->autoload_filters = array();
-        $smarty->default_modifiers = array();
-        $smarty->force_compile = false;
-        $smarty->left_delimiter = '{';
-        $smarty->right_delimiter = '}';
-        $smarty->debugging = false;
-        $smarty->force_compile = false;
-        $_template = new Smarty_Internal_Template($smarty->debug_tpl, $smarty);
-        $_template->caching = false;
-        $_template->disableSecurity();
-        $_template->cache_id = null;
-        $_template->compile_id = null;
-        if ($obj instanceof Smarty_Internal_Template) {
+        $debugging = $smarty->debugging;
+
+        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
+        if ($obj->_objType == 2) {
             $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
         }
-        if ($obj instanceof Smarty) {
-            $_template->assign('template_data', self::$template_data);
+        if ($obj->_objType == 1 || $full) {
+            $_template->assign('template_data', $this->template_data[$this->index]);
         } else {
             $_template->assign('template_data', null);
         }
         $_template->assign('assigned_vars', $_assigned_vars);
         $_template->assign('config_vars', $_config_vars);
         $_template->assign('execution_time', microtime(true) - $smarty->start_time);
+        $_template->assign('display_mode', $debugging == 2 || !$full);
+        $_template->assign('offset', $this->offset * 50);
         echo $_template->fetch();
+        if (isset($full)) {
+            $this->index --;
+        }
+        if (!$full) {
+            $this->index = $savedIndex;
+        }
     }
 
     /**
      * Recursively gets variables from all template/data scopes
      *
-     * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
+     * @param  Smarty_Internal_Template|Smarty_Data $obj object to debug
+     *
      * @return StdClass
      */
-    public static function get_debug_vars($obj)
+    public function get_debug_vars($obj)
     {
-        $config_vars = $obj->config_vars;
+        $config_vars = array();
+        foreach ($obj->config_vars as $key => $var) {
+            $config_vars[$key]['value'] = $var;
+            if ($obj->_objType == 2) {
+                $config_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_objType == 4) {
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
+            } else {
+                $config_vars[$key]['scope'] = 'Smarty object';
+            }
+        }
         $tpl_vars = array();
         foreach ($obj->tpl_vars as $key => $var) {
-            $tpl_vars[$key] = clone $var;
-            if ($obj instanceof Smarty_Internal_Template) {
-                $tpl_vars[$key]->scope = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj instanceof Smarty_Data) {
-                $tpl_vars[$key]->scope = 'Data object';
+            foreach ($var as $varkey => $varvalue) {
+                if ($varkey == 'value') {
+                    $tpl_vars[$key][$varkey] = $varvalue;
+                } else {
+                    if ($varkey == 'nocache') {
+                        if ($varvalue == true) {
+                            $tpl_vars[$key][$varkey] = $varvalue;
+                        }
+                    } else {
+                        if ($varkey != 'scope' || $varvalue !== 0) {
+                            $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
+                        }
+                    }
+                }
+            }
+            if ($obj->_objType == 2) {
+                $tpl_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_objType == 4) {
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
             } else {
-                $tpl_vars[$key]->scope = 'Smarty root';
+                $tpl_vars[$key]['scope'] = 'Smarty object';
             }
         }
 
         if (isset($obj->parent)) {
-            $parent = self::get_debug_vars($obj->parent);
+            $parent = $this->get_debug_vars($obj->parent);
+            foreach ($parent->tpl_vars as $name => $pvar) {
+                if (isset($tpl_vars[$name]) && $tpl_vars[$name]['value'] === $pvar['value']) {
+                    $tpl_vars[$name]['scope'] = $pvar['scope'];
+                }
+            }
             $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+
+            foreach ($parent->config_vars as $name => $pvar) {
+                if (isset($config_vars[$name]) && $config_vars[$name]['value'] === $pvar['value']) {
+                    $config_vars[$name]['scope'] = $pvar['scope'];
+                }
+            }
             $config_vars = array_merge($parent->config_vars, $config_vars);
         } else {
-            foreach (Smarty::$global_tpl_vars as $name => $var) {
-                if (!array_key_exists($name, $tpl_vars)) {
-                    $clone = clone $var;
-                    $clone->scope = 'Global';
-                    $tpl_vars[$name] = $clone;
+            foreach (Smarty::$global_tpl_vars as $key => $var) {
+                if (!array_key_exists($key, $tpl_vars)) {
+                    foreach ($var as $varkey => $varvalue) {
+                        if ($varkey == 'value') {
+                            $tpl_vars[$key][$varkey] = $varvalue;
+                        } else {
+                            if ($varkey == 'nocache') {
+                                if ($varvalue == true) {
+                                    $tpl_vars[$key][$varkey] = $varvalue;
+                                }
+                            } else {
+                                if ($varkey != 'scope' || $varvalue !== 0) {
+                                    $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
+                                }
+                            }
+                        }
+                    }
+                    $tpl_vars[$key]['scope'] = 'Global';
                 }
             }
         }
+
         return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
     }
 
     /**
      * Return key into $template_data for template
      *
-     * @param object $template  template object
-     * @return string   key into $template_data
+     * @param \Smarty_Internal_Template $template template object
+     *
+     * @return string key into $template_data
      */
-    private static function get_key($template)
+    private function get_key(Smarty_Internal_Template $template)
     {
         static $_is_stringy = array('string' => true, 'eval' => true);
         // calculate Uid if not already done
@@ -186,21 +364,67 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data {
             $template->source->filepath;
         }
         $key = $template->source->uid;
-        if (isset(self::$template_data[$key])) {
+        if (isset($this->template_data[$this->index][$key])) {
             return $key;
         } else {
             if (isset($_is_stringy[$template->source->type])) {
-                self::$template_data[$key]['name'] = '\''.substr($template->source->name,0,25).'...\'';
+                $this->template_data[$this->index][$key]['name'] =
+                    '\'' . substr($template->source->name, 0, 25) . '...\'';
             } else {
-                self::$template_data[$key]['name'] = $template->source->filepath;
+                $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
             }
-            self::$template_data[$key]['compile_time'] = 0;
-            self::$template_data[$key]['render_time'] = 0;
-            self::$template_data[$key]['cache_time'] = 0;
+            $this->template_data[$this->index][$key]['compile_time'] = 0;
+            $this->template_data[$this->index][$key]['render_time'] = 0;
+            $this->template_data[$this->index][$key]['cache_time'] = 0;
+            $this->template_data[$this->index][$key]['total_time'] = 0;
+
             return $key;
         }
     }
 
-}
+    /**
+     * Ignore template
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function ignore(Smarty_Internal_Template $template)
+    {
+        // calculate Uid if not already done
+        if ($template->source->uid == '') {
+            $template->source->filepath;
+        }
+        $this->ignore_uid[$template->source->uid] = true;
+    }
 
-?>
\ No newline at end of file
+    /**
+     * handle 'URL' debugging mode
+     *
+     * @param Smarty $smarty
+     */
+    public function debugUrl(Smarty $smarty)
+    {
+        if (isset($_SERVER['QUERY_STRING'])) {
+            $_query_string = $_SERVER['QUERY_STRING'];
+        } else {
+            $_query_string = '';
+        }
+        if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
+            if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
+                // enable debugging for this browser session
+                setcookie('SMARTY_DEBUG', true);
+                $smarty->debugging = true;
+            } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
+                // disable debugging for this browser session
+                setcookie('SMARTY_DEBUG', false);
+                $smarty->debugging = false;
+            } else {
+                // enable debugging for this page
+                $smarty->debugging = true;
+            }
+        } else {
+            if (isset($_COOKIE['SMARTY_DEBUG'])) {
+                $smarty->debugging = true;
+            }
+        }
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_extension_clear.php b/sources/include/smarty/libs/sysplugins/smarty_internal_extension_clear.php
new file mode 100644
index 0000000..00edc5a
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_extension_clear.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Smarty Extension Clear
+ *
+ * $smarty->clear() method file cache file resource
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Extension_Clear
+{
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public static function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+        $_dir = $smarty->getCacheDir();
+        if ($_dir == '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_dir_length = strlen($_dir);
+        if (isset($_cache_id)) {
+            $_cache_id_parts = explode('|', $_cache_id);
+            $_cache_id_parts_count = count($_cache_id_parts);
+            if ($smarty->use_sub_dirs) {
+                foreach ($_cache_id_parts as $id_part) {
+                    $_dir .= $id_part . DS;
+                }
+            }
+        }
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = true;
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+
+            // remove from template cache
+            $tpl->source; // have the template registered before unset()
+
+            if ($tpl->source->exists) {
+                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
+            } else {
+                return 0;
+            }
+        }
+        $_count = 0;
+        $_time = time();
+        if (file_exists($_dir)) {
+            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+            foreach ($_cache as $_file) {
+                if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                    continue;
+                }
+                // directory ?
+                if ($_file->isDir()) {
+                    if (!$_cache->isDot()) {
+                        // delete folder if empty
+                        @rmdir($_file->getPathname());
+                    }
+                } else {
+                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string) $_file, $_dir_length)));
+                    $_parts_count = count($_parts);
+                    // check name
+                    if (isset($resource_name)) {
+                        if ($_parts[$_parts_count - 1] != $_resourcename_parts) {
+                            continue;
+                        }
+                    }
+                    // check compile id
+                    if (isset($_compile_id) && (!isset($_parts[$_parts_count - 2 - $_compile_id_offset]) ||
+                            $_parts[$_parts_count - 2 - $_compile_id_offset] != $_compile_id)
+                    ) {
+                        continue;
+                    }
+                    // check cache id
+                    if (isset($_cache_id)) {
+                        // count of cache id parts
+                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
+                            $_parts_count - 1 - $_compile_id_offset;
+                        if ($_parts_count < $_cache_id_parts_count) {
+                            continue;
+                        }
+                        for ($i = 0; $i < $_cache_id_parts_count; $i ++) {
+                            if ($_parts[$i] != $_cache_id_parts[$i]) {
+                                continue 2;
+                            }
+                        }
+                    }
+                    // expired ?
+                    if (isset($exp_time)) {
+                        if ($exp_time < 0) {
+                            preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
+                            if ($_time < (@filemtime($_file) + $match[1])) {
+                                continue;
+                            }
+                        } else {
+                            if ($_time - @filemtime($_file) < $exp_time) {
+                                continue;
+                            }
+                        }
+                    }
+                    $_count += @unlink((string) $_file) ? 1 : 0;
+                    if (function_exists('opcache_invalidate')) {
+                        opcache_invalidate((string) $_file);
+                    }
+                }
+            }
+        }
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php
new file mode 100644
index 0000000..68012d8
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * Smarty Extension handler
+ *
+ * Load extensions dynamically
+ *
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ * @property Smarty_Internal_Runtime_Inheritance      $_inheritance
+ * @property Smarty_Internal_Runtime_SubTemplate      $_subTemplate
+ * @property Smarty_Internal_Runtime_TplFunction      $_tplFunction
+ * @property Smarty_Internal_Runtime_Var              $_var
+ * @property Smarty_Internal_Runtime_Config           $_config
+ * @property Smarty_Internal_Runtime_Foreach          $_foreach
+ * @property Smarty_Internal_Runtime_Hhvm             $_hhvm
+ * @property Smarty_Internal_Runtime_WriteFile        $_writeFile
+ * @property Smarty_Internal_Runtime_ValidateCompiled $_validateCompiled
+ * @property Smarty_Internal_Runtime_CodeFrame        $_codeFrame
+ * @property Smarty_Internal_Runtime_FilterHandler    $_filterHandler
+ * @property Smarty_Internal_Runtime_GetIncludePath   $_getIncludePath
+ * @property Smarty_Internal_Runtime_UpdateScope      $_updateScope
+ * @property Smarty_Internal_Runtime_IsCached         $_isCached
+ * @property Smarty_Internal_Runtime_CacheModify      $_cacheModify
+ * @property Smarty_Internal_Runtime_UpdateCache      $_updateCache
+ * @property Smarty_Internal_Method_GetTemplateVars   $getTemplateVars
+ * @property Smarty_Internal_Method_Append            $append
+ * @property Smarty_Internal_Method_AppendByRef       $appendByRef
+ * @property Smarty_Internal_Method_AssignGlobal      $assignGlobal
+ * @property Smarty_Internal_Method_AssignByRef       $assignByRef
+ * @property Smarty_Internal_Method_LoadFilter        $loadFilter
+ * @property Smarty_Internal_Method_LoadPlugin        $loadPlugin
+ * @property Smarty_Internal_Method_RegisterFilter    $registerFilter
+ * @property Smarty_Internal_Method_RegisterObject    $registerObject
+ * @property Smarty_Internal_Method_RegisterPlugin    $registerPlugin
+ */
+class Smarty_Internal_Extension_Handler
+{
+
+    public $objType = null;
+
+    /**
+     * Cache for property information from generic getter/setter
+     * Preloaded with names which should not use with generic getter/setter
+     *
+     * @var array
+     */
+    private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
+                                    'DebugTemplate'   => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
+                                    'TemplateVars'    => 0,);#
+
+    private $resolvedProperties = array();
+
+    /**
+     * Call external Method
+     *
+     * @param \Smarty_Internal_Data $data
+     * @param string                $name external method names
+     * @param array                 $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
+    {
+        /* @var Smarty $data ->smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if (!isset($smarty->ext->$name)) {
+            $class = 'Smarty_Internal_Method_' . ucfirst($name);
+            if (preg_match('/^(set|get)([A-Z].*)$/', $name, $match)) {
+                if (!isset($this->_property_info[$prop = $match[2]])) {
+                    // convert camel case to underscored name
+                    $this->resolvedProperties[$prop] = $pn = strtolower(join('_',
+                                                                             preg_split('/([A-Z][^A-Z]*)/', $prop, - 1,
+                                                                                        PREG_SPLIT_NO_EMPTY |
+                                                                                        PREG_SPLIT_DELIM_CAPTURE)));
+                    $this->_property_info[$prop] = property_exists($data, $pn) ? 1 :
+                        ($data->_objType == 2 && property_exists($smarty, $pn) ? 2 : 0);
+                }
+                if ($this->_property_info[$prop]) {
+                    $pn = $this->resolvedProperties[$prop];
+                    if ($match[1] == 'get') {
+                        return $this->_property_info[$prop] == 1 ? $data->$pn : $data->smarty->$pn;
+                    } else {
+                        return $this->_property_info[$prop] == 1 ? $data->$pn = $args[0] :
+                            $data->smarty->$pn = $args[0];
+                    }
+                } elseif (!class_exists($class)) {
+                    throw new SmartyException("property '$pn' does not exist.");
+                }
+            }
+            if (class_exists($class)) {
+                $callback = array($smarty->ext->$name = new $class(), $name);
+            }
+        } else {
+            $callback = array($smarty->ext->$name, $name);
+        }
+        array_unshift($args, $data);
+        if (isset($callback) && $callback[0]->objMap | $data->_objType) {
+            return call_user_func_array($callback, $args);
+        }
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+    }
+
+    /**
+     * set extension property
+     *
+     * @param string $property_name property name
+     * @param mixed  $value         value
+     *
+     * @throws SmartyException
+     */
+    public function __set($property_name, $value)
+    {
+        $this->$property_name = $value;
+    }
+
+    /**
+     * get extension object
+     *
+     * @param string $property_name property name
+     *
+     * @return mixed|Smarty_Template_Cached
+     * @throws SmartyException
+     */
+    public function __get($property_name)
+    {
+        // object properties of runtime template extensions will start with '_'
+        if ($property_name[0] == '_') {
+            $class = 'Smarty_Internal_Runtime_' . ucfirst(substr($property_name, 1));
+        } else {
+            $class = 'Smarty_Internal_Method_' . ucfirst($property_name);
+        }
+        if (class_exists($class)) {
+            return $this->$property_name = new $class();
+        }
+        return $this;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+    }
+
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php
deleted file mode 100644
index c9370e1..0000000
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Filter Handler
- *
- * Smarty filter handler class
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Uwe Tews
- */
-
-/**
- * Class for filter processing
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Filter_Handler {
-
-    /**
-     * Run filters over content
-     *
-     * The filters will be lazy loaded if required
-     * class name format: Smarty_FilterType_FilterName
-     * plugin filename format: filtertype.filtername.php
-     * Smarty2 filter plugins could be used
-     *
-     * @param string                   $type     the type of filter ('pre','post','output') which shall run
-     * @param string                   $content  the content which shall be processed by the filters
-     * @param Smarty_Internal_Template $template template object
-     * @return string the filtered content
-     */
-    public static function runFilter($type, $content, Smarty_Internal_Template $template)
-    {
-        $output = $content;
-        // loop over autoload filters of specified type
-        if (!empty($template->smarty->autoload_filters[$type])) {
-            foreach ((array)$template->smarty->autoload_filters[$type] as $name) {
-                $plugin_name = "Smarty_{$type}filter_{$name}";
-                if ($template->smarty->loadPlugin($plugin_name)) {
-                    if (function_exists($plugin_name)) {
-                        // use loaded Smarty2 style plugin
-                        $output = $plugin_name($output, $template);
-                    } elseif (class_exists($plugin_name, false)) {
-                        // loaded class of filter plugin
-                        $output = call_user_func(array($plugin_name, 'execute'), $output, $template);
-                    }
-                } else {
-                    // nothing found, throw exception
-                    throw new SmartyException("Unable to load filter {$plugin_name}");
-                }
-            }
-        }
-        // loop over registerd filters of specified type
-        if (!empty($template->smarty->registered_filters[$type])) {
-            foreach ($template->smarty->registered_filters[$type] as $key => $name) {
-                if (is_array($template->smarty->registered_filters[$type][$key])) {
-                    $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
-                } else {
-                    $output = $template->smarty->registered_filters[$type][$key]($output, $template);
-                }
-            }
-        }
-        // return filtered output
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php
deleted file mode 100644
index fa4b43b..0000000
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Function Call Handler
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Uwe Tews
- */
-
-/**
- * This class does call function defined with the {function} tag
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Function_Call_Handler {
-
-    /**
-     * This function handles calls to template functions defined by {function}
-     * It does create a PHP function at the first call
-     *
-     * @param string                   $_name       template function name
-     * @param Smarty_Internal_Template $_template   template object
-     * @param array                    $_params     Smarty variables passed as call parameter
-     * @param string                   $_hash       nocache hash value
-     * @param bool                     $_nocache    nocache flag
-     */
-    public static function call($_name, Smarty_Internal_Template $_template, $_params, $_hash, $_nocache)
-    {
-        if ($_nocache) {
-            $_function = "smarty_template_function_{$_name}_nocache";
-        } else {
-            $_function = "smarty_template_function_{$_hash}_{$_name}";
-        }
-        if (!is_callable($_function)) {
-            $_code = "function {$_function}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-            if ($_nocache) {
-                $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
-                        "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']);
-                $_template->smarty->template_functions[$_name]['called_nocache'] = true;
-            } else {
-                $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
-            }
-            $_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
-            eval($_code);
-        }
-        $_function($_template, $_params);
-    }
-
-}
-
-?>
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php b/sources/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php
deleted file mode 100644
index bafb721..0000000
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Smarty read include path plugin
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Monte Ohrt
- */
-
-/**
- * Smarty Internal Read Include Path Class
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Get_Include_Path {
-
-    /**
-     * Return full file path from PHP include_path
-     *
-     * @param string $filepath filepath
-     * @return string|boolean full filepath or false
-     */
-    public static function getIncludePath($filepath)
-    {
-        static $_include_path = null;
-        
-        if (function_exists('stream_resolve_include_path')) {
-            // available since PHP 5.3.2
-            return stream_resolve_include_path($filepath);
-        }
-
-        if ($_include_path === null) {
-            $_include_path = explode(PATH_SEPARATOR, get_include_path());
-        }
-
-        foreach ($_include_path as $_path) {
-            if (file_exists($_path . DS . $filepath)) {
-                return $_path . DS . $filepath;
-            }
-        }
-
-        return false;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
new file mode 100644
index 0000000..b739f0e
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Smarty Method AddAutoloadFilters
+ *
+ * Smarty::addAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+
+    /**
+     * Add autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array                                                          $filters filters to load automatically
+     * @param  string                                                         $type    "pre", "output", … specify the
+     *                                                                                 filter type to set. Defaults to
+     *                                                                                 none treating $filters' keys as
+     *                                                                                 the appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            if (!empty($smarty->autoload_filters[$type])) {
+                $smarty->autoload_filters[$type] = array_merge($smarty->autoload_filters[$type], (array) $filters);
+            } else {
+                $smarty->autoload_filters[$type] = (array) $filters;
+            }
+        } else {
+            foreach ((array) $filters as $type => $value) {
+                $this->_checkFilterType($type);
+                if (!empty($smarty->autoload_filters[$type])) {
+                    $smarty->autoload_filters[$type] = array_merge($smarty->autoload_filters[$type], (array) $value);
+                } else {
+                    $smarty->autoload_filters[$type] = (array) $value;
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
new file mode 100644
index 0000000..55d2c9e
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method AddDefaultModifiers
+ *
+ * Smarty::addDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Add default modifiers
+     *
+     * @api Smarty::addDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array|string                                                   $modifiers modifier or list of modifiers
+     *                                                                                   to add
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_array($modifiers)) {
+            $this->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
+        } else {
+            $smarty->default_modifiers[] = $modifiers;
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_append.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_append.php
new file mode 100644
index 0000000..43df880
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_append.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Smarty Method Append
+ *
+ * Smarty::append() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_Append
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * appends values to template variables
+     *
+     * @api  Smarty::append()
+     * @link http://www.smarty.net/docs/en/api.append.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  array|string                                           $tpl_var the template variable name(s)
+     * @param  mixed                                                  $value   the value to append
+     * @param  bool                                                   $merge   flag if array elements shall be merged
+     * @param  bool                                                   $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function append(Smarty_Internal_Data $data, $tpl_var, $value = null, $merge = false, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            // $tpl_var is an array, ignore $value
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key != '') {
+                    $this->append($data, $_key, $_val, $merge, $nocache);
+                }
+            }
+        } else {
+            if ($tpl_var != '' && isset($value)) {
+                if (!isset($data->tpl_vars[$tpl_var])) {
+                    $tpl_var_inst = $data->ext->getTemplateVars->_getVariable($data, $tpl_var, null, true, false);
+                    if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
+                        $data->tpl_vars[$tpl_var] = new Smarty_Variable(null, $nocache);
+                    } else {
+                        $data->tpl_vars[$tpl_var] = clone $tpl_var_inst;
+                    }
+                }
+                if (!(is_array($data->tpl_vars[$tpl_var]->value) ||
+                    $data->tpl_vars[$tpl_var]->value instanceof ArrayAccess)
+                ) {
+                    settype($data->tpl_vars[$tpl_var]->value, 'array');
+                }
+                if ($merge && is_array($value)) {
+                    foreach ($value as $_mkey => $_mval) {
+                        $data->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
+                    }
+                } else {
+                    $data->tpl_vars[$tpl_var]->value[] = $value;
+                }
+            }
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
new file mode 100644
index 0000000..124bb80
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method AppendByRef
+ *
+ * Smarty::appendByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AppendByRef
+{
+
+    /**
+     * appends values to template variables by reference
+     *
+     * @api  Smarty::appendByRef()
+     * @link http://www.smarty.net/docs/en/api.append.by.ref.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $tpl_var the template variable name
+     * @param  mixed                                                  &$value  the referenced value to append
+     * @param  bool                                                   $merge   flag if array elements shall be merged
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public static function appendByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $merge = false)
+    {
+        if ($tpl_var != '' && isset($value)) {
+            if (!isset($data->tpl_vars[$tpl_var])) {
+                $data->tpl_vars[$tpl_var] = new Smarty_Variable();
+            }
+            if (!is_array($data->tpl_vars[$tpl_var]->value)) {
+                settype($data->tpl_vars[$tpl_var]->value, 'array');
+            }
+            if ($merge && is_array($value)) {
+                foreach ($value as $_key => $_val) {
+                    $data->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
+                }
+            } else {
+                $data->tpl_vars[$tpl_var]->value[] = &$value;
+            }
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
new file mode 100644
index 0000000..a97125e
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method AssignByRef
+ *
+ * Smarty::assignByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignByRef
+{
+
+    /**
+     * assigns values to template variables by reference
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $tpl_var the template variable name
+     * @param                                                         $value
+     * @param  boolean                                                $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $nocache)
+    {
+        if ($tpl_var != '') {
+            $data->tpl_vars[$tpl_var] = new Smarty_Variable(null, $nocache);
+            $data->tpl_vars[$tpl_var]->value = &$value;
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
new file mode 100644
index 0000000..23b13b3
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method AssignGlobal
+ *
+ * Smarty::assignGlobal() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignGlobal
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+     /**
+     * assigns a global Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string  $varName the global variable name
+     * @param  mixed   $value   the value to assign
+     * @param  boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignGlobal(Smarty_Internal_Data $data, $varName, $value = null, $nocache = false)
+    {
+        if ($varName != '') {
+            Smarty::$global_tpl_vars[$varName] = new Smarty_Variable($value, $nocache);
+            $ptr = $data;
+            while ($ptr->_objType == 2) {
+                $ptr->tpl_vars[$varName] = clone Smarty::$global_tpl_vars[$varName];
+                $ptr = $ptr->parent;
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
new file mode 100644
index 0000000..1e5fec4
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Method ClearAllAssign
+ *
+ * Smarty::clearAllAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear all the assigned template variables.
+     *
+     * @api  Smarty::clearAllAssign()
+     * @link http://www.smarty.net/docs/en/api.clear.all.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAllAssign(Smarty_Internal_Data $data)
+    {
+        $data->tpl_vars = array();
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
new file mode 100644
index 0000000..6ae0af1
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method ClearAllCache
+ *
+ * Smarty::clearAllCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache folder
+     *
+     * @api  Smarty::clearAllCache()
+     * @link http://www.smarty.net/docs/en/api.clear.all.cache.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  integer $exp_time expiration time
+     * @param  string  $type     resource type
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAllCache(Smarty $smarty, $exp_time = null, $type = null)
+    {
+        // load cache resource and call clearAll
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        $_cache_resource->invalidLoadedCache($smarty);
+        return $_cache_resource->clearAll($smarty, $exp_time);
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php
new file mode 100644
index 0000000..3a7bd1e
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method ClearAssign
+ *
+ * Smarty::clearAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear the given assigned template variable(s).
+     *
+     * @api  Smarty::clearAssign()
+     * @link http://www.smarty.net/docs/en/api.clear.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string|array                                           $tpl_var the template variable(s) to clear
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAssign(Smarty_Internal_Data $data, $tpl_var)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $curr_var) {
+                unset($data->tpl_vars[$curr_var]);
+            }
+        } else {
+            unset($data->tpl_vars[$tpl_var]);
+        }
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php
new file mode 100644
index 0000000..063c57c
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method ClearCache
+ *
+ * Smarty::clearCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @api  Smarty::clearCache()
+     * @link http://www.smarty.net/docs/en/api.clear.cache.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  string  $template_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time
+     * @param  string  $type          resource type
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearCache(Smarty $smarty, $template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
+    {
+        // load cache resource and call clear
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        $_cache_resource->invalidLoadedCache($smarty);
+        return $_cache_resource->clear($smarty, $template_name, $cache_id, $compile_id, $exp_time);
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
new file mode 100644
index 0000000..cce8553
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * Smarty Method ClearCompiledTemplate
+ *
+ * Smarty::clearCompiledTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCompiledTemplate
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Delete compiled template file
+     *
+     * @api  Smarty::clearCompiledTemplate()
+     * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  string  $resource_name template name
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time
+     *
+     * @return integer number of template files deleted
+     */
+    public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
+    {
+
+        $_compile_dir = $smarty->getCompileDir();
+        if ($_compile_dir == '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = false;
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+            if ($tpl->source->exists) {
+                // remove from compileds cache
+                $tpl->source->compileds = array();
+                $_resource_part_1 = basename(str_replace('^', DS, $tpl->compiled->filepath));
+                $_resource_part_1_length = strlen($_resource_part_1);
+            } else {
+                return 0;
+            }
+            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
+            $_resource_part_2_length = strlen($_resource_part_2);
+        }
+        $_dir = $_compile_dir;
+        if ($smarty->use_sub_dirs && isset($_compile_id)) {
+            $_dir .= $_compile_id . $_dir_sep;
+        }
+        if (isset($_compile_id)) {
+            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+            $_compile_id_part_length = strlen($_compile_id_part);
+        }
+        $_count = 0;
+        try {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
+        }
+        catch (Exception $e) {
+            return 0;
+        }
+        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($_compile as $_file) {
+            if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                continue;
+            }
+
+            $_filepath = (string) $_file;
+
+            if ($_file->isDir()) {
+                if (!$_compile->isDot()) {
+                    // delete folder if empty
+                    @rmdir($_file->getPathname());
+                }
+            } else {
+                $unlink = false;
+                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) &&
+                            $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) &&
+                    (!isset($resource_name) || (isset($_filepath[$_resource_part_1_length]) &&
+                            substr_compare($_filepath, $_resource_part_1, - $_resource_part_1_length,
+                                           $_resource_part_1_length) == 0) ||
+                        (isset($_filepath[$_resource_part_2_length]) &&
+                            substr_compare($_filepath, $_resource_part_2, - $_resource_part_2_length,
+                                           $_resource_part_2_length) == 0))
+                ) {
+                    if (isset($exp_time)) {
+                        if (time() - @filemtime($_filepath) >= $exp_time) {
+                            $unlink = true;
+                        }
+                    } else {
+                        $unlink = true;
+                    }
+                }
+
+                if ($unlink && @unlink($_filepath)) {
+                    $_count ++;
+                    if (function_exists('opcache_invalidate')) {
+                        opcache_invalidate($_filepath);
+                    }
+                }
+            }
+        }
+        // clear template objects cache
+        $smarty->_cache['isCached'] = array();
+        if (isset($smarty->ext->_subtemplate)) {
+            $smarty->ext->_subtemplate->tplObjects = array();
+        }
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
new file mode 100644
index 0000000..9c6167f
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method ClearConfig
+ *
+ * Smarty::clearConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearConfig
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear a single or all config variables
+     *
+     * @api  Smarty::clearConfig()
+     * @link http://www.smarty.net/docs/en/api.clear.config.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string|null                                            $name variable name or null
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearConfig(Smarty_Internal_Data $data, $name = null)
+    {
+        if (isset($name)) {
+            unset($data->config_vars[$name]);
+        } else {
+            $data->config_vars = array();
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
new file mode 100644
index 0000000..4d6be65
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Smarty Method CompileAllConfig
+ *
+ * Smarty::compileAllConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_CompileAllTemplates
+{
+
+    /**
+     * Compile all config files
+     *
+     * @api  Smarty::compileAllConfig()
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     file extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit
+     * @param  int    $max_errors
+     *
+     * @return integer number of template files recompiled
+     */
+    public function compileAllConfig(Smarty $smarty, $extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors, true);
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
new file mode 100644
index 0000000..685fc0c
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Smarty Method CompileAllTemplates
+ *
+ * Smarty::compileAllTemplates() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllTemplates
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Compile all template files
+     *
+     * @api  Smarty::compileAllTemplates()
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     file extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit
+     * @param  int    $max_errors
+     *
+     * @return integer number of template files recompiled
+     */
+    public function compileAllTemplates(Smarty $smarty, $extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+    {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
+    }
+
+    /**
+     * Compile all template or config files
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     template file name extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit    set maximum execution time
+     * @param  int    $max_errors    set maximum allowed errors
+     * @param bool    $isConfig      flag true if called for config files
+     *
+     * @return int number of template files compiled
+     */
+    protected function compileAll(Smarty $smarty, $extension, $force_compile, $time_limit, $max_errors, $isConfig = false)
+    {
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        }
+        $_count = 0;
+        $_error_count = 0;
+        $sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
+        // loop over array of source directories
+        foreach ($sourceDir as $_dir) {
+            $_dir_1 = new RecursiveDirectoryIterator($_dir);
+            $_dir_2 = new RecursiveIteratorIterator($_dir_1);
+            foreach ($_dir_2 as $_fileinfo) {
+                $_file = $_fileinfo->getFilename();
+                if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                    continue;
+                }
+                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
+                    continue;
+                }
+                if ($_fileinfo->getPath() == !substr($_dir, 0, - 1)) {
+                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+                }
+                echo "\n<br>", $_dir, '---', $_file;
+                flush();
+                $_start_time = microtime(true);
+                $_smarty = clone $smarty;
+                $_smarty->force_compile = $force_compile;
+                try {
+                    /* @var Smarty_Internal_Template $_tpl */
+                    $_tpl = new $smarty->template_class($_file, $_smarty);
+                    $_tpl->caching = Smarty::CACHING_OFF;
+                    $_tpl->source = $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
+                    if ($_tpl->mustCompile()) {
+                        $_tpl->compileTemplateSource();
+                        $_count ++;
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    }
+                }
+                catch (Exception $e) {
+                    echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
+                    $_error_count ++;
+                }
+                // free memory
+                unset($_tpl);
+                $_smarty->_cache['template_objects'] = array();
+                if ($max_errors !== null && $_error_count == $max_errors) {
+                    echo "\n<br><br>too many errors\n";
+                    exit();
+                }
+            }
+        }
+        echo "\n<br>";
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_configload.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_configload.php
new file mode 100644
index 0000000..7b99e35
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_configload.php
@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * Smarty Method ConfigLoad
+ *
+ * Smarty::configLoad() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ConfigLoad
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $config_file filename
+     * @param  mixed                                                  $sections    array of section names, single
+     *                                                                             section or null
+     *
+     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
+    {
+        $this->_loadConfigFile($data, $config_file, $sections, 0);
+        return $data;
+    }
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param  string                                                 $config_file filename
+     * @param  mixed                                                  $sections    array of section names, single
+     *                                                                             section or null
+     * @param int                                                     $scope       scope into which config variables
+     *                                                                             shall be loaded
+     *
+     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
+    {
+        /* @var \Smarty $smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        /* @var \Smarty_Internal_Template $confObj */
+        $confObj = new Smarty_Internal_Template($config_file, $smarty, $data);
+        $confObj->caching = Smarty::CACHING_OFF;
+        $confObj->source = Smarty_Template_Config::load($confObj);
+        $confObj->source->config_sections = $sections;
+        $confObj->source->scope = $scope;
+        $confObj->compiled = Smarty_Template_Compiled::load($confObj);
+        $confObj->compiled->render($confObj);
+        if ($data->_objType == 2) {
+            $data->compiled->file_dependency[$confObj->source->uid] =
+                array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
+        }
+    }
+
+    /**
+     * load config variables into template object
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param  array                    $_config_vars
+     *
+     */
+    public function _loadConfigVars(Smarty_Internal_Template $tpl, $_config_vars)
+    {
+        $this->_assignConfigVars($tpl->parent, $tpl, $_config_vars);
+        $scope = $tpl->source->scope;
+        if (!$scope && !$tpl->scope) {
+            return;
+        }
+        foreach (array($scope, $tpl->scope) as $s) {
+            $s = ($bubble_up = $s >= Smarty::SCOPE_BUBBLE_UP) ? $s - Smarty::SCOPE_BUBBLE_UP : $s;
+            if ($bubble_up && $s) {
+                $ptr = $tpl->parent->parent;
+                if (isset($ptr)) {
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_PARENT) {
+                    continue;
+                }
+                while (isset($ptr) && $ptr->_objType == 2) {
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_TPL_ROOT) {
+                    continue;
+                } elseif ($s == Smarty::SCOPE_SMARTY) {
+                    $this->_assignConfigVars($tpl->smarty, $tpl, $_config_vars);
+                } elseif ($s == Smarty::SCOPE_GLOBAL) {
+                    $this->_assignConfigVars($tpl->smarty, $tpl, $_config_vars);
+                } elseif ($s == Smarty::SCOPE_ROOT) {
+                    while (isset($ptr->parent)) {
+                        $ptr = $ptr->parent;
+                    }
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                }
+            }
+        }
+    }
+
+    /**
+     * Assign all config variables in given scope
+     *
+     * @param \Smarty_Internal_Data     $scope_ptr
+     * @param \Smarty_Internal_Template $tpl
+     * @param  array                    $_config_vars
+     */
+    public function _assignConfigVars(Smarty_Internal_Data $scope_ptr, Smarty_Internal_Template $tpl, $_config_vars)
+    {
+        // copy global config vars
+        foreach ($_config_vars['vars'] as $variable => $value) {
+            if ($tpl->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                $scope_ptr->config_vars[$variable] = $value;
+            } else {
+                $scope_ptr->config_vars[$variable] =
+                    array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
+            }
+        }
+        // scan sections
+        $sections = $tpl->source->config_sections;
+        if (!empty($sections)) {
+            foreach ((array) $sections as $tpl_section) {
+                if (isset($_config_vars['sections'][$tpl_section])) {
+                    foreach ($_config_vars['sections'][$tpl_section]['vars'] as $variable => $value) {
+                        if ($tpl->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                            $scope_ptr->config_vars[$variable] = $value;
+                        } else {
+                            $scope_ptr->config_vars[$variable] =
+                                array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * gets  a config variable value
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $varName the name of the config variable
+     * @param bool                      $errorEnable
+     *
+     * @return mixed  the value of the config variable
+     */
+    public function _getConfigVariable(Smarty_Internal_Template $tpl, $varName, $errorEnable = true)
+    {
+        $_ptr = $tpl;
+        while ($_ptr !== null) {
+            if (isset($_ptr->config_vars[$varName])) {
+                // found it, return it
+                return $_ptr->config_vars[$varName];
+            }
+            // not found, try at parent
+            $_ptr = $_ptr->parent;
+        }
+        if ($tpl->smarty->error_unassigned && $errorEnable) {
+            // force a notice
+            $x = $$varName;
+        }
+        return null;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php
new file mode 100644
index 0000000..600bc77
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method CreateData
+ *
+ * Smarty::createData() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CreateData
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * creates a data object
+     *
+     * @api  Smarty::createData()
+     * @link http://www.smarty.net/docs/en/api.create.data.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
+     * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
+     *                                                                                     variables
+     * @param string                                                               $name   optional data block name
+     *
+     * @returns Smarty_Data data object
+     */
+    public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = isset($this->smarty) ? $this->smarty : $obj;
+        $dataObj = new Smarty_Data($parent, $smarty, $name);
+        if ($smarty->debugging) {
+            Smarty_Internal_Debug::register_data($dataObj);
+        }
+        return $dataObj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
new file mode 100644
index 0000000..e1a7801
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Method GetAutoloadFilters
+ *
+ * Smarty::getAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+
+    /**
+     * Get autoload filters
+     *
+     * @api Smarty::getAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type type of filter to get auto loads
+     *                                                                              for. Defaults to all autoload
+     *                                                                              filters
+     *
+     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
+     *                was specified
+     */
+    public function getAutoloadFilters(Smarty_Internal_TemplateBase $obj, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            return isset($smarty->autoload_filters[$type]) ? $smarty->autoload_filters[$type] : array();
+        }
+        return $smarty->autoload_filters;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
new file mode 100644
index 0000000..b156721
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Smarty Method GetConfigVars
+ *
+ * Smarty::getConfigVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetConfigVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all config variables
+     *
+     * @api  Smarty::getConfigVars()
+     * @link http://www.smarty.net/docs/en/api.get.config.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $varname        variable name or null
+     * @param  bool                                                   $search_parents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getConfigVars(Smarty_Internal_Data $data, $varname = null, $search_parents = true)
+    {
+        $_ptr = $data;
+        $var_array = array();
+        while ($_ptr !== null) {
+            if (isset($varname)) {
+                if (isset($_ptr->config_vars[$varname])) {
+                    return $_ptr->config_vars[$varname];
+                }
+            } else {
+                $var_array = array_merge($_ptr->config_vars, $var_array);
+            }
+            // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset($varname)) {
+            return '';
+        } else {
+            return $var_array;
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
new file mode 100644
index 0000000..3c3432c
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDebugTemplate
+ *
+ * Smarty::getDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return name of debugging template
+     *
+     * @api Smarty::getDebugTemplate()
+
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return string
+     */
+    public function getDebugTemplate(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        return $smarty->debug_tpl;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
new file mode 100644
index 0000000..32e0cc4
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDefaultModifiers
+ *
+ * Smarty::getDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Get default modifiers
+     *
+     * @api Smarty::getDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return array list of default modifiers
+     */
+    public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        return $smarty->default_modifiers;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
new file mode 100644
index 0000000..be0c0db
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method GetRegisteredObject
+ *
+ * Smarty::getRegisteredObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetRegisteredObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return a reference to a registered object
+     *
+     * @api  Smarty::getRegisteredObject()
+     * @link http://www.smarty.net/docs/en/api.get.registered.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name object name
+     *
+     * @return object
+     * @throws \SmartyException if no such object is found
+     */
+    public function getRegisteredObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (!isset($smarty->registered_objects[$object_name])) {
+            throw new SmartyException("'$object_name' is not a registered object");
+        }
+        if (!is_object($smarty->registered_objects[$object_name][0])) {
+            throw new SmartyException("registered '$object_name' is not an object");
+        }
+        return $smarty->registered_objects[$object_name][0];
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
new file mode 100644
index 0000000..b922fd0
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Smarty Method GetStreamVariable
+ *
+ * Smarty::getStreamVariable() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetStreamVariable
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * gets  a stream variable
+     *
+     * @api Smarty::getStreamVariable()
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $variable the stream of the variable
+     *
+     * @return mixed
+     * @throws \SmartyException
+     */
+    public function getStreamVariable(Smarty_Internal_Data $data, $variable)
+    {
+        $_result = '';
+        $fp = fopen($variable, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+                $_result .= $current_line;
+            }
+            fclose($fp);
+
+            return $_result;
+        }
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if ($smarty->error_unassigned) {
+            throw new SmartyException('Undefined stream variable "' . $variable . '"');
+        } else {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php
new file mode 100644
index 0000000..dd9e8d1
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Smarty Method GetTags
+ *
+ * Smarty::getTags() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTags
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Return array of tag/attributes of all tags used by an template
+     *
+     * @api  Smarty::getTags()
+     * @link http://www.smarty.net/docs/en/api.get.tags.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param null|string|Smarty_Internal_Template                            $template
+     *
+     * @return array of tag/attributes
+     * @throws \SmartyException
+     */
+    public function getTags(Smarty_Internal_TemplateBase $obj, $template = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = isset($this->smarty) ? $this->smarty : $obj;
+        if ($obj->_objType == 2 && !isset($template)) {
+            $tpl = clone $obj;
+        } elseif (isset($template) && $template->_objType == 2) {
+            $tpl = clone $template;
+        } elseif (isset($template) && is_string($template)) {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $smarty->template_class($template, $smarty);
+            // checks if template exists
+            if (!$tpl->source->exists) {
+                throw new SmartyException("Unable to load template {$tpl->source->type} '{$tpl->source->name}'");
+            }
+        }
+        if (isset($tpl)) {
+            $tpl->smarty = clone $tpl->smarty;
+            $tpl->smarty->_cache['get_used_tags'] = true;
+            $tpl->_cache['used_tags'] = array();
+            $tpl->smarty->merge_compiled_includes = false;
+            $tpl->smarty->disableSecurity();
+            $tpl->caching = false;
+            $tpl->loadCompiler();
+            $tpl->compiler->compileTemplate($tpl);
+            return $tpl->_cache['used_tags'];
+        }
+        throw new SmartyException("Missing template specification");
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
new file mode 100644
index 0000000..235bece
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Smarty Method GetTemplateVars
+ *
+ * Smarty::getTemplateVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTemplateVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @api  Smarty::getTemplateVars()
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $varName        variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr           optional pointer to data object
+     * @param  bool                                                   $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getTemplateVars(Smarty_Internal_Data $data, $varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
+    {
+        if (isset($varName)) {
+            $_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
+            if (is_object($_var)) {
+                return $_var->value;
+            } else {
+                return null;
+            }
+        } else {
+            $_result = array();
+            if ($_ptr === null) {
+                $_ptr = $data;
+            }
+            while ($_ptr !== null) {
+                foreach ($_ptr->tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                }
+                // not found, try at parent
+                if ($searchParents) {
+                    $_ptr = $_ptr->parent;
+                } else {
+                    $_ptr = null;
+                }
+            }
+            if ($searchParents && isset(Smarty::$global_tpl_vars)) {
+                foreach (Smarty::$global_tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                }
+            }
+            return $_result;
+        }
+    }
+
+    /**
+     * gets the object of a Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                 $varName       the name of the Smarty variable
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr           optional pointer to data object
+     * @param bool                                                   $searchParents search also in parent data
+     * @param bool                                                    $errorEnable
+     *
+     * @return \Smarty_Variable
+     */
+    public function _getVariable(Smarty_Internal_Data $data, $varName, Smarty_Internal_Data $_ptr = null, $searchParents = true, $errorEnable = true)
+    {
+        if ($_ptr === null) {
+            $_ptr = $data;
+        }
+        while ($_ptr !== null) {
+            if (isset($_ptr->tpl_vars[$varName])) {
+                // found it, return it
+                return $_ptr->tpl_vars[$varName];
+            }
+            // not found, try at parent
+            if ($searchParents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset(Smarty::$global_tpl_vars[$varName])) {
+            // found it, return it
+            return Smarty::$global_tpl_vars[$varName];
+        }
+        /* @var \Smarty $smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if ($smarty->error_unassigned && $errorEnable) {
+            // force a notice
+            $x = $$varName;
+        }
+
+        return new Smarty_Undefined_Variable;
+    }
+
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
new file mode 100644
index 0000000..7fb1117
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Smarty Method LoadFilter
+ *
+ * Smarty::loadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::loadFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  string                                                         $name filter name
+     *
+     * @return bool
+     * @throws SmartyException if filter could not be loaded
+     */
+    public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        $_plugin = "smarty_{$type}filter_{$name}";
+        $_filter_name = $_plugin;
+        if (is_callable($_plugin)) {
+            $smarty->registered_filters[$type][$_filter_name] = $_plugin;
+            return true;
+        }
+        if ($smarty->loadPlugin($_plugin)) {
+            if (class_exists($_plugin, false)) {
+                $_plugin = array($_plugin, 'execute');
+            }
+            if (is_callable($_plugin)) {
+                $smarty->registered_filters[$type][$_filter_name] = $_plugin;
+                return true;
+            }
+        }
+        throw new SmartyException("{$type}filter \"{$name}\" not found or callable");
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
new file mode 100644
index 0000000..c153f55
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Smarty Extension Loadplugin
+ *
+ * $smarty->loadPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadPlugin
+{
+    /**
+     * Cache of searched plugin files
+     *
+     * @var array
+     */
+    public $plugin_files = array();
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param \Smarty $smarty
+     * @param  string $plugin_name class plugin name to load
+     * @param  bool   $check       check if already loaded
+     *
+     * @return bool|string
+     * @throws \SmartyException
+     */
+    public function loadPlugin(Smarty $smarty, $plugin_name, $check)
+    {
+        // if function or class exists, exit silently (already loaded)
+        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
+            return true;
+        }
+        if (!preg_match('#^smarty_((internal)|([^_]+))_(.+)$#i', $plugin_name, $match)) {
+            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
+        }
+        if (!empty($match[2])) {
+            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
+            if (isset($this->plugin_files[$file])) {
+                if ($this->plugin_files[$file] !== false) {
+                    return $this->plugin_files[$file];
+                } else {
+                    return false;
+                }
+            } else {
+                if (is_file($file)) {
+                    $this->plugin_files[$file] = $file;
+                    require_once($file);
+                    return $file;
+                } else {
+                    $this->plugin_files[$file] = false;
+                    return false;
+                }
+            }
+        }
+        // plugin filename is expected to be: [type].[name].php
+        $_plugin_filename = "{$match[1]}.{$match[4]}.php";
+        $_lower_filename = strtolower($_plugin_filename);
+        if (isset($this->plugin_files)) {
+            if (isset($this->plugin_files['plugins_dir'][$_lower_filename])) {
+                if (!$smarty->use_include_path || $this->plugin_files['plugins_dir'][$_lower_filename] !== false) {
+                    return $this->plugin_files['plugins_dir'][$_lower_filename];
+                }
+            }
+            if (!$smarty->use_include_path || $smarty->ext->_getIncludePath->isNewIncludePath($smarty)) {
+                unset($this->plugin_files['include_path']);
+            } else {
+                if (isset($this->plugin_files['include_path'][$_lower_filename])) {
+                    return $this->plugin_files['include_path'][$_lower_filename];
+                }
+            }
+        }
+        $_file_names = array($_plugin_filename);
+        if ($_lower_filename != $_plugin_filename) {
+            $_file_names[] = $_lower_filename;
+        }
+        $_p_dirs = $smarty->getPluginsDir();
+        if (!isset($this->plugin_files['plugins_dir'][$_lower_filename])) {
+            // loop through plugin dirs and find the plugin
+            foreach ($_p_dirs as $_plugin_dir) {
+                foreach ($_file_names as $name) {
+                    $file = $_plugin_dir . $name;
+                    if (is_file($file)) {
+                        $this->plugin_files['plugins_dir'][$_lower_filename] = $file;
+                        require_once($file);
+                        return $file;
+                    }
+                    $this->plugin_files['plugins_dir'][$_lower_filename] = false;
+                }
+            }
+        }
+        if ($smarty->use_include_path) {
+            foreach ($_file_names as $_file_name) {
+                // try PHP include_path
+                $file = $smarty->ext->_getIncludePath->getIncludePath($_p_dirs, $_file_name, $smarty);
+                $this->plugin_files['include_path'][$_lower_filename] = $file;
+                if ($file !== false) {
+                    require_once($file);
+                    return $file;
+                }
+            }
+        }
+        // no plugin loaded
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
new file mode 100644
index 0000000..f28a68e
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Smarty Method UnloadFilter
+ *
+ * Smarty_Internal_Template::mustCompile() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_MustCompile
+{
+    /**
+     * Valid for template object
+     *
+     * @var int
+     */
+    public $objMap = 2;
+
+    /**
+     * Returns if the current template must be compiled by the Smarty compiler
+     * It does compare the timestamps of template source and the compiled templates and checks the force compile
+     * configuration
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function mustCompile(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->exists) {
+            if (isset($_template->parent) && $_template->parent->_objType == 2) {
+                $parent_resource = " in '$_template->parent->template_resource}'";
+            } else {
+                $parent_resource = '';
+            }
+            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
+        }
+        if ($_template->mustCompile === null) {
+            $_template->mustCompile = (!$_template->source->handler->uncompiled &&
+                ($_template->smarty->force_compile || $_template->source->handler->recompiled || !$_template->compiled->exists ||
+                    ($_template->smarty->compile_check && $_template->compiled->getTimeStamp() < $_template->source->getTimeStamp())));
+        }
+
+        return $_template->mustCompile;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
new file mode 100644
index 0000000..55c5090
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Smarty Method RegisterCacheResource
+ *
+ * Smarty::registerCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerCacheResource()
+     * @link http://www.smarty.net/docs/en/api.register.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $name name of resource type
+     * @param \Smarty_CacheResource                                           $resource_handler
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerCacheResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_CacheResource $resource_handler)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->registered_cache_resources[$name] = $resource_handler;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php
new file mode 100644
index 0000000..d2e5e20
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Smarty Method RegisterClass
+ *
+ * Smarty::registerClass() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterClass
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers static classes to be used in templates
+     *
+     * @api  Smarty::registerClass()
+     * @link http://www.smarty.net/docs/en/api.register.class.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $class_name
+     * @param  string                                                         $class_impl the referenced PHP class to
+     *                                                                                    register
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerClass(Smarty_Internal_TemplateBase $obj, $class_name, $class_impl)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        // test if exists
+        if (!class_exists($class_impl)) {
+            throw new SmartyException("Undefined class '$class_impl' in register template class");
+        }
+        // register the class
+        $smarty->registered_classes[$class_name] = $class_impl;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
new file mode 100644
index 0000000..370aa38
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultConfigHandler
+ *
+ * Smarty::registerDefaultConfigHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultConfigHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register config default handler
+     *
+     * @api  Smarty::registerDefaultConfigHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_config_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default config handler not callable");
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
new file mode 100644
index 0000000..80b801c
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultPluginHandler
+ *
+ * Smarty::registerDefaultPluginHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultPluginHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a default plugin handler
+     *
+     * @api  Smarty::registerDefaultPluginHandler()
+     * @link http://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultPluginHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_plugin_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default plugin handler '$callback' not callable");
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
new file mode 100644
index 0000000..40979e7
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultTemplateHandler
+ *
+ * Smarty::registerDefaultTemplateHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultTemplateHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register template default handler
+     *
+     * @api  Smarty::registerDefaultTemplateHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultTemplateHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_template_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default template handler not callable");
+        }
+        return $obj;
+    }
+
+    /**
+     * get default content from template or config resource handler
+     *
+     * @param Smarty_Template_Source $source
+     */
+    public static function _getDefaultTemplate(Smarty_Template_Source $source)
+    {
+        if ($source->isConfig) {
+            $default_handler = $source->smarty->default_config_handler_func;
+        } else {
+            $default_handler = $source->smarty->default_template_handler_func;
+        }
+        $_content = $_timestamp = null;
+        $_return = call_user_func_array($default_handler, array($source->type, $source->name, &$_content, &$_timestamp,
+                                                                $source->smarty));
+        if (is_string($_return)) {
+            $source->exists = is_file($_return);
+            if ($source->exists) {
+                $source->timestamp = filemtime($_return);
+            }
+            $source->filepath = $_return;
+        } elseif ($_return === true) {
+            $source->content = $_content;
+            $source->timestamp = $_timestamp;
+            $source->exists = true;
+            $source->handler->recompiled = true;
+            $source->filepath = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
new file mode 100644
index 0000000..84b2c26
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Smarty Method RegisterFilter
+ *
+ * Smarty::registerFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Registers a filter function
+     *
+     * @api  Smarty::registerFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  callback                                                       $callback
+     * @param  string|null                                                    $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerFilter(Smarty_Internal_TemplateBase $obj, $type, $callback, $name = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        $name = isset($name) ? $name : $this->_getFilterName($callback);
+        if (!is_callable($callback)) {
+            throw new SmartyException("{$type}filter \"{$name}\" not callable");
+        }
+        $smarty->registered_filters[$type][$name] = $callback;
+        return $obj;
+    }
+
+    /**
+     * Return internal filter name
+     *
+     * @param  callback $function_name
+     *
+     * @return string   internal filter name
+     */
+    public function _getFilterName($function_name)
+    {
+        if (is_array($function_name)) {
+            $_class_name = (is_object($function_name[0]) ? get_class($function_name[0]) : $function_name[0]);
+
+            return $_class_name . '_' . $function_name[1];
+        } elseif (is_string($function_name)) {
+            return $function_name;
+        } else {
+            return 'closure';
+        }
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php
new file mode 100644
index 0000000..f27f172
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Smarty Method RegisterObject
+ *
+ * Smarty::registerObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @api  Smarty::registerObject()
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name
+     * @param  object                                                         $object                     the
+     *                                                                                                    referenced
+     *                                                                                                    PHP object to
+     *                                                                                                    register
+     * @param  array                                                          $allowed_methods_properties list of
+     *                                                                                                    allowed
+     *                                                                                                    methods
+     *                                                                                                    (empty = all)
+     * @param  bool                                                           $format                     smarty
+     *                                                                                                    argument
+     *                                                                                                    format, else
+     *                                                                                                    traditional
+     * @param  array                                                          $block_methods              list of
+     *                                                                                                    block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerObject(Smarty_Internal_TemplateBase $obj, $object_name, $object, $allowed_methods_properties = array(), $format = true, $block_methods = array())
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        // test if allowed methods callable
+        if (!empty($allowed_methods_properties)) {
+            foreach ((array) $allowed_methods_properties as $method) {
+                if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
+                    throw new SmartyException("Undefined method or property '$method' in registered object");
+                }
+            }
+        }
+        // test if block methods callable
+        if (!empty($block_methods)) {
+            foreach ((array) $block_methods as $method) {
+                if (!is_callable(array($object, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                }
+            }
+        }
+        // register the object
+        $smarty->registered_objects[$object_name] = array($object, (array) $allowed_methods_properties,
+                                                          (boolean) $format, (array) $block_methods);
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
new file mode 100644
index 0000000..9581458
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method RegisterPlugin
+ *
+ * Smarty::registerPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type       plugin type
+     * @param  string                                                         $name       name of template tag
+     * @param  callback                                                       $callback   PHP callback to register
+     * @param  bool                                                           $cacheable  if true (default) this
+     *                                                                                    function is cache able
+     * @param  mixed                                                          $cache_attr caching attributes if any
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              when the plugin tag is invalid
+     */
+    public function registerPlugin(Smarty_Internal_TemplateBase $obj, $type, $name, $callback, $cacheable = true, $cache_attr = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_plugins[$type][$name])) {
+            throw new SmartyException("Plugin tag \"{$name}\" already registered");
+        } elseif (!is_callable($callback)) {
+            throw new SmartyException("Plugin \"{$name}\" not callable");
+        } else {
+            $smarty->registered_plugins[$type][$name] = array($callback, (bool) $cacheable, (array) $cache_attr);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php
new file mode 100644
index 0000000..43246ee
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method RegisterResource
+ *
+ * Smarty::registerResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerResource()
+     * @link http://www.smarty.net/docs/en/api.register.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $name             name of resource type
+     * @param  Smarty_Resource|array                                          $resource_handler or instance of
+     *                                                                                          Smarty_Resource, or
+     *                                                                                          array of callbacks to
+     *                                                                                          handle resource
+     *                                                                                          (deprecated)
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->registered_resources[$name] = $resource_handler instanceof
+        Smarty_Resource ? $resource_handler : array($resource_handler, false);
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
new file mode 100644
index 0000000..b1f965c
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Smarty Method SetAutoloadFilters
+ *
+ * Smarty::setAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Set autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array                                                          $filters filters to load automatically
+     * @param  string                                                         $type    "pre", "output", … specify the
+     *                                                                                 filter type to set. Defaults to
+     *                                                                                 none treating $filters' keys as
+     *                                                                                 the appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            $smarty->autoload_filters[$type] = (array) $filters;
+        } else {
+            foreach ((array) $filters as $type => $value) {
+                $this->_checkFilterType($type);
+            }
+            $smarty->autoload_filters = (array) $filters;
+        }
+        return $obj;
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
new file mode 100644
index 0000000..4ff5d7f
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method SetDebugTemplate
+ *
+ * Smarty::setDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * set the debug template
+     *
+     * @api Smarty::setDebugTemplate()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $tpl_name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException if file is not readable
+     */
+    public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (!is_readable($tpl_name)) {
+            throw new SmartyException("Unknown file '{$tpl_name}'");
+        }
+        $smarty->debug_tpl = $tpl_name;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
new file mode 100644
index 0000000..5a70728
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Smarty Method SetDefaultModifiers
+ *
+ * Smarty::setDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Set default modifiers
+     *
+     * @api Smarty::setDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array|string                                                   $modifiers modifier or list of modifiers
+     *                                                                                   to set
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->default_modifiers = (array) $modifiers;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
new file mode 100644
index 0000000..e3d966e
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method UnloadFilter
+ *
+ * Smarty::unloadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::unloadFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.unload.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  string                                                         $name filter name
+     *
+     * @return bool
+     */
+    public function unloadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[$type])) {
+            $_filter_name = "smarty_{$type}filter_{$name}";
+            if (isset($smarty->registered_filters[$type][$_filter_name])) {
+                unset ($smarty->registered_filters[$type][$_filter_name]);
+                if (empty($smarty->registered_filters[$type])) {
+                    unset($smarty->registered_filters[$type]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
new file mode 100644
index 0000000..8038101
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterCacheResource
+ *
+ * Smarty::unregisterCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterCacheResource()
+     * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type     name of cache resource type
+      *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterCacheResource(Smarty_Internal_TemplateBase $obj, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_cache_resources[$name])) {
+            unset($smarty->registered_cache_resources[$name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
new file mode 100644
index 0000000..c80ae9a
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method UnregisterFilter
+ *
+ * Smarty::unregisterFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Unregisters a filter function
+     *
+     * @api  Smarty::unregisterFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.unregister.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  callback|string                                                $callback
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterFilter(Smarty_Internal_TemplateBase $obj, $type, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[$type])) {
+            $name = is_string($callback) ? $callback : $this->_getFilterName($callback);
+            if (isset($smarty->registered_filters[$type][$name])) {
+                unset($smarty->registered_filters[$type][$name]);
+                if (empty($smarty->registered_filters[$type])) {
+                    unset($smarty->registered_filters[$type]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
new file mode 100644
index 0000000..a943316
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterObject
+ *
+ * Smarty::unregisterObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterObject()
+     * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name name of object
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_objects[$object_name])) {
+            unset($smarty->registered_objects[$object_name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
new file mode 100644
index 0000000..06cb2d3
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method UnregisterPlugin
+ *
+ * Smarty::unregisterPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterPlugin()
+     * @link http://www.smarty.net/docs/en/api.unregister.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type       plugin type
+     * @param  string                                                         $name       name of template tag
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+      */
+    public function unregisterPlugin(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_plugins[$type][$name])) {
+            unset($smarty->registered_plugins[$type][$name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
new file mode 100644
index 0000000..767bd74
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterResource
+ *
+ * Smarty::unregisterResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterResource()
+     * @link http://www.smarty.net/docs/en/api.unregister.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type     name of resource type
+      *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterResource(Smarty_Internal_TemplateBase $obj, $type)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_resources[$type])) {
+            unset($smarty->registered_resources[$type]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/sources/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
index 64a2b1e..b3d5fa8 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
@@ -1,31 +1,31 @@
 <?php
 /**
  * Smarty Internal Plugin Nocache Insert
- *
  * Compiles the {insert} tag into the cache file
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Smarty Internal Plugin Compile Insert Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Nocache_Insert {
-
+class Smarty_Internal_Nocache_Insert
+{
     /**
      * Compiles code for the {insert} tag into cache file
      *
-     * @param string                   $_function insert function name
-     * @param array                    $_attr     array with parameter
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $_script   script name to load or 'null'
-     * @param string                   $_assign   optional variable name
-     * @return string compiled code
+     * @param  string                   $_function insert function name
+     * @param  array                    $_attr     array with parameter
+     * @param  Smarty_Internal_Template $_template template object
+     * @param  string                   $_script   script name to load or 'null'
+     * @param  string                   $_assign   optional variable name
+     *
+     * @return string                   compiled code
      */
     public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
     {
@@ -42,12 +42,10 @@ class Smarty_Internal_Nocache_Insert {
             $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
         }
         $_tpl = $_template;
-        while ($_tpl->parent instanceof Smarty_Internal_Template) {
+        while (isset($_tpl->parent) && $_tpl->parent->_objType == 2) {
             $_tpl = $_tpl->parent;
         }
-        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
+
+        return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/";
     }
-
 }
-
-?>
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree.php b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree.php
index 99f4c65..32c9df0 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree.php
@@ -1,395 +1,54 @@
 <?php
 /**
  * Smarty Internal Plugin Templateparser Parsetrees
- *
  * These are classes to build parsetrees in the template parser
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Thue Kristensen
- * @author Uwe Tews
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
  */
 
 /**
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  * @ignore
  */
-abstract class _smarty_parsetree {
+abstract class Smarty_Internal_ParseTree
+{
 
-    /**
-     * Parser object
-     * @var object
-     */
-    public $parser;
     /**
      * Buffer content
+     *
      * @var mixed
      */
     public $data;
 
     /**
-     * Return buffer
-     *
-     * @return string  buffer content
-     */
-    abstract public function to_smarty_php();
-
-}
-
-/**
- * A complete smarty tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_tag extends _smarty_parsetree {
-
-    /**
-     * Saved block nesting level
-     * @var int
-     */
-    public $saved_block_nesting;
-
-    /**
-     * Create parse tree buffer for Smarty tag
-     *
-     * @param object $parser    parser object
-     * @param string $data      content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-        $this->saved_block_nesting = $parser->block_nesting_level;
-    }
-
-    /**
-     * Return buffer content
-     *
-     * @return string  content
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Return complied code that loads the evaluated outout of buffer content into a temporary variable
-     *
-     * @return string template code
-     */
-    public function assign_to_var()
-    {
-        $var = sprintf('$_tmp%d', ++$this->parser->prefix_number);
-        $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>', $this->data, $var);
-        return $var;
-    }
-
-}
-
-/**
- * Code fragment inside a tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_code extends _smarty_parsetree {
-
-
-    /**
-     * Create parse tree buffer for code fragment
-     *
-     * @param object $parser    parser object
-     * @param string $data      content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return buffer content in parentheses
-     *
-     * @return string  content
-     */
-    public function to_smarty_php()
-    {
-        return sprintf("(%s)", $this->data);
-    }
-
-}
-
-/**
- * Double quoted string inside a tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_doublequoted extends _smarty_parsetree {
-
-    /**
-     * Create parse tree buffer for double quoted string subtrees
-     *
-     * @param object $parser    parser object
-     * @param _smarty_parsetree $subtree    parsetree buffer
-     */
-    public function __construct($parser, _smarty_parsetree $subtree)
-    {
-        $this->parser = $parser;
-        $this->subtrees[] = $subtree;
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param _smarty_parsetree $subtree  parsetree buffer
-     */
-    public function append_subtree(_smarty_parsetree $subtree)
-    {
-        $last_subtree = count($this->subtrees) - 1;
-        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
-            if ($subtree instanceof _smarty_code) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
-            } elseif ($subtree instanceof _smarty_dq_content) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
-            } else {
-                $this->subtrees[$last_subtree]->data .= $subtree->data;
-            }
-        } else {
-            $this->subtrees[] = $subtree;
-        }
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Merge subtree buffer content together
-     *
-     * @return string  compiled template code
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        foreach ($this->subtrees as $subtree) {
-            if ($code !== "") {
-                $code .= ".";
-            }
-            if ($subtree instanceof _smarty_tag) {
-                $more_php = $subtree->assign_to_var();
-            } else {
-                $more_php = $subtree->to_smarty_php();
-            }
-
-            $code .= $more_php;
-
-            if (!$subtree instanceof _smarty_dq_content) {
-                $this->parser->compiler->has_variable_string = true;
-            }
-        }
-        return $code;
-    }
-
-}
-
-/**
- * Raw chars as part of a double quoted string.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_dq_content extends _smarty_parsetree {
-
-
-    /**
-     * Create parse tree buffer with string content
-     *
-     * @param object $parser  parser object
-     * @param string $data    string section
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return content as double quoted string
-     *
-     * @return string doubled quoted string
-     */
-    public function to_smarty_php()
-    {
-        return '"' . $this->data . '"';
-    }
-
-}
-
-/**
- * Template element
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_template_buffer extends _smarty_parsetree {
-
-    /**
-     * Array of template elements
+     * Subtree array
      *
      * @var array
      */
-    public $subtrees = Array();
+    public $subtrees = array();
 
     /**
-     * Create root of parse tree for template elements
+     * Return buffer
      *
-     * @param object $parser    parse object
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string buffer content
      */
-    public function __construct($parser)
-    {
-        $this->parser = $parser;
-    }
+    abstract public function to_smarty_php(Smarty_Internal_Templateparser $parser);
 
     /**
-     * Append buffer to subtree
-     *
-     * @param _smarty_parsetree $subtree
+     * Template data object destructor
      */
-    public function append_subtree(_smarty_parsetree $subtree)
+    public function __destruct()
     {
-        $this->subtrees[] = $subtree;
-    }
-
-    /**
-     * Sanitize and merge subtree buffers together
-     *
-     * @return string template code content
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
-            if ($key + 2 < $cnt) {
-                if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) {
-                    $key = $key + 1;
-                    continue;
-                }
-                if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') {
-                    $key = $key + 2;
-                    continue;
-                }
-            }
-            if (substr($code, -1) == '<') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '?') {
-                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>?' . substr($subtree, 1);
-                } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') {
-                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>%' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            if ($this->parser->asp_tags && substr($code, -1) == '%') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code) - 1) . '%<?php ?>>' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            if (substr($code, -1) == '?') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code) - 1) . '?<?php ?>>' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            $code .= $this->subtrees[$key]->to_smarty_php();
-        }
-        return $code;
+        $this->data = null;
+        $this->subtrees = null;
     }
 
 }
 
-/**
- * template text
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_text extends _smarty_parsetree {
 
-
-    /**
-     * Create template text buffer
-     *
-     * @param object $parser    parser object
-     * @param string $data      text
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return buffer content
-     *
-     * @return strint text
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-}
-
-/**
- * template linebreaks
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_linebreak extends _smarty_parsetree {
-
-    /**
-     * Create buffer with linebreak content
-     *
-     * @param object $parser    parser object
-     * @param string  $data     linebreak string
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return linebrak
-     *
-     * @return string linebreak
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php
new file mode 100644
index 0000000..d0f0b3f
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse trees in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Code fragment inside a tag .
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for code fragment
+     *
+     * @param string $data content
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content in parentheses
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return sprintf("(%s)", $this->data);
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
new file mode 100644
index 0000000..607389c
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for double quoted string subtrees
+     *
+     * @param object                    $parser  parser object
+     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
+     */
+    public function __construct($parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree parse tree buffer
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $last_subtree = count($this->subtrees) - 1;
+        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof Smarty_Internal_ParseTree_Tag && $this->subtrees[$last_subtree]->saved_block_nesting < $parser->block_nesting_level) {
+            if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo ' . $subtree->data . ';?>');
+            } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo "' . $subtree->data . '";?>');
+            } else {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, $subtree->data);
+            }
+        } else {
+            $this->subtrees[] = $subtree;
+        }
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Merge subtree buffer content together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string compiled template code
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== "") {
+                $code .= ".";
+            }
+            if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+                $more_php = $subtree->assign_to_var($parser);
+            } else {
+                $more_php = $subtree->to_smarty_php($parser);
+            }
+
+            $code .= $more_php;
+
+            if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $parser->compiler->has_variable_string = true;
+            }
+        }
+
+        return $code;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
new file mode 100644
index 0000000..a8ca389
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree  in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Raw chars as part of a double quoted string.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_DqContent extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer with string content
+     *
+     * @param string $data string section
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return content as double quoted string
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string doubled quoted string
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return '"' . $this->data . '"';
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
new file mode 100644
index 0000000..575c8c9
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * A complete smarty tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
+{
+
+    /**
+     * Saved block nesting level
+     *
+     * @var int
+     */
+    public $saved_block_nesting;
+
+    /**
+     * Create parse tree buffer for Smarty tag
+     *
+     * @param \Smarty_Internal_Templateparser $parser parser object
+     * @param string                          $data   content
+     */
+    public function __construct(Smarty_Internal_Templateparser $parser, $data)
+    {
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return complied code that loads the evaluated output of buffer content into a temporary variable
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code
+     */
+    public function assign_to_var(Smarty_Internal_Templateparser $parser)
+    {
+        $var = sprintf('$_tmp%d', ++ Smarty_Internal_Templateparser::$prefix_number);
+        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
+        $tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
+        $parser->compiler->prefix_code[] = sprintf("%s", $tmp);
+
+        return $var;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php
new file mode 100644
index 0000000..623ae51
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Template element
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
+{
+
+    /**
+     * Array of template elements
+     *
+     * @var array
+     */
+    public $subtrees = Array();
+
+    /**
+     * Create root of parse tree for template elements
+     *
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        if (!empty($subtree->subtrees)) {
+            $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
+        } else {
+            if ($subtree->data !== '') {
+                $this->subtrees[] = $subtree;
+            }
+        }
+    }
+
+    /**
+     * Append array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function append_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge($this->subtrees, (array) $array);
+        }
+    }
+
+    /**
+     * Prepend array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function prepend_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge((array) $array, $this->subtrees);
+        }
+    }
+
+    /**
+     * Sanitize and merge subtree buffers together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key ++) {
+            if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Text) {
+                $subtree = $this->subtrees[$key]->to_smarty_php($parser);
+                while ($key + 1 < $cnt && ($this->subtrees[$key + 1] instanceof Smarty_Internal_ParseTree_Text ||
+                        $this->subtrees[$key + 1]->data == '')) {
+                    $key ++;
+                    if ($this->subtrees[$key]->data == '') {
+                        continue;
+                    }
+                    $subtree .= $this->subtrees[$key]->to_smarty_php($parser);
+                }
+                if ($subtree == '') {
+                    continue;
+                }
+                $code .= preg_replace('/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/', "<?php echo '\$1'; ?>\n",
+                                      $subtree);
+                continue;
+            }
+            if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Tag) {
+                $subtree = $this->subtrees[$key]->to_smarty_php($parser);
+                while ($key + 1 < $cnt && ($this->subtrees[$key + 1] instanceof Smarty_Internal_ParseTree_Tag ||
+                        $this->subtrees[$key + 1]->data == '')) {
+                    $key ++;
+                    if ($this->subtrees[$key]->data == '') {
+                        continue;
+                    }
+                    $subtree = $parser->compiler->appendCode($subtree, $this->subtrees[$key]->to_smarty_php($parser));
+                }
+                if ($subtree == '') {
+                    continue;
+                }
+                $code .= $subtree;
+                continue;
+            }
+            $code .= $this->subtrees[$key]->to_smarty_php($parser);
+        }
+        return $code;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php
new file mode 100644
index 0000000..b3100fa
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ *             *
+ *             template text
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create template text buffer
+     *
+     * @param string $data text
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string text
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php
index c025dc2..aca7103 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_eval.php
@@ -2,32 +2,31 @@
 /**
  * Smarty Internal Plugin Resource Eval
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource Eval
- *
  * Implements the strings as resource for Smarty template
- *
  * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled {
-
+class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
+{
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $source->uid = $source->filepath = sha1($source->name);
         $source->timestamp = false;
@@ -38,18 +37,21 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled {
      * Load template's source from $resource_name into current template object
      *
      * @uses decode() to decode base64 and urlencoded template_resources
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
+     *
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
      */
     public function getContent(Smarty_Template_Source $source)
     {
         return $this->decode($source->name);
     }
-    
+
     /**
      * decode base64 and urlencode
      *
-     * @param string $string template_resource to decode
+     * @param  string $string template_resource to decode
+     *
      * @return string decoded template_resource
      */
     protected function decode($string)
@@ -62,33 +64,33 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled {
                 return urldecode(substr($string, 10));
             }
         }
-        
+
         return $string;
     }
-    
+
     /**
      * modify resource_name according to resource handlers specifications
      *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
+     * @param  Smarty  $smarty        Smarty instance
+     * @param  string  $resource_name resource_name to make unique
+     * @param  boolean $isConfig      flag for config resource
+     *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
-        return get_class($this) . '#' .$this->decode($resource_name);
+        return get_class($this) . '#' . $this->decode($resource_name);
     }
 
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return '';
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php
index 29734ae..3d687dc 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_extends.php
@@ -1,162 +1,124 @@
 <?php
 /**
-* Smarty Internal Plugin Resource Extends
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Uwe Tews
-* @author Rodney Rehm
-*/
+ * Smarty Internal Plugin Resource Extends
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
 
 /**
-* Smarty Internal Plugin Resource Extends
-*
-* Implements the file system as resource for Smarty which {extend}s a chain of template files templates
-*
-* @package Smarty
-* @subpackage TemplateResources
-*/
-class Smarty_Internal_Resource_Extends extends Smarty_Resource {
-
+ * Smarty Internal Plugin Resource Extends
+ * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Extends extends Smarty_Resource
+{
     /**
-    * mbstring.overload flag
-    *
-    * @var int
-    */
+     * mbstring.overload flag
+     *
+     * @var int
+     */
     public $mbstring_overload = 0;
 
     /**
-    * populate Source Object with meta data from Resource
-    *
-    * @param Smarty_Template_Source   $source    source object
-    * @param Smarty_Internal_Template $_template template object
-    */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @throws SmartyException
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $uid = '';
         $sources = array();
         $components = explode('|', $source->name);
         $exists = true;
         foreach ($components as $component) {
-            $s = Smarty_Resource::source(null, $source->smarty, $component);
-            if ($s->type == 'php') {
-                throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
+            /* @var \Smarty_Template_Source $_s */
+            $_s = Smarty_Template_Source::load(null, $source->smarty, $component);
+            if ($_s->type == 'php') {
+                throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type");
             }
-            $sources[$s->uid] = $s;
-            $uid .= $s->filepath;
-            if ($_template && $_template->smarty->compile_check) {
-                $exists = $exists && $s->exists;
+            $sources[ $_s->uid ] = $_s;
+            $uid .= $_s->filepath;
+            if ($_template) {
+                $exists = $exists && $_s->exists;
             }
         }
         $source->components = $sources;
-        $source->filepath = $s->filepath;
+        $source->filepath = $_s->filepath;
         $source->uid = sha1($uid);
-        if ($_template && $_template->smarty->compile_check) {
-            $source->timestamp = $s->timestamp;
-            $source->exists = $exists;
+        $source->exists = $exists;
+        if ($_template) {
+            $source->timestamp = $_s->timestamp;
         }
-        // need the template at getContent()
-        $source->template = $_template;
     }
 
     /**
-    * populate Source Object with timestamp and exists from Resource
-    *
-    * @param Smarty_Template_Source $source source object
-    */
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     */
     public function populateTimestamp(Smarty_Template_Source $source)
     {
         $source->exists = true;
-        foreach ($source->components as $s) {
-            $source->exists = $source->exists && $s->exists;
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($source->components as $_s) {
+            $source->exists = $source->exists && $_s->exists;
         }
-        $source->timestamp = $s->timestamp;
+        $source->timestamp = $source->exists ? $_s->getTimeStamp() : false;
     }
 
     /**
-    * Load template's source from files into current template object
-    *
-    * @param Smarty_Template_Source $source source object
-    * @return string template source
-    * @throws SmartyException if source cannot be loaded
-    */
+     * Load template's source from files into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
     public function getContent(Smarty_Template_Source $source)
     {
         if (!$source->exists) {
             throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
         }
 
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-        $_rdl = preg_quote($source->smarty->right_delimiter);
-        $_ldl = preg_quote($source->smarty->left_delimiter);
-        if (!$source->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
         $_components = array_reverse($source->components);
-        $_first = reset($_components);
-        $_last = end($_components);
-
-        foreach ($_components as $_component) {
-            // register dependency
-            if ($_component != $_first) {
-                $source->template->properties['file_dependency'][$_component->uid] = array($_component->filepath, $_component->timestamp, $_component->type);
-            }
 
+        $_content = '';
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($_components as $_s) {
             // read content
-            $source->filepath = $_component->filepath;
-            $_content = $_component->content;
-
-            // extend sources
-            if ($_component != $_last) {
-                if (preg_match_all("!({$_ldl}{$al}block\s(.+?)\s*{$_rdl})!", $_content, $_open) !=
-                preg_match_all("!({$_ldl}{$al}/block\s*{$_rdl})!", $_content, $_close)) {
-                    throw new SmartyException("unmatched {block} {/block} pairs in template {$_component->type} '{$_component->name}'");
-                }
-                preg_match_all("!{$_ldl}{$al}block\s(.+?)\s*{$_rdl}|{$_ldl}{$al}/block\s*{$_rdl}|{$_ldl}\*([\S\s]*?)\*{$_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-                $_result_count = count($_result[0]);
-                $_start = 0;
-                while ($_start+1 < $_result_count) {
-                    $_end = 0;
-                    $_level = 1;
-                    if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($source->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($source->smarty->left_delimiter)+1)) == $source->smarty->left_delimiter.'*') {
-                        $_start++;
-                        continue;
-                    }
-                    while ($_level != 0) {
-                        $_end++;
-                        if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($source->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($source->smarty->left_delimiter)+1)) == $source->smarty->left_delimiter.'*') {
-                            continue;
-                        }
-                        if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                            $_level++;
-                        } else {
-                            $_level--;
-                        }
-                    }
-                    $_block_content = str_replace($source->smarty->left_delimiter . '$smarty.block.parent' . $source->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-                    ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
-                    Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $source->template, $_component->filepath);
-                    $_start = $_start + $_end + 1;
-                }
-            } else {
-                return $_content;
-            }
+            $_content .= $_s->getContent();
         }
+        return $_content;
     }
 
     /**
-    * Determine basename for compiled filename
-    *
-    * @param Smarty_Template_Source $source source object
-    * @return string resource's basename
-    */
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string resource's basename
+     */
     public function getBasename(Smarty_Template_Source $source)
     {
         return str_replace(':', '.', basename($source->filepath));
     }
 
+    /*
+      * Disable timestamp checks for extends resource.
+      * The individual source components will be checked.
+      *
+      * @return bool
+      */
+    public function checkTimestamps()
+    {
+        return false;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_file.php b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_file.php
index 48b391d..b15e3cc 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_file.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_file.php
@@ -2,21 +2,111 @@
 /**
  * Smarty Internal Plugin Resource File
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource File
- *
  * Implements the file system as resource for Smarty templates
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_File extends Smarty_Resource {
+class Smarty_Internal_Resource_File extends Smarty_Resource
+{
+    /**
+     * build template filepath by traversing the template_dir array
+     *
+     * @param Smarty_Template_Source    $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string fully qualified filepath
+     * @throws SmartyException
+     */
+    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $file = $source->name;
+        // absolute file ?
+        if ($file[0] == '/' || $file[1] == ':') {
+            $file = $source->smarty->_realpath($file, true);
+            return is_file($file) ? $file : false;
+        }
+        // go relative to a given template?
+        if ($file[0] == '.' && $_template && isset($_template->parent) && $_template->parent->_objType == 2 &&
+            preg_match('#^[.]{1,2}[\\\/]#', $file)
+        ) {
+            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' &&
+                !isset($_template->parent->_cache['allow_relative_path'])
+            ) {
+                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
+            }
+            $path = dirname($_template->parent->source->filepath) . DS . $file;
+            // normalize path
+            $path = $source->smarty->_realpath($path);
+            // files relative to a template only get one shot
+            return is_file($path) ? $path : false;
+        }
+        // normalize DS
+        if (strpos($file, DS == '/' ? '\\' : '/') !== false) {
+            $file = str_replace(DS == '/' ? '\\' : '/', DS, $file);
+        }
+
+        $_directories = $source->smarty->getTemplateDir(null, $source->isConfig);
+        // template_dir index?
+        if ($file[0] == '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
+            $file = $fileMatch[2];
+            $_indices = explode(',', $fileMatch[1]);
+            $_index_dirs = array();
+            foreach ($_indices as $index) {
+                $index = trim($index);
+                // try string indexes
+                if (isset($_directories[$index])) {
+                    $_index_dirs[] = $_directories[$index];
+                } elseif (is_numeric($index)) {
+                    // try numeric index
+                    $index = (int) $index;
+                    if (isset($_directories[$index])) {
+                        $_index_dirs[] = $_directories[$index];
+                    } else {
+                        // try at location index
+                        $keys = array_keys($_directories);
+                        if (isset($_directories[$keys[$index]])) {
+                            $_index_dirs[] = $_directories[$keys[$index]];
+                        }
+                    }
+                }
+            }
+            if (empty($_index_dirs)) {
+                // index not found
+                return false;
+            } else {
+                $_directories = $_index_dirs;
+            }
+        }
+
+        // relative file name?
+        foreach ($_directories as $_directory) {
+            $path = $_directory . $file;
+            if (is_file($path)) {
+                return (strpos($path, '.' . DS) !== false) ? $source->smarty->_realpath($path) : $path;
+            }
+        }
+        if (!isset($_index_dirs)) {
+            // Could be relative to cwd
+            $path = $source->smarty->_realpath($file, true);
+            if (is_file($path)) {
+                return $path;
+            }
+        }
+        // Use include path ?
+        if ($source->smarty->use_include_path) {
+            return $source->smarty->ext->_getIncludePath->getIncludePath($_directories, $file, $source->smarty);
+        }
+        return false;
+    }
 
     /**
      * populate Source Object with meta data from Resource
@@ -24,20 +114,22 @@ class Smarty_Internal_Resource_File extends Smarty_Resource {
      * @param Smarty_Template_Source   $source    source object
      * @param Smarty_Internal_Template $_template template object
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $source->filepath = $this->buildFilepath($source, $_template);
 
         if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
+            if (isset($source->smarty->security_policy) && is_object($source->smarty->security_policy)) {
+                $source->smarty->security_policy->isTrustedResourceDir($source->filepath, $source->isConfig);
             }
-
+            $source->exists = true;
             $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check && !isset($source->timestamp)) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
+            if ($source->smarty->compile_check == 1) {
+                $source->timestamp = filemtime($source->filepath);
             }
+        } else {
+            $source->timestamp = false;
+            $source->exists = false;
         }
     }
 
@@ -48,43 +140,40 @@ class Smarty_Internal_Resource_File extends Smarty_Resource {
      */
     public function populateTimestamp(Smarty_Template_Source $source)
     {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
+        if (!$source->exists) {
+            $source->timestamp = $source->exists = is_file($source->filepath);
+        }
+        if ($source->exists) {
+            $source->timestamp = filemtime($source->filepath);
+        }
     }
 
     /**
      * Load template's source from file into current template object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
     public function getContent(Smarty_Template_Source $source)
     {
-        if ($source->timestamp) {
+        if ($source->exists) {
             return file_get_contents($source->filepath);
         }
-        if ($source instanceof Smarty_Config_Source) {
-            throw new SmartyException("Unable to read config {$source->type} '{$source->name}'");
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+        throw new SmartyException('Unable to read ' . ($source->isConfig ? 'config' : 'template') .
+                                  " {$source->type} '{$source->name}'");
     }
 
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
     public function getBasename(Smarty_Template_Source $source)
     {
-        $_file = $source->name;
-        if (($_pos = strpos($_file, ']')) !== false) {
-            $_file = substr($_file, $_pos + 1);
-        }
-        return basename($_file);
+        return basename($source->filepath);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_php.php b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_php.php
index 7cd8bae..6268062 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_php.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_php.php
@@ -2,76 +2,56 @@
 
 /**
  * Smarty Internal Plugin Resource PHP
- *
  * Implements the file system as resource for PHP templates
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
-class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
+class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
+{
+    /**
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
+     */
+    public $uncompiled = true;
     /**
      * container for short_open_tag directive's value before executing PHP templates
+     *
      * @var string
      */
     protected $short_open_tag;
 
     /**
-     * Create a new PHP Resource
+     * Resource does implement populateCompiledFilepath() method
      *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
+
+
+    /**
+     * Create a new PHP Resource
+
      */
     public function __construct()
     {
-        $this->short_open_tag = ini_get( 'short_open_tag' );
-    }
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
-
-        if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
-            }
-
-            $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
-            }
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
+        $this->short_open_tag = ini_get('short_open_tag');
     }
 
     /**
      * Load template's source from file into current template object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
     public function getContent(Smarty_Template_Source $source)
     {
-        if ($source->timestamp) {
+        if ($source->exists) {
             return '';
         }
         throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
@@ -80,20 +60,19 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
     /**
      * Render and output the template (without using the compiler)
      *
-     * @param Smarty_Template_Source $source source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
-     * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled
+     * @throws SmartyException          if template cannot be loaded or allow_php_templates is disabled
      */
     public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
     {
-        $_smarty_template = $_template;
-
         if (!$source->smarty->allow_php_templates) {
             throw new SmartyException("PHP templates are disabled");
         }
         if (!$source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
+            if (isset($_template->parent) && $_template->parent->_objType == 2) {
                 $parent_resource = " in '{$_template->parent->template_resource}'";
             } else {
                 $parent_resource = '';
@@ -105,10 +84,25 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
         extract($_template->getTemplateVars());
 
         // include PHP template with short open tags enabled
-        ini_set( 'short_open_tag', '1' );
+        ini_set('short_open_tag', '1');
+        /** @var Smarty_Internal_Template $_smarty_template
+         * used in included file
+         */
+        $_smarty_template = $_template;
         include($source->filepath);
-        ini_set( 'short_open_tag', $this->short_open_tag );
+        ini_set('short_open_tag', $this->short_open_tag);
+    }
+
+    /**
+     * populate compiled object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object (is ignored)
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = false;
+        $compiled->timestamp = false;
+        $compiled->exists = false;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php
index 44497b9..69b396b 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_registered.php
@@ -2,31 +2,31 @@
 /**
  * Smarty Internal Plugin Resource Registered
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource Registered
- *
  * Implements the registered resource for Smarty template
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  * @deprecated
  */
-class Smarty_Internal_Resource_Registered extends Smarty_Resource {
-
+class Smarty_Internal_Resource_Registered extends Smarty_Resource
+{
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $source->filepath = $source->type . ':' . $source->name;
         $source->uid = sha1($source->filepath);
@@ -39,7 +39,8 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource {
     /**
      * populate Source Object with timestamp and exists from Resource
      *
-     * @param Smarty_Template_Source $source source object
+     * @param  Smarty_Template_Source $source source object
+     *
      * @return void
      */
     public function populateTimestamp(Smarty_Template_Source $source)
@@ -51,45 +52,48 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource {
     /**
      * Get timestamp (epoch) the template source was modified
      *
-     * @param Smarty_Template_Source $source source object
-     * @return integer|boolean timestamp (epoch) the template was modified, false if resources has no timestamp
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return integer|boolean        timestamp (epoch) the template was modified, false if resources has no timestamp
      */
     public function getTemplateTimestamp(Smarty_Template_Source $source)
     {
         // return timestamp
         $time_stamp = false;
         call_user_func_array($source->smarty->registered_resources[$source->type][0][1], array($source->name, &$time_stamp, $source->smarty));
+
         return is_numeric($time_stamp) ? (int) $time_stamp : $time_stamp;
     }
 
     /**
      * Load template's source by invoking the registered callback into current template object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
     public function getContent(Smarty_Template_Source $source)
     {
         // return template string
-        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$source->content, $source->smarty));
+        $content = null;
+        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$content, $source->smarty));
         if (is_bool($t) && !$t) {
             throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
         }
-        return $source->content;
+
+        return $content;
     }
 
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return basename($source->name);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php
index 58086c1..8a90226 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_stream.php
@@ -1,36 +1,35 @@
 <?php
 /**
-* Smarty Internal Plugin Resource Stream
-*
-* Implements the streams as resource for Smarty template
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Uwe Tews
-* @author Rodney Rehm
-*/
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
 
 /**
-* Smarty Internal Plugin Resource Stream
-*
-* Implements the streams as resource for Smarty template
-*
-* @link http://php.net/streams
-* @package Smarty
-* @subpackage TemplateResources
-*/
-class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
-
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @link       http://php.net/streams
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
+{
     /**
-    * populate Source Object with meta data from Resource
-    *
-    * @param Smarty_Template_Source   $source    source object
-    * @param Smarty_Internal_Template $_template template object
-    * @return void
-    */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        if(strpos($source->resource, '://') !== false) {
+        if (strpos($source->resource, '://') !== false) {
             $source->filepath = $source->resource;
         } else {
             $source->filepath = str_replace(':', '://', $source->resource);
@@ -42,12 +41,13 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
     }
 
     /**
-    * Load template's source from stream into current template object
-    *
-    * @param Smarty_Template_Source $source source object
-    * @return string template source
-    * @throws SmartyException if source cannot be loaded
-    */
+     * Load template's source from stream into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
     public function getContent(Smarty_Template_Source $source)
     {
         $t = '';
@@ -58,6 +58,7 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
                 $t .= $current_line;
             }
             fclose($fp);
+
             return $t;
         } else {
             return false;
@@ -65,13 +66,15 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
     }
 
     /**
-    * modify resource_name according to resource handlers specifications
-    *
-    * @param Smarty $smarty        Smarty instance
-    * @param string $resource_name resource_name to make unique
-    * @return string unique resource name
-    */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty   $smarty        Smarty instance
+     * @param string   $resource_name resource_name to make unique
+     * @param  boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
+     */
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
         return get_class($this) . '#' . $resource_name;
     }
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_string.php b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_string.php
index 9571337..75e99e6 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_resource_string.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_resource_string.php
@@ -2,32 +2,31 @@
 /**
  * Smarty Internal Plugin Resource String
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Internal Plugin Resource String
- *
  * Implements the strings as resource for Smarty template
- *
  * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-class Smarty_Internal_Resource_String extends Smarty_Resource {
-
+class Smarty_Internal_Resource_String extends Smarty_Resource
+{
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
         $source->uid = $source->filepath = sha1($source->name);
         $source->timestamp = 0;
@@ -38,18 +37,21 @@ class Smarty_Internal_Resource_String extends Smarty_Resource {
      * Load template's source from $resource_name into current template object
      *
      * @uses decode() to decode base64 and urlencoded template_resources
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
+     *
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
      */
     public function getContent(Smarty_Template_Source $source)
     {
         return $this->decode($source->name);
     }
-    
+
     /**
      * decode base64 and urlencode
      *
-     * @param string $string template_resource to decode
+     * @param  string $string template_resource to decode
+     *
      * @return string decoded template_resource
      */
     protected function decode($string)
@@ -62,35 +64,34 @@ class Smarty_Internal_Resource_String extends Smarty_Resource {
                 return urldecode(substr($string, 10));
             }
         }
-        
+
         return $string;
     }
-    
+
     /**
      * modify resource_name according to resource handlers specifications
      *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
+     * @param  Smarty  $smarty        Smarty instance
+     * @param  string  $resource_name resource_name to make unique
+     * @param  boolean $isConfig      flag for config resource
+     *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
-        return get_class($this) . '#' .$this->decode($resource_name);
+        return get_class($this) . '#' . $this->decode($resource_name);
     }
 
     /**
      * Determine basename for compiled filename
-     *
      * Always returns an empty string.
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return '';
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
new file mode 100644
index 0000000..4e2fb83
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_CacheModify
+{
+    /**
+     * check client side cache
+     *
+     * @param Smarty_Internal_Template $_template
+     * @param  string                  $content
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        $_isCached = $_template->isCached() && !$_template->compiled->has_nocache_code;
+        $_last_modified_date =
+            @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+        if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) {
+            switch (PHP_SAPI) {
+                case 'cgi': // php-cgi < 5.3
+                case 'cgi-fcgi': // php-cgi >= 5.3
+                case 'fpm-fcgi': // php-fpm >= 5.3.3
+                    header('Status: 304 Not Modified');
+                    break;
+
+                case 'cli':
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+                    }
+                    break;
+
+                default:
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+                    } else {
+                        header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
+                    }
+                    break;
+            }
+        } else {
+            switch (PHP_SAPI) {
+                case 'cli':
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] =
+                            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT';
+                    }
+                    break;
+                default:
+                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT');
+                    break;
+            }
+            echo $content;
+        }
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
new file mode 100644
index 0000000..ce67497
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Internal Extension
+ * This file contains the Smarty template extension to create a code frame
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class Smarty_Internal_Extension_CodeFrame
+ * Create code frame for compiled and cached templates
+ */
+class Smarty_Internal_Runtime_CodeFrame
+{
+    /**
+     * Create code frame for compiled and cached templates
+     *
+     * @param Smarty_Internal_Template              $_template
+     * @param string                                $content optional template content
+     * @param string                                $functions compiled template function and block code
+     * @param bool                                  $cache   flag for cache file
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @return string
+     */
+    public function create(Smarty_Internal_Template $_template, $content = '', $functions = '', $cache = false,
+                           Smarty_Internal_TemplateCompilerBase $compiler = null)
+    {
+        // build property code
+        $properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
+        $properties[ 'version' ] = Smarty::SMARTY_VERSION;
+        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+        if (!$cache) {
+            $properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
+            $properties[ 'includes' ] = $_template->compiled->includes;
+            if (!empty($compiler->tpl_function)) {
+                $properties[ 'tpl_function' ] = $compiler->tpl_function;
+            }
+        } else {
+            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
+            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
+            if (!empty($_template->tpl_function)) {
+                $properties[ 'tpl_function' ] = $_template->tpl_function;
+            }
+        }
+        $output = "<?php\n";
+        $output .= "/* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
+            "\n  from \"" . $_template->source->filepath . "\" */\n\n";
+
+        $dec = "\$_smarty_tpl->smarty->ext->_validateCompiled->decodeProperties(\$_smarty_tpl, " .
+            var_export($properties, true) . ',' . ($cache ? 'true' : 'false') . ")";
+        $output .= "if ({$dec}) {\n";
+        $output .= "function {$properties['unifunc']} (\$_smarty_tpl) {\n";
+        // include code for plugins
+        if (!$cache) {
+            if (!empty($_template->compiled->required_plugins[ 'compiled' ])) {
+                foreach ($_template->compiled->required_plugins[ 'compiled' ] as $tmp) {
+                    foreach ($tmp as $data) {
+                        $file = addslashes($data[ 'file' ]);
+                        if (is_array($data[ 'function' ])) {
+                            $output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n";
+                        } else {
+                            $output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n";
+                        }
+                    }
+                }
+            }
+            if ($_template->caching && !empty($_template->compiled->required_plugins[ 'nocache' ])) {
+                $_template->compiled->has_nocache_code = true;
+                $output .= "echo '/*%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
+                foreach ($_template->compiled->required_plugins[ 'nocache' ] as $tmp) {
+                    foreach ($tmp as $data) {
+                        $file = addslashes($data[ 'file' ]);
+                        if (is_Array($data[ 'function' ])) {
+                            $output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n");
+                        } else {
+                            $output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n");
+                        }
+                    }
+                }
+                $output .= "?>/*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/';\n";
+            }
+        }
+        $output .= "?>\n";
+        $output .= $content;
+        $output .= "<?php }\n?>";
+        $output .= $functions;
+        $output .= "<?php }\n";
+        // remove unneeded PHP tags
+        return preg_replace(array('/\s*\?>[\n]?<\?php\s*/', '/\?>\s*$/'), array("\n", ''), $output);
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
new file mode 100644
index 0000000..4b664c3
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Smarty Internal Plugin Filter Handler
+ * Smarty filter handler class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class for filter processing
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_FilterHandler
+{
+    /**
+     * Run filters over content
+     * The filters will be lazy loaded if required
+     * class name format: Smarty_FilterType_FilterName
+     * plugin filename format: filtertype.filtername.php
+     * Smarty2 filter plugins could be used
+     *
+     * @param  string                   $type     the type of filter ('pre','post','output') which shall run
+     * @param  string                   $content  the content which shall be processed by the filters
+     * @param  Smarty_Internal_Template $template template object
+     *
+     * @throws SmartyException
+     * @return string                   the filtered content
+     */
+    public function runFilter($type, $content, Smarty_Internal_Template $template)
+    {
+        // loop over autoload filters of specified type
+        if (!empty($template->smarty->autoload_filters[$type])) {
+            foreach ((array) $template->smarty->autoload_filters[$type] as $name) {
+                $plugin_name = "Smarty_{$type}filter_{$name}";
+                if (function_exists($plugin_name)) {
+                    $callback = $plugin_name;
+                } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                    $callback = array($plugin_name, 'execute');
+                } elseif ($template->smarty->loadPlugin($plugin_name, false)) {
+                    if (function_exists($plugin_name)) {
+                        // use loaded Smarty2 style plugin
+                        $callback = $plugin_name;
+                    } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                        // loaded class of filter plugin
+                        $callback = array($plugin_name, 'execute');
+                    } else {
+                        throw new SmartyException("Auto load {$type}-filter plugin method \"{$plugin_name}::execute\" not callable");
+                    }
+                } else {
+                    // nothing found, throw exception
+                    throw new SmartyException("Unable to auto load {$type}-filter plugin \"{$plugin_name}\"");
+                }
+                $content = call_user_func($callback, $content, $template);
+            }
+        }
+        // loop over registered filters of specified type
+        if (!empty($template->smarty->registered_filters[$type])) {
+            foreach ($template->smarty->registered_filters[$type] as $key => $name) {
+                if (is_array($template->smarty->registered_filters[$type][$key])) {
+                    $content = call_user_func($template->smarty->registered_filters[$type][$key], $content, $template);
+                } else {
+                    $content = $template->smarty->registered_filters[$type][$key]($content, $template);
+                }
+            }
+        }
+        // return filtered output
+        return $content;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
new file mode 100644
index 0000000..689636a
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Foreach Runtime Methods count
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Foreach
+{
+    /**
+     * [util function] counts an array, arrayAccess/traversable or PDOStatement object
+     *
+     * @param  mixed $value
+     *
+     * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
+     *               for empty elements
+     */
+    public function count($value)
+    {
+        if (is_array($value) === true || $value instanceof Countable) {
+            return count($value);
+        } elseif ($value instanceof IteratorAggregate) {
+            // Note: getIterator() returns a Traversable, not an Iterator
+            // thus rewind() and valid() methods may not be present
+            return iterator_count($value->getIterator());
+        } elseif ($value instanceof Iterator) {
+            if ($value instanceof Generator) {
+                return 1;
+            }
+            return iterator_count($value);
+        } elseif ($value instanceof PDOStatement) {
+            return $value->rowCount();
+        } elseif ($value instanceof Traversable) {
+            return iterator_count($value);
+        } elseif ($value instanceof ArrayAccess) {
+            if ($value->offsetExists(0)) {
+                return 1;
+            }
+        } elseif (is_object($value)) {
+            return count($value);
+        }
+        return 0;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
new file mode 100644
index 0000000..72149cd
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Smarty read include path plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Read Include Path Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_GetIncludePath
+{
+    /**
+     * include path cache
+     *
+     * @var string
+     */
+    public $_include_path = '';
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_include_dirs = array();
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_user_dirs = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[]
+     */
+    public $isFile = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[]
+     */
+    public $isPath = array();
+
+    /**
+     * stream cache
+     *
+     * @var int[]
+     */
+    public $number = array();
+
+    /**
+     * status cache
+     *
+     * @var bool
+     */
+    public $_has_stream_include = null;
+
+    /**
+     * Number for array index
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Check if include path was updated
+     *
+     * @param \Smarty $smarty
+     *
+     * @return bool
+     */
+    public function isNewIncludePath(Smarty $smarty)
+    {
+        $_i_path = get_include_path();
+        if ($this->_include_path != $_i_path) {
+            $this->_include_dirs = array();
+            $this->_include_path = $_i_path;
+            $_dirs = (array) explode(PATH_SEPARATOR, $_i_path);
+            foreach ($_dirs as $_path) {
+                if (is_dir($_path)) {
+                    $this->_include_dirs[] = $smarty->_realpath($_path . DS, true);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * return array with include path directories
+     *
+     * @param \Smarty $smarty
+     *
+     * @return array
+     */
+    public function getIncludePathDirs(Smarty $smarty)
+    {
+        $this->isNewIncludePath($smarty);
+        return $this->_include_dirs;
+    }
+
+    /**
+     * Return full file path from PHP include_path
+     *
+     * @param  string[] $dirs
+     * @param  string   $file
+     * @param \Smarty   $smarty
+     *
+     * @return bool|string full filepath or false
+     *
+     */
+    public function getIncludePath($dirs, $file, Smarty $smarty)
+    {
+        //if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
+           if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = function_exists('stream_resolve_include_path'))) {
+                $this->isNewIncludePath($smarty);
+        }
+        // try PHP include_path
+        foreach ($dirs as $dir) {
+            $dir_n = isset($this->number[$dir]) ? $this->number[$dir] : $this->number[$dir] = $this->counter ++;
+            if (isset($this->isFile[$dir_n][$file])) {
+                if ($this->isFile[$dir_n][$file]) {
+                    return $this->isFile[$dir_n][$file];
+                } else {
+                    continue;
+                }
+            }
+            if (isset($this->_user_dirs[$dir_n])) {
+                if (false === $this->_user_dirs[$dir_n]) {
+                    continue;
+                } else {
+                    $dir = $this->_user_dirs[$dir_n];
+                }
+            } else {
+                if ($dir[0] == '/' || $dir[1] == ':') {
+                    $dir = str_ireplace(getcwd(), '.', $dir);
+                    if ($dir[0] == '/' || $dir[1] == ':') {
+                        $this->_user_dirs[$dir_n] = false;
+                        continue;
+                    }
+                }
+                $dir = substr($dir, 2);
+                $this->_user_dirs[$dir_n] = $dir;
+            }
+            if ($this->_has_stream_include) {
+                $path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
+                if ($path) {
+                    return $this->isFile[$dir_n][$file] = $path;
+                }
+            } else {
+                foreach ($this->_include_dirs as $key => $_i_path) {
+                    $path = isset($this->isPath[$key][$dir_n]) ? $this->isPath[$key][$dir_n] : $this->isPath[$key][$dir_n] = is_dir($_dir_path = $_i_path .
+                        $dir) ? $_dir_path : false;
+                    if ($path === false) {
+                        continue;
+                    }
+                    if (isset($file)) {
+                        $_file = $this->isFile[$dir_n][$file] = (is_file($path . $file)) ? $path . $file : false;
+                        if ($_file) {
+                            return $_file;
+                        }
+                    } else {
+                        // no file was given return directory path
+                        return $path;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php
new file mode 100644
index 0000000..117cd81
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Runtime Extension Hhvm
+ *
+ * include patch for modified compiled or cached templates
+ * HHVM does not check if file was modified when including same file multiple times
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Hhvm
+{
+    /**
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $file file name
+     *
+     * @return mixed
+     */
+    static function includeHhvm(Smarty_Internal_Template $_template, $file)
+    {
+        $_smarty_tpl = $_template;
+        $tmp_file = $file . preg_replace('![^\w]+!', '_', uniqid(rand(), true)) . '.php';
+        file_put_contents($tmp_file, file_get_contents($file));
+        $result = @include $tmp_file;
+        @unlink($tmp_file);
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
new file mode 100644
index 0000000..08a5606
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
@@ -0,0 +1,233 @@
+<?php
+
+/**
+ * Inheritance Runtime Methods processBlock, endChild, init
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Inheritance
+{
+
+    /**
+     * State machine
+     * - 0 idle next extends will create a new inheritance tree
+     * - 1 processing child template
+     * - 2 wait for next inheritance template
+     * - 3 assume parent template, if child will loaded goto state 1
+     *     a call to a sub template resets the state to 0
+     *
+     * @var int
+     */
+    public $state = 0;
+
+    /**
+     * Array of block parameter of known {block} tags
+     *
+     * @var array
+     */
+    public $blockParameter = array();
+
+    /**
+     * inheritance template nesting level
+     *
+     * @var int
+     */
+    public $inheritanceLevel = 0;
+
+    /**
+     * inheritance template index
+     *
+     * @var int
+     */
+    public $tplIndex = - 1;
+
+    /**
+     * Array of compiled template file path
+     * - key template index
+     * only used when caching is enabled
+     *
+     * @var []string
+     */
+    public $compiledFilePath = array();
+
+    /**
+     * Current {block} nesting level
+     *
+     * @var int
+     */
+    public $blockNesting = 0;
+
+    /**
+     * Initialize inheritance
+     *
+     * @param \Smarty_Internal_Template $tpl        template object of caller
+     * @param bool                      $initChild  if true init for child template
+     * @param array                     $blockNames outer level block name
+     *
+     */
+    public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
+    {
+        // if template was from an inner block or template is a parent template create new inheritance root
+        if ($initChild && ($this->blockNesting || $this->state == 3)) {
+            $tpl->ext->_inheritance = new Smarty_Internal_Runtime_Inheritance();
+            $tpl->ext->_inheritance->init($tpl, $initChild, $blockNames);
+            return;
+        }
+        // start of child sub template(s)
+        if ($initChild) {
+            $this->state = 1;
+            if (!$this->inheritanceLevel) {
+                //grab any output of child templates
+                ob_start();
+            }
+            $this->inheritanceLevel ++;
+        }
+        // in parent state {include} will not increment template index
+        if ($this->state != 3) {
+            $this->tplIndex ++;
+        }
+        // if state was waiting for parent change state to parent
+        if ($this->state == 2) {
+            $this->state = 3;
+        }
+    }
+
+    /**
+     * End of child template(s)
+     * - if outer level is reached flush output buffer and switch to wait for parent template state
+     *
+     * @param \Smarty_Internal_Template $tpl template object of caller
+     */
+    public function endChild(Smarty_Internal_Template $tpl)
+    {
+        $this->inheritanceLevel --;
+        if (!$this->inheritanceLevel) {
+            ob_end_clean();
+            $this->state = 2;
+        }
+    }
+
+    /**
+     * Process inheritance {block} tag
+     *
+     * $type 0 = {block}:
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise call current block
+     *  - ignored for outer level blocks in child templates
+     *
+     * $type 1 = {block}:
+     *  - nested {block}
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise call current block
+     *
+     * $type 2 = {$smarty.block.child}:
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise ignore
+     *
+     * $type 3 = {block append} {block prepend}:
+     *  - call parent block
+     *
+     * $type 4 = {$smarty.block.parent}:
+     *  - call parent block
+     *
+     * @param \Smarty_Internal_Template $tpl       template object of caller
+     * @param int                       $type      call type see above
+     * @param string                    $name      block name
+     * @param array                     $block     block parameter
+     * @param array                     $callStack call stack with block parameters
+     *
+     * @throws \SmartyException
+     */
+    public function processBlock(Smarty_Internal_Template $tpl, $type = 0, $name, $block, $callStack = array())
+    {
+        if (!isset($this->blockParameter[ $name ])) {
+            $this->blockParameter[ $name ] = array();
+        }
+        if ($this->state == 1) {
+            $block[ 2 ] = count($this->blockParameter[ $name ]);
+            $block[ 3 ] = $this->tplIndex;
+            $this->blockParameter[ $name ][] = $block;
+            return;
+        }
+        if ($type == 3) {
+            if (!empty($callStack)) {
+                $block = array_shift($callStack);
+            } else {
+                return;
+            }
+        } elseif ($type == 4) {
+            if (!empty($callStack)) {
+                array_shift($callStack);
+                if (empty($callStack)) {
+                    throw new SmartyException("inheritance: tag {\$smarty.block.parent} used in parent template block '{$name}'");
+                }
+                $block = array_shift($callStack);
+            } else {
+                return;
+            }
+        } else {
+            $index = 0;
+            $blockParameter = &$this->blockParameter[ $name ];
+            if ($type == 0) {
+                $index = $block[ 2 ] = count($blockParameter);
+                $block[ 3 ] = $this->tplIndex;
+                $callStack = array(&$block);
+            } elseif ($type == 1) {
+                $block[ 3 ] = $callStack[ 0 ][ 3 ];
+                for ($i = 0; $i < count($blockParameter); $i ++) {
+                    if ($blockParameter[ $i ][ 3 ] <= $block[ 3 ]) {
+                        $index = $blockParameter[ $i ][ 2 ];
+                    }
+                }
+                $block[ 2 ] = $index;
+                $callStack = array(&$block);
+            } elseif ($type == 2) {
+                $index = $callStack[ 0 ][ 2 ];
+                if ($index == 0) {
+                    return;
+                }
+                $callStack = $block = array(1 => false);
+            }
+            $index --;
+            // find lowest level child block
+            while ($index >= 0 && ($type || !$block[ 1 ])) {
+                $block = &$blockParameter[ $index ];
+                array_unshift($callStack, $block);
+                if ($block[ 1 ]) {
+                    break;
+                }
+                $index --;
+            }
+            if (isset($block[ 'hide' ]) && $index <= 0) {
+                return;
+            }
+        }
+        $this->blockNesting ++;
+        // {block append} ?
+        if (isset($block[ 'append' ])) {
+            $appendStack = $callStack;
+            if ($type == 0) {
+                array_shift($appendStack);
+            }
+            $this->processBlock($tpl, 3, $name, null, $appendStack);
+        }
+        // call block of current stack level
+        if (isset($block[6])) {
+            $block[6]($tpl, $callStack);
+        } else {
+            $block[0]($tpl, $callStack);
+        }
+        // {block prepend} ?
+        if (isset($block[ 'prepend' ])) {
+            $prependStack = $callStack;
+            if ($type == 0) {
+                array_shift($prependStack);
+            }
+            $this->processBlock($tpl, 3, $name, null, $prependStack);
+        }
+        $this->blockNesting --;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php
new file mode 100644
index 0000000..2c7623f
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * Sub Template Runtime Methods render, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_SubTemplate
+{
+
+    /**
+     * Subtemplate template object cache
+     *
+     * @var Smarty_Internal_Template[]
+     */
+    public $tplObjects = array();
+
+    /**
+     * Subtemplate call count
+     *
+     * @var int[]
+     */
+    public $subTplInfo = array();
+
+    /**
+     * Runtime function to render subtemplate
+     *
+     * @param \Smarty_Internal_Template $parent
+     * @param string                    $template       template name
+     * @param mixed                     $cache_id       cache id
+     * @param mixed                     $compile_id     compile id
+     * @param integer                   $caching        cache mode
+     * @param integer                   $cache_lifetime life time of cache data
+     * @param array                     $data           passed parameter template variables
+     * @param int                       $scope          scope in which {include} should execute
+     * @param bool                      $forceTplCache  cache template object
+     * @param string                    $uid            file dependency uid
+     * @param string                    $content_func   function name
+     *
+     */
+    public function render(Smarty_Internal_Template $parent, $template, $cache_id, $compile_id, $caching,
+                           $cache_lifetime, $data, $scope, $forceTplCache, $uid = null, $content_func = null)
+    {
+        // if there are cached template objects calculate $templateID
+        $_templateId =
+            !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
+                null;
+        // already in template cache?
+        /* @var Smarty_Internal_Template $tpl */
+        if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
+            // clone cached template object because of possible recursive call
+            $tpl = clone $this->tplObjects[$_templateId];
+            $tpl->parent = $parent;
+            // if $caching mode changed the compiled resource is invalid
+            if ((bool) $tpl->caching !== (bool) $caching) {
+                unset($tpl->compiled);
+            }
+            // get variables from calling scope
+            $tpl->tpl_vars = $parent->tpl_vars;
+            $tpl->config_vars = $parent->config_vars;
+            // get template functions
+            $tpl->tpl_function = $parent->tpl_function;
+            // copy inheritance object?
+            if (isset($parent->ext->_inheritance)) {
+                $tpl->ext->_inheritance = $parent->ext->_inheritance;
+            } else {
+                unset($tpl->ext->_inheritance);
+            }
+        } else {
+            $tpl = clone $parent;
+            $tpl->parent = $parent;
+            if (!isset($tpl->templateId) || $tpl->templateId !== $_templateId) {
+                $tpl->templateId = $_templateId;
+                $tpl->template_resource = $template;
+                $tpl->cache_id = $cache_id;
+                $tpl->compile_id = $compile_id;
+                if (isset($uid)) {
+                    // for inline templates we can get all resource information from file dependency
+                    if (isset($tpl->compiled->file_dependency[$uid])) {
+                        list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
+                        $tpl->source =
+                            new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
+                                                           $tpl->smarty->_cache['resource_handlers'][$resource] :
+                                                           Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
+                                                       $filepath, $resource, $filepath);
+                        $tpl->source->filepath = $filepath;
+                        $tpl->source->timestamp = $timestamp;
+                        $tpl->source->exists = true;
+                        $tpl->source->uid = $uid;
+                    } else {
+                        $tpl->source = null;
+                    }
+                } else {
+                    $tpl->source = null;
+                }
+                if (!isset($tpl->source)) {
+                    $tpl->source = Smarty_Template_Source::load($tpl);
+                    unset($tpl->compiled);
+                }
+                unset($tpl->cached);
+            }
+        }
+        $tpl->caching = $caching;
+        $tpl->cache_lifetime = $cache_lifetime;
+        if ($caching == 9999) {
+            $tpl->cached = $parent->cached;
+        }
+        // set template scope
+        $tpl->scope = $scope;
+        $scopePtr = false;
+        if ($scope & ~Smarty::SCOPE_BUBBLE_UP) {
+            if ($scope == Smarty::SCOPE_GLOBAL) {
+                $tpl->tpl_vars = Smarty::$global_tpl_vars;
+                $tpl->config_vars = $tpl->smarty->config_vars;
+                $scopePtr = true;
+            } else {
+                if ($scope == Smarty::SCOPE_PARENT) {
+                    $scopePtr = $parent;
+                } elseif ($scope == Smarty::SCOPE_SMARTY) {
+                    $scopePtr = $tpl->smarty;
+                } else {
+                    $scopePtr = $tpl;
+                    while (isset($scopePtr->parent)) {
+                        if ($scopePtr->parent->_objType != 2 && $scope & Smarty::SCOPE_TPL_ROOT) {
+                            break;
+                        }
+                        $scopePtr = $scopePtr->parent;
+                    }
+                }
+                $tpl->tpl_vars = $scopePtr->tpl_vars;
+                $tpl->config_vars = $scopePtr->config_vars;
+            }
+        }
+
+        if (!isset($this->tplObjects[$tpl->_getTemplateId()]) && !$tpl->source->handler->recompiled) {
+            // if template is called multiple times set flag to to cache template objects
+            $forceTplCache = $forceTplCache ||
+                (isset($this->subTplInfo[$tpl->template_resource]) && $this->subTplInfo[$tpl->template_resource] > 1);
+            // check if template object should be cached
+            if ($tpl->parent->_objType == 2 && isset($this->tplObjects[$tpl->parent->templateId]) ||
+                ($forceTplCache && $tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC) ||
+                ($tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+            ) {
+                $this->tplObjects[$tpl->_getTemplateId()] = $tpl;
+            }
+        }
+
+        if (!empty($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        }
+        if (isset($uid)) {
+            if ($parent->smarty->debugging) {
+                $parent->smarty->_debug->start_template($tpl);
+                $parent->smarty->_debug->start_render($tpl);
+            }
+            $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
+            if ($parent->smarty->debugging) {
+                $parent->smarty->_debug->end_template($tpl);
+                $parent->smarty->_debug->end_render($tpl);
+            }
+            if ($tpl->caching == 9999 && $tpl->compiled->has_nocache_code) {
+                $parent->cached->hashes[$tpl->compiled->nocache_hash] = true;
+            }
+        } else {
+            if (isset($tpl->compiled)) {
+                $tpl->compiled->render($tpl);
+            } else {
+                $tpl->render();
+            }
+        }
+        if ($scopePtr) {
+            if ($scope == Smarty::SCOPE_GLOBAL) {
+                Smarty::$global_tpl_vars = $tpl->tpl_vars;
+                $tpl->smarty->config_vars = $tpl->config_vars;
+            } else {
+                $scopePtr->tpl_vars = $tpl->tpl_vars;
+                $scopePtr->config_vars = $tpl->config_vars;
+            }
+        }
+    }
+
+    /**
+     * Get called subtemplates from compiled template and save call count
+     *
+     * @param \Smarty_Internal_Template $tpl
+     */
+    public function registerSubTemplates(Smarty_Internal_Template $tpl)
+    {
+        foreach ($tpl->compiled->includes as $name => $count) {
+            if (isset($this->subTplInfo[$name])) {
+                $this->subTplInfo[$name] += $count;
+            } else {
+                $this->subTplInfo[$name] = $count;
+            }
+        }
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
new file mode 100644
index 0000000..634ed5d
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Tplfunc Runtime Methods callTemplateFunction
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_TplFunction
+{
+    /**
+     * Call template function
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $name    template function name
+     * @param array                     $params  parameter array
+     * @param bool                      $nocache true if called nocache
+     *
+     * @throws \SmartyException
+     */
+    public function callTemplateFunction(Smarty_Internal_Template $tpl, $name, $params, $nocache)
+    {
+        if (isset($tpl->tpl_function[$name])) {
+            if (!$tpl->caching || ($tpl->caching && $nocache)) {
+                $function = $tpl->tpl_function[$name]['call_name'];
+            } else {
+                if (isset($tpl->tpl_function[$name]['call_name_caching'])) {
+                    $function = $tpl->tpl_function[$name]['call_name_caching'];
+                } else {
+                    $function = $tpl->tpl_function[$name]['call_name'];
+                }
+            }
+            if (function_exists($function)) {
+                $function ($tpl, $params);
+                return;
+            }
+            // try to load template function dynamically
+            if ($this->addTplFuncToCache($tpl, $name, $function)) {
+                $function ($tpl, $params);
+                return;
+            }
+        }
+        throw new SmartyException("Unable to find template function '{$name}'");
+    }
+
+    /**
+     *
+     * Add template function to cache file for nocache calls
+     *
+     * @param Smarty_Internal_Template $tpl
+     * @param string                   $_name     template function name
+     * @param string                   $_function PHP function name
+     *
+     * @return bool
+     */
+    public function addTplFuncToCache(Smarty_Internal_Template $tpl, $_name, $_function)
+    {
+        $funcParam = $tpl->tpl_function[$_name];
+        if (is_file($funcParam['compiled_filepath'])) {
+            // read compiled file
+            $code = file_get_contents($funcParam['compiled_filepath']);
+            // grab template function
+            if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
+                // grab source info from file dependency
+                preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
+                unset($code);
+                // make PHP function known
+                eval($match[0]);
+                if (function_exists($_function)) {
+                    // search cache file template
+                    $tplPtr = $tpl;
+                    while (!isset($tplPtr->cached) && isset($tplPtr->parent)) {
+                        $tplPtr = $tplPtr->parent;
+                    }
+                    // add template function code to cache file
+                    if (isset($tplPtr->cached)) {
+                        $cache = $tplPtr->cached;
+                        $content = $cache->read($tplPtr);
+                        if ($content) {
+                            // check if we must update file dependency
+                            if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
+                                $content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
+                            }
+                            $tplPtr->smarty->ext->_updateCache->write($cache, $tplPtr, preg_replace('/\s*\?>\s*$/', "\n", $content) . "\n" .
+                                                 preg_replace(array('/^\s*<\?php\s+/', '/\s*\?>\s*$/'), "\n",
+                                                              $match[0]));
+                        }
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
new file mode 100644
index 0000000..a895a30
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
@@ -0,0 +1,170 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_UpdateCache
+{
+    /**
+     * check client side cache
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param  string                  $content
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+    }
+
+    /**
+     * Sanitize content and write it to cache resource
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param bool                     $no_output_filter
+     *
+     * @throws \SmartyException
+     */
+    public function removeNoCacheHash(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template,
+                                      $no_output_filter)
+    {
+        $content = ob_get_clean();
+        unset($cached->hashes[$_template->compiled->nocache_hash]);
+        if (!empty($cached->hashes)) {
+            $hash_array = array();
+            foreach ($cached->hashes as $hash => $foo) {
+                $hash_array[] = "/{$hash}/";
+            }
+            $content = preg_replace($hash_array, $_template->compiled->nocache_hash, $content);
+        }
+        $_template->cached->has_nocache_code = false;
+        // get text between non-cached items
+        $cache_split =
+            preg_split("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
+                       $content);
+        // get non-cached items
+        preg_match_all("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
+                       $content, $cache_parts);
+        $content = '';
+        // loop over items, stitch back together
+        foreach ($cache_split as $curr_idx => $curr_split) {
+            // escape PHP tags in template content
+            $content .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/',
+                                     "<?php echo '\$1'; ?>\n", $curr_split);
+            if (isset($cache_parts[0][$curr_idx])) {
+                $_template->cached->has_nocache_code = true;
+                $content .= $cache_parts[1][$curr_idx];
+            }
+        }
+        if (!$no_output_filter && !$_template->compiled->has_nocache_code &&
+            (isset($_template->smarty->autoload_filters['output']) ||
+                isset($_template->smarty->registered_filters['output']))
+        ) {
+            $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
+        }
+        // write cache file content
+        $this->writeCachedContent($cached, $_template, $content);
+    }
+
+    /**
+     * Cache was invalid , so render from compiled and write to cache
+     *
+     * @param \Smarty_Template_Cached   $cached
+     * @param \Smarty_Internal_Template $_template
+     * @param                           $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function updateCache(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $no_output_filter)
+    {
+        if ($_template->source->handler->uncompiled) {
+            ob_start();
+            $_template->source->render($_template);
+        } else {
+            ob_start();
+            if (!isset($_template->compiled)) {
+                $_template->loadCompiled();
+            }
+            $_template->compiled->render($_template);
+        }
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->start_cache($_template);
+        }
+        $this->removeNoCacheHash($cached, $_template, $no_output_filter);
+        $compile_check = $_template->smarty->compile_check;
+        $_template->smarty->compile_check = false;
+        if (isset($_template->parent) && $_template->parent->_objType == 2) {
+            $_template->compiled->unifunc = $_template->parent->compiled->unifunc;
+        }
+        if (!$_template->cached->processed) {
+            $_template->cached->process($_template, true);
+        }
+        $_template->smarty->compile_check = $compile_check;
+        $cached->getRenderedTemplateCode($_template);
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_cache($_template);
+        }
+    }
+
+    /**
+     * Writes the content to cache resource
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param string                   $content
+     *
+     * @return bool
+     */
+    public function writeCachedContent(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        if ($_template->source->handler->recompiled || !($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
+                $_template->caching == Smarty::CACHING_LIFETIME_SAVED)
+        ) {
+            // don't write cache file
+            return false;
+        }
+        $content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true);
+        return $this->write($cached, $_template, $content);
+    }
+
+    /**
+     * Write this cache object to handler
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     */
+    public function write(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        if (!$_template->source->handler->recompiled) {
+            if ($cached->handler->writeCachedContent($_template, $content)) {
+                $cached->content = null;
+                $cached->timestamp = time();
+                $cached->exists = true;
+                $cached->valid = true;
+                $cached->cache_lifetime = $_template->cache_lifetime;
+                $cached->processed = false;
+                if ($_template->smarty->cache_locking) {
+                    $cached->handler->releaseLock($_template->smarty, $cached);
+                }
+
+                return true;
+            }
+            $cached->content = null;
+            $cached->timestamp = false;
+            $cached->exists = false;
+            $cached->valid = false;
+            $cached->processed = false;
+        }
+
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
new file mode 100644
index 0000000..5a125a4
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Runtime Methods updateScope
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_UpdateScope
+{
+    /**
+     * Update new assigned template variable in other effected scopes
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string $varName variable name
+     * @param int    $scope   scope to which bubble up variable value
+     */
+    public function updateScope(Smarty_Internal_Template $tpl, $varName, $scope = Smarty::SCOPE_LOCAL)
+    {
+        if (!$scope && !$tpl->scope) {
+            return;
+        }
+        foreach (array($scope, $tpl->scope) as $s) {
+            $s = ($bubble_up = $s >= Smarty::SCOPE_BUBBLE_UP) ? $s - Smarty::SCOPE_BUBBLE_UP : $s;
+            if ($bubble_up && $s) {
+                $ptr = $tpl->parent;
+                if (isset($ptr)) {
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_PARENT) {
+                    continue;
+                }
+                while (isset($ptr) && $ptr->_objType == 2) {
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_TPL_ROOT) {
+                    continue;
+                } elseif ($s == Smarty::SCOPE_SMARTY) {
+                    $tpl->smarty->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                } elseif ($s == Smarty::SCOPE_GLOBAL) {
+                    Smarty::$global_tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                } elseif ($s == Smarty::SCOPE_ROOT) {
+                    while (isset($ptr->parent)) {
+                        $ptr = $ptr->parent;
+                    }
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                }
+            }
+        }
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php
new file mode 100644
index 0000000..7defd6c
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Runtime Methods decodeProperties
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_ValidateCompiled
+{
+    /**
+     * This function is executed automatically when a compiled or cached template file is included
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param  array $properties special template properties
+     * @param  bool  $cache      flag if called from cache file
+     *
+     * @return bool  flag if compiled or cache file is valid
+     */
+    public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
+    {
+        $is_valid = true;
+        if (Smarty::SMARTY_VERSION != $properties['version']) {
+            // new version must rebuild
+            $is_valid = false;
+        } elseif ($is_valid && !empty($properties['file_dependency']) &&
+            ((!$cache && $tpl->smarty->compile_check) || $tpl->smarty->compile_check == 1)
+        ) {
+            // check file dependencies at compiled code
+            foreach ($properties['file_dependency'] as $_file_to_check) {
+                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
+                    if ($tpl->source->filepath == $_file_to_check[0]) {
+                        // do not recheck current template
+                        continue;
+                        //$mtime = $tpl->source->getTimeStamp();
+                    } else {
+                        // file and php types can be checked without loading the respective resource handlers
+                        $mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
+                    }
+                } elseif ($_file_to_check[2] == 'string') {
+                    continue;
+                } else {
+                    $handler = Smarty_Resource::load($tpl->smarty, $_file_to_check[2]);
+                    if ($handler->checkTimestamps()) {
+                        $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[ 0 ]);
+                        $mtime = $source->getTimeStamp();
+                    } else {
+                        continue;
+                    }
+                }
+                if (!$mtime || $mtime > $_file_to_check[1]) {
+                    $is_valid = false;
+                    break;
+                }
+            }
+        }
+        if ($cache) {
+            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+            if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0 &&
+                (time() > ($tpl->cached->timestamp + $properties['cache_lifetime']))
+            ) {
+                $is_valid = false;
+            }
+            $tpl->cached->cache_lifetime = $properties['cache_lifetime'];
+            $tpl->cached->valid = $is_valid;
+            $resource = $tpl->cached;
+        } else {
+            $tpl->mustCompile = !$is_valid;
+            $resource = $tpl->compiled;
+            $resource->includes = isset($properties['includes']) ? $properties['includes'] : array();
+        }
+        if ($is_valid) {
+            $resource->unifunc = $properties['unifunc'];
+            $resource->has_nocache_code = $properties['has_nocache_code'];
+            //            $tpl->compiled->nocache_hash = $properties['nocache_hash'];
+            $resource->file_dependency = $properties['file_dependency'];
+            if (isset($properties['tpl_function'])) {
+                $tpl->tpl_function = $properties['tpl_function'];
+            }
+        }
+        return $is_valid && !function_exists($properties['unifunc']);
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_var.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_var.php
new file mode 100644
index 0000000..8e09108
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_var.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Runtime Methods createLocalArrayVariable
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Var
+{
+    /**
+     * Template code runtime function to create a local Smarty variable for array assignments
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $varName template variable name
+     * @param bool                      $nocache cache mode of variable
+     */
+    public function createLocalArrayVariable(Smarty_Internal_Template $tpl, $varName, $nocache = false)
+    {
+        if (!isset($tpl->tpl_vars[$varName])) {
+            $tpl->tpl_vars[$varName] = new Smarty_Variable(array(), $nocache);
+        } else {
+            $tpl->tpl_vars[$varName] = clone $tpl->tpl_vars[$varName];
+            if (!(is_array($tpl->tpl_vars[$varName]->value) ||
+                $tpl->tpl_vars[$varName]->value instanceof ArrayAccess)
+            ) {
+                settype($tpl->tpl_vars[$varName]->value, 'array');
+            }
+        }
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_write_file.php b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
similarity index 65%
rename from sources/include/smarty/libs/sysplugins/smarty_internal_write_file.php
rename to sources/include/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
index e5d19ce..05c9737 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_write_file.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
@@ -2,59 +2,64 @@
 /**
  * Smarty write file plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsInternal
- * @author Monte Ohrt
+ * @author     Monte Ohrt
  */
 
 /**
  * Smarty Internal Write File Class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage PluginsInternal
  */
-class Smarty_Internal_Write_File {
-
+class Smarty_Internal_Runtime_WriteFile
+{
     /**
      * Writes file in a safe way to disk
      *
-     * @param string $_filepath complete filepath
-     * @param string $_contents file content
-     * @param Smarty $smarty    smarty instance
+     * @param  string $_filepath complete filepath
+     * @param  string $_contents file content
+     * @param  Smarty $smarty    smarty instance
+     *
+     * @throws SmartyException
      * @return boolean true
      */
-    public static function writeFile($_filepath, $_contents, Smarty $smarty)
+    public function writeFile($_filepath, $_contents, Smarty $smarty)
     {
         $_error_reporting = error_reporting();
         error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        if ($smarty->_file_perms !== null) {
+        $_file_perms = property_exists($smarty, '_file_perms') ? $smarty->_file_perms : 0644;
+        $_dir_perms = property_exists($smarty, '_dir_perms') ? (isset($smarty->_dir_perms) ? $smarty->_dir_perms : 0777)  : 0771;
+        if ($_file_perms !== null) {
             $old_umask = umask(0);
         }
 
         $_dirpath = dirname($_filepath);
         // if subdirs, create dir structure
         if ($_dirpath !== '.' && !file_exists($_dirpath)) {
-            mkdir($_dirpath, $smarty->_dir_perms === null ? 0777 : $smarty->_dir_perms, true);
+            mkdir($_dirpath, $_dir_perms, true);
         }
 
         // write to tmp file, then move to overt file lock race condition
-        $_tmp_file = $_dirpath . DS . uniqid('wrt', true);
+        $_tmp_file = $_dirpath . DS . str_replace(array('.', ','), '_', uniqid('wrt', true));
         if (!file_put_contents($_tmp_file, $_contents)) {
             error_reporting($_error_reporting);
             throw new SmartyException("unable to write file {$_tmp_file}");
-            return false;
-        }
-        
+       }
+
         /*
          * Windows' rename() fails if the destination exists,
          * Linux' rename() properly handles the overwrite.
-         * Simply unlink()ing a file might cause other processes 
+         * Simply unlink()ing a file might cause other processes
          * currently reading that file to fail, but linux' rename()
          * seems to be smart enough to handle that for us.
          */
         if (Smarty::$_IS_WINDOWS) {
             // remove original file
-            @unlink($_filepath);
+            if (is_file($_filepath)) {
+                @unlink($_filepath);
+            }
             // rename tmp file
             $success = @rename($_tmp_file, $_filepath);
         } else {
@@ -62,27 +67,24 @@ class Smarty_Internal_Write_File {
             $success = @rename($_tmp_file, $_filepath);
             if (!$success) {
                 // remove original file
-                @unlink($_filepath);
+                if (is_file($_filepath)) {
+                    @unlink($_filepath);
+                }
                 // rename tmp file
                 $success = @rename($_tmp_file, $_filepath);
             }
         }
-
         if (!$success) {
             error_reporting($_error_reporting);
             throw new SmartyException("unable to write file {$_filepath}");
-            return false;
         }
-
-        if ($smarty->_file_perms !== null) {
+        if ($_file_perms !== null) {
             // set file permissions
-            chmod($_filepath, $smarty->_file_perms);
+            chmod($_filepath, $_file_perms);
             umask($old_umask);
         }
         error_reporting($_error_reporting);
+
         return true;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/sources/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
index 1ec1aa4..116bbea 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -1,27 +1,21 @@
 <?php
 /**
  * Smarty Internal Plugin Smarty Template Compiler Base
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
  *
- * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
-/**
- * @ignore
- */
-include ("smarty_internal_parsetree.php");
-
 /**
  * Class SmartyTemplateCompiler
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase {
-
+class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase
+{
     /**
      * Lexer class name
      *
@@ -36,27 +30,6 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
      */
     public $parser_class;
 
-    /**
-     * Lexer object
-     *
-     * @var object
-     */
-    public $lex;
-
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
-
-    /**
-     * Smarty object
-     *
-     * @var object
-     */
-    public $smarty;
-
     /**
      * array of vars which can be compiled in local scope
      *
@@ -64,6 +37,27 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
      */
     public $local_var = array();
 
+    /**
+     * array of callbacks called when the normal compile process of template is finished
+     *
+     * @var array
+     */
+    public $postCompileCallbacks = array();
+
+    /**
+     * prefix code
+     *
+     * @var string
+     */
+    public $prefixCompiledCode = '';
+
+    /**
+     * postfix code
+     *
+     * @var string
+     */
+    public $postfixCompiledCode = '';
+
     /**
      * Initialize compiler
      *
@@ -71,57 +65,105 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
      * @param string $parser_class class name
      * @param Smarty $smarty       global instance
      */
-    public function __construct($lexer_class, $parser_class, $smarty)
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
     {
-        $this->smarty = $smarty;
-        parent::__construct();
+        parent::__construct($smarty);
         // get required plugins
         $this->lexer_class = $lexer_class;
         $this->parser_class = $parser_class;
     }
 
     /**
-     * Methode to compile a Smarty template
+     * method to compile a Smarty template
      *
      * @param  mixed $_content template source
+     * @param bool   $isTemplateSource
+     *
      * @return bool true if compiling succeeded, false if it failed
+     * @throws \SmartyCompilerException
      */
-    protected function doCompile($_content)
+    protected function doCompile($_content, $isTemplateSource = false)
     {
         /* here is where the compiling takes place. Smarty
           tags in the templates are replaces with PHP code,
           then written to compiled files. */
         // init the lexer/parser to compile the template
-        $this->lex = new $this->lexer_class($_content, $this);
-        $this->parser = new $this->parser_class($this->lex, $this);
-        if ($this->smarty->_parserdebug)
-            $this->parser->PrintTrace();
-        // get tokens from lexer and parse them
-        while ($this->lex->yylex() && !$this->abort_and_recompile) {
-            if ($this->smarty->_parserdebug) {
-                echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " .
-                    htmlentities($this->lex->value) . "</pre>";
-            }
-            $this->parser->doParse($this->lex->token, $this->lex->value);
+        $this->parser =
+            new $this->parser_class(new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $_content), $this),
+                                    $this);
+        if ($isTemplateSource && $this->template->caching) {
+            $this->parser->insertPhpCode("<?php\n\$_smarty_tpl->compiled->nocache_hash = '{$this->nocache_hash}';\n?>\n");
+        }
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
         }
 
-        if ($this->abort_and_recompile) {
-            // exit here on abort
-            return false;
+        if ($this->smarty->_parserdebug) {
+            $this->parser->PrintTrace();
+            $this->parser->lex->PrintTrace();
         }
+        // get tokens from lexer and parse them
+        while ($this->parser->lex->yylex()) {
+            if ($this->smarty->_parserdebug) {
+                echo "<pre>Line {$this->parser->lex->line} Parsing  {$this->parser->yyTokenName[$this->parser->lex->token]} Token " .
+                    htmlentities($this->parser->lex->value) . "</pre>";
+            }
+            $this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
+        }
+
         // finish parsing process
         $this->parser->doParse(0, 0);
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
         // check for unclosed tags
         if (count($this->_tag_stack) > 0) {
             // get stacked info
             list($openTag, $_data) = array_pop($this->_tag_stack);
-            $this->trigger_template_error("unclosed {" . $openTag . "} tag");
+            $this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag .
+                                          "{$this->smarty->right_delimiter} tag");
+        }
+        // call post compile callbacks
+        foreach ($this->postCompileCallbacks as $cb) {
+            $parameter = $cb;
+            $parameter[0] = $this;
+            call_user_func_array($cb[0], $parameter);
         }
         // return compiled code
-        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
-        return $this->parser->retvalue;
+        return $this->prefixCompiledCode . $this->parser->retvalue . $this->postfixCompiledCode;
     }
 
-}
+    /**
+     * Register a post compile callback
+     * - when the callback is called after template compiling the compiler object will be inserted as first parameter
+     *
+     * @param callback $callback
+     * @param array    $parameter optional parameter array
+     * @param string   $key       optional key for callback
+     * @param bool     $replace   if true replace existing keyed callback
+     */
+    public function registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+    {
+        array_unshift($parameter, $callback);
+        if (isset($key)) {
+            if ($replace || !isset($this->postCompileCallbacks[$key])) {
+                $this->postCompileCallbacks[$key] = $parameter;
+            }
+        } else {
+            $this->postCompileCallbacks[] = $parameter;
+        }
+    }
 
-?>
\ No newline at end of file
+    /**
+     * Remove a post compile callback
+     *
+     * @param string $key callback key
+     */
+    public function unregisterPostCompileCallback($key)
+    {
+        unset($this->postCompileCallbacks[$key]);
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_template.php b/sources/include/smarty/libs/sysplugins/smarty_internal_template.php
index 29017ed..7c16a53 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_template.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_template.php
@@ -1,581 +1,250 @@
 <?php
 /**
  * Smarty Internal Plugin Template
- *
  * This file contains the Smarty template engine
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Main class with template data structures and methods
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
  *
- * @property Smarty_Template_Source   $source
- * @property Smarty_Template_Compiled $compiled
- * @property Smarty_Template_Cached   $cached
+ * @property Smarty_Template_Source|Smarty_Template_Config $source
+ * @property Smarty_Template_Compiled                      $compiled
+ * @property Smarty_Template_Cached                        $cached
+ * @method bool mustCompile()
  */
-class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
+class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
+{
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 2;
 
-    /**
-     * cache_id
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * $compile_id
-     * @var string
-     */
-    public $compile_id = null;
-    /**
-     * caching enabled
-     * @var boolean
-     */
-    public $caching = null;
-    /**
-     * cache lifetime in seconds
-     * @var integer
-     */
-    public $cache_lifetime = null;
-    /**
-     * Template resource
-     * @var string
-     */
-    public $template_resource = null;
-    /**
-     * flag if compiled template is invalid and must be (re)compiled
-     * @var bool
-     */
-    public $mustCompile = null;
-    /**
-     * flag if template does contain nocache code sections
-     * @var bool
-     */
-    public $has_nocache_code = false;
-    /**
-     * special compiled and cached template properties
-     * @var array
-     */
-    public $properties = array('file_dependency' => array(),
-        'nocache_hash' => '',
-        'function' => array());
-    /**
-     * required plugins
-     * @var array
-     */
-    public $required_plugins = array('compiled' => array(), 'nocache' => array());
     /**
      * Global smarty instance
+     *
      * @var Smarty
      */
     public $smarty = null;
+
     /**
-     * blocks for template inheritance
-     * @var array
+     * Source instance
+     *
+     * @var Smarty_Template_Source|Smarty_Template_Config
      */
-    public $block_data = array();
+    public $source = null;
+
     /**
-     * variable filters
-     * @var array
+     * Template resource
+     *
+     * @var string
      */
-    public $variable_filters = array();
+    public $template_resource = null;
+
     /**
-     * optional log of tag/attributes
-     * @var array
-     */
-    public $used_tags = array();
-    /**
-     * internal flag to allow relative path in child template blocks
+     * flag if compiled template is invalid and must be (re)compiled
+     *
      * @var bool
      */
-    public $allow_relative_path = false;
+    public $mustCompile = null;
+
     /**
-     * internal capture runtime stack
+     * Template Id
+     *
+     * @var null|string
+     */
+    public $templateId = null;
+
+    /**
+     * Known template functions
+     *
      * @var array
      */
-    public $_capture_stack = array(0 => array());
+    public $tpl_function = array();
+
+    /**
+     * Scope in which template is rendered
+     *
+     * @var int
+     */
+    public $scope = 0;
 
     /**
      * Create template data object
-     *
      * Some of the global Smarty settings copied to template scope
-     * It load the required template resources and cacher plugins
+     * It load the required template resources and caching plugins
      *
-     * @param string                   $template_resource template resource string
-     * @param Smarty                   $smarty            Smarty instance
-     * @param Smarty_Internal_Template $_parent           back pointer to parent object with variables or null
-     * @param mixed                    $_cache_id cache   id or null
-     * @param mixed                    $_compile_id       compile id or null
-     * @param bool                     $_caching          use caching?
-     * @param int                      $_cache_lifetime   cache life-time in seconds
+     * @param string                                                  $template_resource template resource string
+     * @param Smarty                                                  $smarty            Smarty instance
+     * @param \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $_parent           back pointer to parent object
+     *                                                                                   with variables or null
+     * @param mixed                                                   $_cache_id         cache   id or null
+     * @param mixed                                                   $_compile_id       compile id or null
+     * @param bool                                                    $_caching          use caching?
+     * @param int                                                     $_cache_lifetime   cache life-time in seconds
+     *
+     * @throws \SmartyException
      */
-    public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
+    public function __construct($template_resource, Smarty $smarty, Smarty_Internal_Data $_parent = null,
+                                $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
     {
         $this->smarty = &$smarty;
         // Smarty parameter
         $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
         $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
         $this->caching = $_caching === null ? $this->smarty->caching : $_caching;
-        if ($this->caching === true)
+        if ($this->caching === true) {
             $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
         $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
         $this->parent = $_parent;
         // Template resource
         $this->template_resource = $template_resource;
-        // copy block data of template inheritance
-        if ($this->parent instanceof Smarty_Internal_Template) {
-            $this->block_data = $this->parent->block_data;
-        }
+        $this->source = Smarty_Template_Source::load($this);
+        parent::__construct();
     }
 
     /**
-     * Returns if the current template must be compiled by the Smarty compiler
+     * render template
      *
-     * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration
+     * @param  bool $merge_tpl_vars   if true parent template variables merged in to local scope
+     * @param  bool $no_output_filter if true do not run output filter
+     * @param  bool $display          true: display, false: fetch null: subtemplate
      *
-     * @return boolean true if the template must be compiled
+     * @throws Exception
+     * @throws SmartyException
+     * @return string rendered template output
      */
-    public function mustCompile()
+    public function render($no_output_filter = true, $display = null)
     {
+        $parentIsTpl = isset($this->parent) && $this->parent->_objType == 2;
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->start_template($this, $display);
+        }
+        // checks if template exists
         if (!$this->source->exists) {
-            if ($this->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '$this->parent->template_resource}'";
+            if ($parentIsTpl) {
+                $parent_resource = " in '{$this->parent->template_resource}'";
             } else {
                 $parent_resource = '';
             }
             throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
         }
-        if ($this->mustCompile === null) {
-            $this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false ||
-                    ($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp)));
+        // disable caching for evaluated code
+        if ($this->source->handler->recompiled) {
+            $this->caching = false;
+        }
+        // read from cache or render
+        $isCacheTpl =
+            $this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED;
+        if ($isCacheTpl) {
+            if (!isset($this->cached)) {
+                $this->loadCached();
+            }
+            $this->cached->render($this, $no_output_filter);
+        } elseif ($this->source->handler->uncompiled) {
+            $this->source->render($this);
+        } else {
+            if (!isset($this->compiled)) {
+                $this->loadCompiled();
+            }
+            $this->compiled->render($this);
+        }
+
+        // display or fetch
+        if ($display) {
+            if ($this->caching && $this->smarty->cache_modified_check) {
+                $this->smarty->ext->_cachemodify->cacheModifiedCheck($this->cached, $this,
+                                                                     isset($content) ? $content : ob_get_clean());
+            } else {
+                if ((!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
+                    !$no_output_filter && (isset($this->smarty->autoload_filters['output']) ||
+                        isset($this->smarty->registered_filters['output']))
+                ) {
+                    echo $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+                } else {
+                    ob_end_flush();
+                    flush();
+                }
+            }
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                // debug output
+                $this->smarty->_debug->display_debug($this, true);
+            }
+            return '';
+        } else {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                if ($this->smarty->debugging === 2 && $display === false) {
+                    $this->smarty->_debug->display_debug($this, true);
+                }
+            }
+            if ($parentIsTpl) {
+                if (!empty($this->tpl_function)) {
+                    $this->parent->tpl_function = array_merge($this->parent->tpl_function, $this->tpl_function);
+                }
+                foreach ($this->compiled->required_plugins as $code => $tmp1) {
+                    foreach ($tmp1 as $name => $tmp) {
+                        foreach ($tmp as $type => $data) {
+                            $this->parent->compiled->required_plugins[$code][$name][$type] = $data;
+                        }
+                    }
+                }
+            }
+            if (!$no_output_filter &&
+                (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
+                (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))
+            ) {
+                return $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+            }
+            // return cache content
+            return null;
         }
-        return $this->mustCompile;
     }
 
     /**
      * Compiles the template
-     *
      * If the template is not evaluated the compiled template is saved on disk
      */
     public function compileTemplateSource()
     {
-        if (!$this->source->recompiled) {
-            $this->properties['file_dependency'] = array();
-            if ($this->source->components) {
-                // uses real resource for file dependency
-                $source = end($this->source->components);
-                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type);
-            } else {
-                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type);
-            }
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this);
-        }
-        // compile locking
-        if ($this->smarty->compile_locking && !$this->source->recompiled) {
-            if ($saved_timestamp = $this->compiled->timestamp) {
-                touch($this->compiled->filepath);
-            }
-        }
-        // call compiler
-        try {
-            $code = $this->compiler->compileTemplate($this);
-        } catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && !$this->source->recompiled && $saved_timestamp) {
-                touch($this->compiled->filepath, $saved_timestamp);
-            }
-            throw $e;
-        }
-        // compiling succeded
-        if (!$this->source->recompiled && $this->compiler->write_compiled_code) {
-            // write compiled template
-            $_filepath = $this->compiled->filepath;
-            if ($_filepath === false)
-                throw new SmartyException('getCompiledFilepath() did not return a destination to save the compiled template to');
-            Smarty_Internal_Write_File::writeFile($_filepath, $code, $this->smarty);
-            $this->compiled->exists = true;
-            $this->compiled->isCompiled = true;
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_compile($this);
-        }
-        // release compiler object to free memory
-        unset($this->compiler);
+        return $this->compiled->compileTemplateSource($this);
     }
 
     /**
-     * Writes the cached template output
+     * Writes the content to cache resource
+     *
+     * @param string $content
      *
      * @return bool
      */
     public function writeCachedContent($content)
     {
-        if ($this->source->recompiled || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) {
-            // don't write cache file
-            return false;
-        }
-        $this->properties['cache_lifetime'] = $this->cache_lifetime;
-        $this->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true));
-        $content = $this->createTemplateCodeFrame($content, true);
-        $_smarty_tpl = $this;
-        eval("?>" . $content);
-        $this->cached->valid = true;
-        $this->cached->processed = true;
-        return $this->cached->write($this, $content);
+        return $this->smarty->ext->_updateCache->writeCachedContent($this->cached, $this, $content);
     }
 
     /**
-     * Template code runtime function to get subtemplate content
+     * Get unique template id
      *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $vars optional  variables to assign
-     * @param int     $parent_scope   scope in which {include} should execute
-     * @returns string template content
-     */
-    public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
-    {
-        // already in template cache?
-        if ($this->smarty->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this->smarty, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if (isset($this->smarty->template_objects[$_templateId])) {
-            // clone cached template object because of possible recursive call
-            $tpl = clone $this->smarty->template_objects[$_templateId];
-            $tpl->parent = $this;
-            $tpl->caching = $caching;
-            $tpl->cache_lifetime = $cache_lifetime;
-        } else {
-            $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-        }
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL) {
-            $tpl->tpl_vars = $this->tpl_vars;
-            $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-        return $tpl->fetch(null, null, null, null, false, false, true);
-    }
-
-    /**
-     * Template code runtime function to set up an inline subtemplate
-     *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $vars optional  variables to assign
-     * @param int     $parent_scope   scope in which {include} should execute
-     * @param string  $hash           nocache hash code
-     * @returns string template content
-     */
-    public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash)
-    {
-        $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-        $tpl->properties['nocache_hash']  = $hash;
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL ) {
-            $tpl->tpl_vars = $this->tpl_vars;
-            $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-        return $tpl;
-    }
-
-
-    /**
-     * Create code frame for compiled and cached templates
-     *
-     * @param string $content   optional template content
-     * @param bool   $cache     flag for cache file
      * @return string
      */
-    public function createTemplateCodeFrame($content = '', $cache = false)
+    public function _getTemplateId()
     {
-        $plugins_string = '';
-        // include code for plugins
-        if (!$cache) {
-            if (!empty($this->required_plugins['compiled'])) {
-                $plugins_string = '<?php ';
-                foreach ($this->required_plugins['compiled'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        if (is_Array($data['function'])){
-                            $plugins_string .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n";
-                        } else {
-                            $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n";
-                        }
-                    }
-                }
-                $plugins_string .= '?>';
-            }
-            if (!empty($this->required_plugins['nocache'])) {
-                $this->has_nocache_code = true;
-                $plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
-                foreach ($this->required_plugins['nocache'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        if (is_Array($data['function'])){
-                            $plugins_string .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n");
-                        } else {
-                            $plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n");
-                        }
-                    }
-                }
-                $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
-            }
-        }
-        // build property code
-        $this->properties['has_nocache_code'] = $this->has_nocache_code;
-        $output = '';
-        if (!$this->source->recompiled) {
-            $output = "<?php /*%%SmartyHeaderCode:{$this->properties['nocache_hash']}%%*/";
-            if ($this->smarty->direct_access_security) {
-                $output .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
-            }
-        }
-        if ($cache) {
-            // remove compiled code of{function} definition
-            unset($this->properties['function']);
-            if (!empty($this->smarty->template_functions)) {
-                // copy code of {function} tags called in nocache mode
-                foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        foreach ($function_data['called_functions'] as $func_name) {
-                            $this->smarty->template_functions[$func_name]['called_nocache'] = true;
-                        }
-                    }
-                }
-                 foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        unset($function_data['called_nocache'], $function_data['called_functions'], $this->smarty->template_functions[$name]['called_nocache']);
-                        $this->properties['function'][$name] = $function_data;
-                    }
-                }
-            }
-        }
-        $this->properties['version'] = Smarty::SMARTY_VERSION;
-        if (!isset($this->properties['unifunc'])) {
-            $this->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true));
-        }
-        if (!$this->source->recompiled) {
-            $output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . ',' . ($cache ? 'true' : 'false') . "); /*/%%SmartyHeaderCode%%*/?>\n";
-            $output .= '<?php if ($_valid && !is_callable(\'' . $this->properties['unifunc'] . '\')) {function ' . $this->properties['unifunc'] . '($_smarty_tpl) {?>';
-        }
-        $output .= $plugins_string;
-        $output .= $content;
-        if (!$this->source->recompiled) {
-            $output .= '<?php }} ?>';
-        }
-        return $output;
-    }
-
-    /**
-     * This function is executed automatically when a compiled or cached template file is included
-     *
-     * - Decode saved properties from compiled template and cache files
-     * - Check if compiled or cache file is valid
-     *
-     * @param array $properties     special template properties
-     * @param bool  $cache          flag if called from cache file
-     * @return bool                 flag if compiled or cache file is valid
-     */
-    public function decodeProperties($properties, $cache = false)
-    {
-        $this->has_nocache_code = $properties['has_nocache_code'];
-        $this->properties['nocache_hash'] = $properties['nocache_hash'];
-        if (isset($properties['cache_lifetime'])) {
-            $this->properties['cache_lifetime'] = $properties['cache_lifetime'];
-        }
-        if (isset($properties['file_dependency'])) {
-            $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
-        }
-        if (!empty($properties['function'])) {
-            $this->properties['function'] = array_merge($this->properties['function'], $properties['function']);
-            $this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']);
-        }
-        $this->properties['version'] = (isset($properties['version'])) ? $properties['version'] : '';
-        $this->properties['unifunc'] = $properties['unifunc'];
-        // check file dependencies at compiled code
-        $is_valid = true;
-        if ($this->properties['version'] != Smarty::SMARTY_VERSION) {
-            $is_valid = false;
-        } else if (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) {
-            foreach ($this->properties['file_dependency'] as $_file_to_check) {
-                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') {
-                    if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) {
-                        // do not recheck current template
-                        $mtime = $this->source->timestamp;
-                    } else {
-                        // file and php types can be checked without loading the respective resource handlers
-                        $mtime = @filemtime($_file_to_check[0]);
-                    }
-                } elseif ($_file_to_check[2] == 'string') {
-                    continue;
-                } else {
-                    $source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]);
-                    $mtime = $source->timestamp;
-                }
-                if (!$mtime || $mtime > $_file_to_check[1]) {
-                    $is_valid = false;
-                    break;
-                }
-            }
-        }
-        if ($cache) {
-            $this->cached->valid = $is_valid;
-        } else {
-            $this->mustCompile = !$is_valid;
-        }
-        // store data in reusable Smarty_Template_Compiled
-        if (!$cache) {
-            $this->compiled->_properties = $properties;
-        }
-        return $is_valid;
-    }
-
-    /**
-     * Template code runtime function to create a local Smarty variable for array assignments
-     *
-     * @param string $tpl_var   tempate variable name
-     * @param bool   $nocache   cache mode of variable
-     * @param int    $scope     scope of variable
-     */
-    public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        if (!isset($this->tpl_vars[$tpl_var])) {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope);
-        } else {
-            $this->tpl_vars[$tpl_var] = clone $this->tpl_vars[$tpl_var];
-            if ($scope != Smarty::SCOPE_LOCAL) {
-                $this->tpl_vars[$tpl_var]->scope = $scope;
-            }
-            if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
-        }
-    }
-
-    /**
-     * Template code runtime function to get pointer to template variable array of requested scope
-     *
-     * @param int $scope    requested variable scope
-     * @return array        array of template variables
-     */
-    public function &getScope($scope)
-    {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-            return $ptr->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_GLOBAL) {
-            return Smarty::$global_tpl_vars;
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     * Get parent or root of template parent chain
-     *
-     * @param int $scope    pqrent or root scope
-     * @return mixed object
-     */
-    public function getScopePointer($scope)
-    {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-            return $ptr;
-        }
-        return null;
-    }
-
-    /**
-     * [util function] counts an array, arrayaccess/traversable or PDOStatement object
-     *
-     * @param mixed $value
-     * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements
-     */
-    public function _count($value)
-    {
-        if (is_array($value) === true || $value instanceof Countable) {
-            return count($value);
-        } elseif ($value instanceof IteratorAggregate) {
-            // Note: getIterator() returns a Traversable, not an Iterator
-            // thus rewind() and valid() methods may not be present
-            return iterator_count($value->getIterator());
-        } elseif ($value instanceof Iterator) {
-            return iterator_count($value);
-        } elseif ($value instanceof PDOStatement) {
-            return $value->rowCount();
-        } elseif ($value instanceof Traversable) {
-            return iterator_count($value);
-        } elseif ($value instanceof ArrayAccess) {
-            if ($value->offsetExists(0)) {
-                return 1;
-            }
-        } elseif (is_object($value)) {
-            return count($value);
-        }
-        return 0;
+        return isset($this->templateId) ? $this->templateId : $this->templateId =
+            $this->smarty->_getTemplateId($this->template_resource, $this->cache_id, $this->compile_id);
     }
 
     /**
      * runtime error not matching capture tags
-     *
      */
     public function capture_error()
     {
@@ -583,41 +252,84 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
     }
 
     /**
-    * Empty cache for this template
-    *
-    * @param integer $exp_time      expiration time
-    * @return integer number of cache files deleted
-    */
-    public function clearCache($exp_time=null)
+     * Load compiled object
+     *
+     */
+    public function loadCompiled()
     {
-        Smarty_CacheResource::invalidLoadedCache($this->smarty);
-        return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time);
+        if (!isset($this->compiled)) {
+            $this->compiled = Smarty_Template_Compiled::load($this);
+        }
     }
 
-     /**
+    /**
+     * Load cached object
+     *
+     */
+    public function loadCached()
+    {
+        if (!isset($this->cached)) {
+            $this->cached = Smarty_Template_Cached::load($this);
+        }
+    }
+
+    /**
+     * Load compiler object
+     *
+     * @throws \SmartyException
+     */
+    public function loadCompiler()
+    {
+        if (!class_exists($this->source->handler->compiler_class)) {
+            $this->smarty->loadPlugin($this->source->handler->compiler_class);
+        }
+        $this->compiler = new $this->source->handler->compiler_class($this->source->handler->template_lexer_class,
+                                                                     $this->source->handler->template_parser_class,
+                                                                     $this->smarty);
+    }
+
+    /**
+     * Handle unknown class methods
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        // method of Smarty object?
+        if (method_exists($this->smarty, $name)) {
+            return call_user_func_array(array($this->smarty, $name), $args);
+        }
+        // parent
+        return parent::__call($name, $args);
+    }
+
+    /**
      * set Smarty property in template context
      *
      * @param string $property_name property name
      * @param mixed  $value         value
+     *
+     * @throws SmartyException
      */
     public function __set($property_name, $value)
     {
         switch ($property_name) {
-            case 'source':
             case 'compiled':
             case 'cached':
             case 'compiler':
                 $this->$property_name = $value;
                 return;
-
-            // FIXME: routing of template -> smarty attributes
             default:
+                // Smarty property ?
                 if (property_exists($this->smarty, $property_name)) {
                     $this->smarty->$property_name = $value;
                     return;
                 }
         }
-
         throw new SmartyException("invalid template property '$property_name'.");
     }
 
@@ -625,60 +337,35 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
      * get Smarty property in template context
      *
      * @param string $property_name property name
+     *
+     * @return mixed|Smarty_Template_Cached
+     * @throws SmartyException
      */
     public function __get($property_name)
     {
         switch ($property_name) {
-            case 'source':
-                if (strlen($this->template_resource) == 0) {
-                    throw new SmartyException('Missing template name');
-                }
-                $this->source = Smarty_Resource::source($this);
-                // cache template object under a unique ID
-                // do not cache eval resources
-                if ($this->source->type != 'eval') {
-                    if ($this->smarty->allow_ambiguous_resources) {
-                        $_templateId = $this->source->unique_resource . $this->cache_id . $this->compile_id;
-                    } else {
-                        $_templateId = $this->smarty->joined_template_dir . '#' . $this->template_resource . $this->cache_id . $this->compile_id;
-                    }
-
-                    if (isset($_templateId[150])) {
-                        $_templateId = sha1($_templateId);
-                    }
-                    $this->smarty->template_objects[$_templateId] = $this;
-                }
-                return $this->source;
-
             case 'compiled':
-                $this->compiled = $this->source->getCompiled($this);
+                $this->loadCompiled();
                 return $this->compiled;
 
             case 'cached':
-                if (!class_exists('Smarty_Template_Cached')) {
-                    include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-                }
-                $this->cached = new Smarty_Template_Cached($this);
+                $this->loadCached();
                 return $this->cached;
 
             case 'compiler':
-                $this->smarty->loadPlugin($this->source->compiler_class);
-                $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty);
+                $this->loadCompiler();
                 return $this->compiler;
-
-            // FIXME: routing of template -> smarty attributes
             default:
+                // Smarty property ?
                 if (property_exists($this->smarty, $property_name)) {
                     return $this->smarty->$property_name;
                 }
         }
-
         throw new SmartyException("template property '$property_name' does not exist.");
     }
 
     /**
-     * Template data object destrutor
-     *
+     * Template data object destructor
      */
     public function __destruct()
     {
@@ -686,7 +373,4 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
             $this->cached->handler->releaseLock($this->smarty, $this->cached);
         }
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_templatebase.php b/sources/include/smarty/libs/sysplugins/smarty_internal_templatebase.php
index 1cb9bb9..9b4953d 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_templatebase.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_templatebase.php
@@ -1,363 +1,98 @@
 <?php
 /**
  * Smarty Internal Plugin Smarty Template  Base
+ * This file contains the basic shared methods for template handling
  *
- * This file contains the basic shared methodes for template handling
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Template
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
- * Class with shared template methodes
+ * Class with shared template methods
  *
- * @package Smarty
- * @subpackage Template
+ * @package      Smarty
+ * @subpackage   Template
+ *
+ * @property Smarty $smarty
+ * @method Smarty_Internal_TemplateBase setAutoloadFilters(mixed $filters, string $type = null)
+ * @method Smarty_Internal_TemplateBase addAutoloadFilters(mixed $filters, string $type = null)
+ * @method array getAutoloadFilters(string $type = null)
+ * @local_method Smarty_Internal_TemplateBase registerFilter(string $type, callback $callback, string $name = null)
+ * @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback)
+ * @method Smarty_Internal_TemplateBase unloadFilter(string $type, string $name)
+ * @method string getDebugTemplate()
+ * @method Smarty_Internal_TemplateBase setDebugTemplate(string $tpl_name)
+ * @method Smarty_Internal_TemplateBase setDefaultModifier(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase addDefaultModifier(mixed $modifiers)
+ * @method array getDefaultModifier()
+ * @method Smarty_Internal_TemplateBase registerDefaultPluginHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerResource(string $name, Smarty_Resource $resource_handler)
+ * @method Smarty_Internal_TemplateBase unregisterResource(string $name)
+ * @method Smarty_Internal_TemplateBase registerCacheResource(string $name, Smarty_CacheResource $resource_handler)
+ * @method Smarty_Internal_TemplateBase unregisterCacheResource(string $name)
+ * @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name)
+ * @method Smarty_Internal_TemplateBase unregisterObject(string $object_name)
+ * @method object getRegisteredObject(string $object_name)
+ * @method Smarty_Internal_TemplateBase registerClass(string $class_name, string $class_impl)
+ * @method Smarty_Internal_TemplateBase createData(Smarty_Internal_Data $parent = null, string $name = null)
+ * @method array getTags(mixed $template = null)
  */
-abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
+abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
+{
+    /**
+     * Set this if you want different sets of cache files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * Set this if you want different sets of compiled files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * caching enabled
+     *
+     * @var boolean
+     */
+    public $caching = false;
+
+    /**
+     * cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 3600;
+
+    /**
+     * universal cache
+     *
+     * @var array()
+     */
+    public $_cache = array();
 
     /**
      * fetches a rendered Smarty template
      *
-     * @param string $template          the resource handle of the template file or template object
-     * @param mixed  $cache_id          cache id to be used with this template
-     * @param mixed  $compile_id        compile id to be used with this template
-     * @param object $parent            next higher level of Smarty variables
-     * @param bool   $display           true: display, false: fetch
-     * @param bool   $merge_tpl_vars    if true parent template variables merged in to local scope
-     * @param bool   $no_output_filter  if true do not run output filter
+     * @param  string $template         the resource handle of the template file or template object
+     * @param  mixed  $cache_id         cache id to be used with this template
+     * @param  mixed  $compile_id       compile id to be used with this template
+     * @param  object $parent           next higher level of Smarty variables
+     *
+     * @throws Exception
+     * @throws SmartyException
      * @return string rendered template output
      */
-    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
+    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null)
     {
-        if ($template === null && $this instanceof $this->template_class) {
-            $template = $this;
-        }
-        if (!empty($cache_id) && is_object($cache_id)) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent === null && ($this instanceof Smarty || is_string($template))) {
-            $parent = $this;
-        }
-        // create template object if necessary
-        $_template = ($template instanceof $this->template_class)
-        ? $template
-        : $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-        // if called by Smarty object make sure we use current caching status
-        if ($this instanceof Smarty) {
-            $_template->caching = $this->caching;
-        }
-        // merge all variable scopes into template
-        if ($merge_tpl_vars) {
-            // save local variables
-            $save_tpl_vars = $_template->tpl_vars;
-            $save_config_vars = $_template->config_vars;
-            $ptr_array = array($_template);
-            $ptr = $_template;
-            while (isset($ptr->parent)) {
-                $ptr_array[] = $ptr = $ptr->parent;
-            }
-            $ptr_array = array_reverse($ptr_array);
-            $parent_ptr = reset($ptr_array);
-            $tpl_vars = $parent_ptr->tpl_vars;
-            $config_vars = $parent_ptr->config_vars;
-            while ($parent_ptr = next($ptr_array)) {
-                if (!empty($parent_ptr->tpl_vars)) {
-                    $tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars);
-                }
-                if (!empty($parent_ptr->config_vars)) {
-                    $config_vars = array_merge($config_vars, $parent_ptr->config_vars);
-                }
-            }
-            if (!empty(Smarty::$global_tpl_vars)) {
-                $tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars);
-            }
-            $_template->tpl_vars = $tpl_vars;
-            $_template->config_vars = $config_vars;
-        }
-        // dummy local smarty variable
-        if (!isset($_template->tpl_vars['smarty'])) {
-            $_template->tpl_vars['smarty'] = new Smarty_Variable;
-        }
-        if (isset($this->smarty->error_reporting)) {
-            $_smarty_old_error_level = error_reporting($this->smarty->error_reporting);
-        }
-        // check URL debugging control
-        if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {
-            if (isset($_SERVER['QUERY_STRING'])) {
-                $_query_string = $_SERVER['QUERY_STRING'];
-            } else {
-                $_query_string = '';
-            }
-            if (false !== strpos($_query_string, $this->smarty->smarty_debug_id)) {
-                if (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=on')) {
-                    // enable debugging for this browser session
-                    setcookie('SMARTY_DEBUG', true);
-                    $this->smarty->debugging = true;
-                } elseif (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=off')) {
-                    // disable debugging for this browser session
-                    setcookie('SMARTY_DEBUG', false);
-                    $this->smarty->debugging = false;
-                } else {
-                    // enable debugging for this page
-                    $this->smarty->debugging = true;
-                }
-            } else {
-                if (isset($_COOKIE['SMARTY_DEBUG'])) {
-                    $this->smarty->debugging = true;
-                }
-            }
-        }
-        // must reset merge template date
-        $_template->smarty->merged_templates_func = array();
-        // get rendered template
-        // disable caching for evaluated code
-        if ($_template->source->recompiled) {
-            $_template->caching = false;
-        }
-        // checks if template exists
-        if (!$_template->source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '{$_template->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
-        }
-        // read from cache or render
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || !$_template->cached->valid) {
-            // render template (not loaded and not in cache)
-            if (!$_template->source->uncompiled) {
-                $_smarty_tpl = $_template;
-                if ($_template->source->recompiled) {
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_compile($_template);
-                    }
-                    $code = $_template->compiler->compileTemplate($_template);
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::end_compile($_template);
-                    }
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    try {
-                        ob_start();
-                        eval("?>" . $code);
-                        unset($code);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                } else {
-                    if (!$_template->compiled->exists || ($_template->smarty->force_compile && !$_template->compiled->isCompiled)) {
-                        $_template->compileTemplateSource();
-                    }
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    if (!$_template->compiled->loaded) {
-                        include($_template->compiled->filepath);
-                        if ($_template->mustCompile) {
-                            // recompile and load again
-                            $_template->compileTemplateSource();
-                            include($_template->compiled->filepath);
-                        }
-                        $_template->compiled->loaded = true;
-                    } else {
-                        $_template->decodeProperties($_template->compiled->_properties, false);
-                    }
-                    try {
-                        ob_start();
-                        if (empty($_template->properties['unifunc']) || !is_callable($_template->properties['unifunc'])) {
-                            throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
-                        }
-                        array_unshift($_template->_capture_stack,array());
-                        //
-                        // render compiled template
-                        //
-                        $_template->properties['unifunc']($_template);
-                        // any unclosed {capture} tags ?
-                        if (isset($_template->_capture_stack[0][0])) {
-                            $_template->capture_error();
-                        }
-                        array_shift($_template->_capture_stack);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                }
-            } else {
-                if ($_template->source->uncompiled) {
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    try {
-                        ob_start();
-                        $_template->source->renderUncompiled($_template);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                } else {
-                    throw new SmartyException("Resource '$_template->source->type' must have 'renderUncompiled' method");
-                }
-            }
-            $_output = ob_get_clean();
-            if (!$_template->source->recompiled && empty($_template->properties['file_dependency'][$_template->source->uid])) {
-                $_template->properties['file_dependency'][$_template->source->uid] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
-            }
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $_template->parent->properties['file_dependency'] = array_merge($_template->parent->properties['file_dependency'], $_template->properties['file_dependency']);
-                foreach ($_template->required_plugins as $code => $tmp1) {
-                    foreach ($tmp1 as $name => $tmp) {
-                        foreach ($tmp as $type => $data) {
-                            $_template->parent->required_plugins[$code][$name][$type] = $data;
-                        }
-                    }
-                }
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_render($_template);
-            }
-            // write to cache when nessecary
-            if (!$_template->source->recompiled && ($_template->caching == Smarty::CACHING_LIFETIME_SAVED || $_template->caching == Smarty::CACHING_LIFETIME_CURRENT)) {
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::start_cache($_template);
-                }
-                $_template->properties['has_nocache_code'] = false;
-                // get text between non-cached items
-                $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output);
-                // get non-cached items
-                preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output, $cache_parts);
-                $output = '';
-                // loop over items, stitch back together
-                foreach ($cache_split as $curr_idx => $curr_split) {
-                    // escape PHP tags in template content
-                    $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php echo \'$1\'; ?>', $curr_split);
-                    if (isset($cache_parts[0][$curr_idx])) {
-                        $_template->properties['has_nocache_code'] = true;
-                        // remove nocache tags from cache output
-                        $output .= preg_replace("!/\*/?%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
-                    }
-                }
-                if (!$no_output_filter && !$_template->has_nocache_code && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-                    $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);
-                }
-                // rendering (must be done before writing cache file because of {function} nocache handling)
-                $_smarty_tpl = $_template;
-                try {
-                    ob_start();
-                    eval("?>" . $output);
-                    $_output = ob_get_clean();
-                } catch (Exception $e) {
-                    ob_get_clean();
-                    throw $e;
-                }
-                // write cache file content
-                $_template->writeCachedContent($output);
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::end_cache($_template);
-                }
-            } else {
-                // var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output);
-                if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) {
-                    // replace nocache_hash
-                    $_output = str_replace("{$_template->properties['nocache_hash']}", $_template->parent->properties['nocache_hash'], $_output);
-                    $_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code;
-                }
-            }
-        } else {
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_cache($_template);
-            }
-            try {
-                ob_start();
-                array_unshift($_template->_capture_stack,array());
-                //
-                // render cached template
-                //
-                $_template->properties['unifunc']($_template);
-                // any unclosed {capture} tags ?
-                if (isset($_template->_capture_stack[0][0])) {
-                    $_template->capture_error();
-                }
-                array_shift($_template->_capture_stack);
-                $_output = ob_get_clean();
-            } catch (Exception $e) {
-                ob_get_clean();
-                throw $e;
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_cache($_template);
-            }
-        }
-        if ((!$this->caching || $_template->has_nocache_code || $_template->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_output, $_template);
-        }
-        if (isset($this->error_reporting)) {
-            error_reporting($_smarty_old_error_level);
-        }
-        // display or fetch
-        if ($display) {
-            if ($this->caching && $this->cache_modified_check) {
-                $_isCached = $_template->isCached() && !$_template->has_nocache_code;
-                $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-                if ($_isCached && $_template->cached->timestamp <= strtotime($_last_modified_date)) {
-                    switch (PHP_SAPI) {
-                        case 'cgi':         // php-cgi < 5.3
-                        case 'cgi-fcgi':    // php-cgi >= 5.3
-                        case 'fpm-fcgi':    // php-fpm >= 5.3.3
-                        header('Status: 304 Not Modified');
-                        break;
-
-                        case 'cli':
-                        if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) {
-                            $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
-                        }
-                        break;
-
-                        default:
-                        header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
-                        break;
-                    }
-                } else {
-                    switch (PHP_SAPI) {
-                        case 'cli':
-                        if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) {
-                            $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT';
-                        }
-                        break;
-
-                        default:
-                        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT');
-                        break;
-                    }
-                    echo $_output;
-                }
-            } else {
-                echo $_output;
-            }
-            // debug output
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::display_debug($this);
-            }
-            if ($merge_tpl_vars) {
-                // restore local variables
-                $_template->tpl_vars = $save_tpl_vars;
-                $_template->config_vars =  $save_config_vars;
-            }
-            return;
-        } else {
-            if ($merge_tpl_vars) {
-                // restore local variables
-                $_template->tpl_vars = $save_tpl_vars;
-                $_template->config_vars =  $save_config_vars;
-            }
-            // return fetched content
-            return $_output;
-        }
+        $result = $this->_execute($template, $cache_id, $compile_id, $parent, 0);
+        return $result === null ? ob_get_clean() : $result;
     }
 
     /**
@@ -371,441 +106,211 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
     public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
     {
         // display template
-        $this->fetch($template, $cache_id, $compile_id, $parent, true);
+        $this->_execute($template, $cache_id, $compile_id, $parent, 1);
     }
 
     /**
      * test if cache is valid
      *
-     * @param string|object $template   the resource handle of the template file or template object
-     * @param mixed         $cache_id   cache id to be used with this template
-     * @param mixed         $compile_id compile id to be used with this template
-     * @param object        $parent     next higher level of Smarty variables
-     * @return boolean cache status
+     * @api  Smarty::isCached()
+     * @link http://www.smarty.net/docs/en/api.is.cached.tpl
+     *
+     * @param  null|string|\Smarty_Internal_Template $template   the resource handle of the template file or template object
+     * @param  mixed                                 $cache_id   cache id to be used with this template
+     * @param  mixed                                 $compile_id compile id to be used with this template
+     * @param  object                                $parent     next higher level of Smarty variables
+     *
+     * @return boolean       cache status
      */
     public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
     {
-        if ($template === null && $this instanceof $this->template_class) {
-            return $this->cached->valid;
-        }
-        if (!($template instanceof $this->template_class)) {
-            if ($parent === null) {
-                $parent = $this;
-            }
-            $template = $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-        }
-        // return cache status of template
-        return $template->cached->valid;
+        return $this->_execute($template, $cache_id, $compile_id, $parent, 2);
     }
 
     /**
-     * creates a data object
+     * fetches a rendered Smarty template
      *
-     * @param object $parent next higher level of Smarty variables
-     * @returns Smarty_Data data object
+     * @param  string $template   the resource handle of the template file or template object
+     * @param  mixed  $cache_id   cache id to be used with this template
+     * @param  mixed  $compile_id compile id to be used with this template
+     * @param  object $parent     next higher level of Smarty variables
+     * @param  string $function  function type 0 = fetch,  1 = display, 2 = isCache
+     *
+     * @return mixed
+     * @throws \Exception
+     * @throws \SmartyException
      */
-    public function createData($parent = null)
+    private function _execute($template, $cache_id, $compile_id, $parent, $function)
     {
-        return new Smarty_Data($parent, $this);
+        $smarty = $this->_objType == 1 ? $this : $this->smarty;
+        if ($template === null) {
+            if ($this->_objType != 2) {
+                throw new SmartyException($function . '():Missing \'$template\' parameter');
+            } else {
+                $template = clone $this;
+            }
+        } elseif (is_object($template)) {
+            if (!isset($template->_objType) || $template->_objType != 2) {
+                throw new SmartyException($function . '():Template object expected');
+            } else {
+                /* @var Smarty_Internal_Template $template */
+                $template = clone $template;
+            }
+        } else {
+            // get template object
+            /* @var Smarty_Internal_Template $template */
+            $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
+            if ($this->_objType == 1) {
+                // set caching in template object
+                $template->caching = $this->caching;
+            }
+        }
+        // fetch template content
+        $level = ob_get_level();
+        try {
+            $_smarty_old_error_level =
+                ($this->_objType == 1 && isset($smarty->error_reporting)) ? error_reporting($smarty->error_reporting) :
+                    null;
+            if ($function == 2) {
+                if ($template->caching) {
+                    // return cache status of template
+                    if (!isset($template->cached)) {
+                        $template->loadCached();
+                    }
+                    $result = $template->cached->isCached($template);
+                    $template->smarty->_cache['isCached'][$template->_getTemplateId()] = $template;
+                } else {
+                    return false;
+                }
+            } else {
+                ob_start();
+                $template->_mergeVars();
+                if (!empty(Smarty::$global_tpl_vars)) {
+                    $template->tpl_vars = array_merge(Smarty::$global_tpl_vars, $template->tpl_vars);
+                }
+                $result = $template->render(false, $function);
+            }
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            return $result;
+        }
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            throw $e;
+        }
     }
 
     /**
      * Registers plugin to be used in templates
      *
-     * @param string   $type       plugin type
-     * @param string   $tag        name of template tag
-     * @param callback $callback   PHP callback to register
-     * @param boolean  $cacheable  if true (default) this fuction is cachable
-     * @param array    $cache_attr caching attributes if any
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException when the plugin tag is invalid
-     */
-    public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
-    {
-        if (isset($this->smarty->registered_plugins[$type][$tag])) {
-            throw new SmartyException("Plugin tag \"{$tag}\" already registered");
-        } elseif (!is_callable($callback)) {
-            throw new SmartyException("Plugin \"{$tag}\" not callable");
-        } else {
-            $this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Unregister Plugin
+     * @api  Smarty::registerPlugin()
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
      *
-     * @param string $type of plugin
-     * @param string $tag name of plugin
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterPlugin($type, $tag)
-    {
-        if (isset($this->smarty->registered_plugins[$type][$tag])) {
-            unset($this->smarty->registered_plugins[$type][$tag]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a resource to fetch a template
+     * @param  string   $type       plugin type
+     * @param  string   $name       name of template tag
+     * @param  callback $callback   PHP callback to register
+     * @param  bool     $cacheable  if true (default) this function is cache able
+     * @param  mixed    $cache_attr caching attributes if any
      *
-     * @param string $type name of resource type
-     * @param Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource (deprecated)
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              when the plugin tag is invalid
      */
-    public function registerResource($type, $callback)
+    public function registerPlugin($type, $name, $callback, $cacheable = true, $cache_attr = null)
     {
-        $this->smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false);
-        return $this;
-    }
-
-    /**
-     * Unregisters a resource
-     *
-     * @param string $type name of resource type
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterResource($type)
-    {
-        if (isset($this->smarty->registered_resources[$type])) {
-            unset($this->smarty->registered_resources[$type]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a cache resource to cache a template's output
-     *
-     * @param string               $type     name of cache resource type
-     * @param Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function registerCacheResource($type, Smarty_CacheResource $callback)
-    {
-        $this->smarty->registered_cache_resources[$type] = $callback;
-        return $this;
-    }
-
-    /**
-     * Unregisters a cache resource
-     *
-     * @param string $type name of cache resource type
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterCacheResource($type)
-    {
-        if (isset($this->smarty->registered_cache_resources[$type])) {
-            unset($this->smarty->registered_cache_resources[$type]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string  $object        name of template object
-     * @param object  $object_impl   the referenced PHP object to register
-     * @param array   $allowed       list of allowed methods (empty = all)
-     * @param boolean $smarty_args   smarty argument format, else traditional
-     * @param array   $block_methods list of block-methods
-     * @param array $block_functs list of methods that are block format
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if any of the methods in $allowed or $block_methods are invalid
-     */
-    public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    {
-        // test if allowed methodes callable
-        if (!empty($allowed)) {
-            foreach ((array) $allowed as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                }
-            }
-        }
-        // test if block methodes callable
-        if (!empty($block_methods)) {
-            foreach ((array) $block_methods as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                }
-            }
-        }
-        // register the object
-        $this->smarty->registered_objects[$object_name] =
-        array($object_impl, (array) $allowed, (boolean) $smarty_args, (array) $block_methods);
-        return $this;
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name object name
-     * @return object
-     * @throws SmartyException if no such object is found
-     */
-    public function getRegisteredObject($name)
-    {
-        if (!isset($this->smarty->registered_objects[$name])) {
-            throw new SmartyException("'$name' is not a registered object");
-        }
-        if (!is_object($this->smarty->registered_objects[$name][0])) {
-            throw new SmartyException("registered '$name' is not an object");
-        }
-        return $this->smarty->registered_objects[$name][0];
-    }
-
-    /**
-     * unregister an object
-     *
-     * @param string $name object name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterObject($name)
-    {
-        if (isset($this->smarty->registered_objects[$name])) {
-            unset($this->smarty->registered_objects[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers static classes to be used in templates
-     *
-     * @param string $class name of template class
-     * @param string $class_impl the referenced PHP class to register
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $class_impl does not refer to an existing class
-     */
-    public function registerClass($class_name, $class_impl)
-    {
-        // test if exists
-        if (!class_exists($class_impl)) {
-            throw new SmartyException("Undefined class '$class_impl' in register template class");
-        }
-        // register the class
-        $this->smarty->registered_classes[$class_name] = $class_impl;
-        return $this;
-    }
-
-    /**
-     * Registers a default plugin handler
-     *
-     * @param callable $callback class/method name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $callback is not callable
-     */
-    public function registerDefaultPluginHandler($callback)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_plugin_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default plugin handler '$callback' not callable");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a default template handler
-     *
-     * @param callable $callback class/method name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $callback is not callable
-     */
-    public function registerDefaultTemplateHandler($callback)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_template_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default template handler '$callback' not callable");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a default template handler
-     *
-     * @param callable $callback class/method name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $callback is not callable
-     */
-    public function registerDefaultConfigHandler($callback)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_config_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default config handler '$callback' not callable");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a filter function
-     *
-     * @param string $type filter type
-     * @param callback $callback
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function registerFilter($type, $callback)
-    {
-        $this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
-        return $this;
-    }
-
-    /**
-     * Unregisters a filter function
-     *
-     * @param string $type filter type
-     * @param callback $callback
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterFilter($type, $callback)
-    {
-        $name = $this->_get_filter_name($callback);
-        if (isset($this->smarty->registered_filters[$type][$name])) {
-            unset($this->smarty->registered_filters[$type][$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return internal filter name
-     *
-     * @param callback $function_name
-     * @return string internal filter name
-     */
-    public function _get_filter_name($function_name)
-    {
-        if (is_array($function_name)) {
-            $_class_name = (is_object($function_name[0]) ?
-            get_class($function_name[0]) : $function_name[0]);
-            return $_class_name . '_' . $function_name[1];
-        } else {
-            return $function_name;
-        }
+        return $this->ext->registerPlugin->registerPlugin($this, $type, $name, $callback, $cacheable, $cache_attr);
     }
 
     /**
      * load a filter of specified type and name
      *
-     * @param string $type filter type
-     * @param string $name filter name
+     * @api  Smarty::loadFilter()
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param  string $type filter type
+     * @param  string $name filter name
+     *
+     * @return bool
      * @throws SmartyException if filter could not be loaded
      */
     public function loadFilter($type, $name)
     {
-        $_plugin = "smarty_{$type}filter_{$name}";
-        $_filter_name = $_plugin;
-        if ($this->smarty->loadPlugin($_plugin)) {
-            if (class_exists($_plugin, false)) {
-                $_plugin = array($_plugin, 'execute');
-            }
-            if (is_callable($_plugin)) {
-                $this->smarty->registered_filters[$type][$_filter_name] = $_plugin;
-                return true;
-            }
-        }
-        throw new SmartyException("{$type}filter \"{$name}\" not callable");
+        return $this->ext->loadFilter->loadFilter($this, $type, $name);
     }
 
     /**
-     * unload a filter of specified type and name
+     * Registers a filter function
      *
-     * @param string $type filter type
-     * @param string $name filter name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @api  Smarty::registerFilter()
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param  string      $type filter type
+     * @param  callback    $callback
+     * @param  string|null $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
      */
-    public function unloadFilter($type, $name)
+    public function registerFilter($type, $callback, $name = null)
     {
-        $_filter_name = "smarty_{$type}filter_{$name}";
-        if (isset($this->smarty->registered_filters[$type][$_filter_name])) {
-            unset ($this->smarty->registered_filters[$type][$_filter_name]);
-        }
-
-        return $this;
+        return $this->ext->registerFilter->registerFilter($this, $type, $callback, $name);
     }
 
     /**
-     * preg_replace callback to convert camelcase getter/setter to underscore property names
+     * Registers object to be used in templates
      *
-     * @param string $match match string
-     * @return string replacemant
-     */
-    private function replaceCamelcase($match) {
-        return "_" . strtolower($match[1]);
-    }
-
-    /**
-     * Handle unknown class methods
+     * @api  Smarty::registerObject()
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
      *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
+     * @param  string $object_name
+     * @param  object $object                     the referenced PHP object to register
+     * @param  array  $allowed_methods_properties list of allowed methods (empty = all)
+     * @param  bool   $format                     smarty argument format, else traditional
+     * @param  array  $block_methods              list of block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
      */
-    public function __call($name, $args)
+    public function registerObject($object_name, $object, $allowed_methods_properties = array(), $format = true,
+                                   $block_methods = array())
     {
-        static $_prefixes = array('set' => true, 'get' => true);
-        static $_resolved_property_name = array();
-        static $_resolved_property_source = array();
+        return $this->ext->registerObject->registerObject($this, $object_name, $object, $allowed_methods_properties,
+                                                          $format, $block_methods);
+    }
 
-        // method of Smarty object?
-        if (method_exists($this->smarty, $name)) {
-            return call_user_func_array(array($this->smarty, $name), $args);
-        }
-        // see if this is a set/get for a property
-        $first3 = strtolower(substr($name, 0, 3));
-        if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') {
-            if (isset($_resolved_property_name[$name])) {
-                $property_name = $_resolved_property_name[$name];
-            } else {
-                // try to keep case correct for future PHP 6.0 case-sensitive class methods
-                // lcfirst() not available < PHP 5.3.0, so improvise
-                $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4);
-                // convert camel case to underscored name
-                $property_name = preg_replace_callback('/([A-Z])/', array($this,'replaceCamelcase'), $property_name);
-                $_resolved_property_name[$name] = $property_name;
-            }
-            if (isset($_resolved_property_source[$property_name])) {
-                $_is_this = $_resolved_property_source[$property_name];
-            } else {
-                $_is_this = null;
-                if (property_exists($this, $property_name)) {
-                    $_is_this = true;
-                } else if (property_exists($this->smarty, $property_name)) {
-                    $_is_this = false;
-                }
-                $_resolved_property_source[$property_name] = $_is_this;
-            }
-            if ($_is_this) {
-                if ($first3 == 'get')
-                return $this->$property_name;
-                else
-                return $this->$property_name = $args[0];
-            } else if ($_is_this === false) {
-                if ($first3 == 'get')
-                return $this->smarty->$property_name;
-                else
-                return $this->smarty->$property_name = $args[0];
-            } else {
-                throw new SmartyException("property '$property_name' does not exist.");
-                return false;
-            }
-        }
-        if ($name == 'Smarty') {
-            throw new SmartyException("PHP5 requires you to call __construct() instead of Smarty()");
-        }
-        // must be unknown
-        throw new SmartyException("Call of unknown method '$name'.");
+    /**
+     * @param boolean $caching
+     */
+    public function setCaching($caching)
+    {
+        $this->caching = $caching;
+    }
+
+    /**
+     * @param int $cache_lifetime
+     */
+    public function setCacheLifetime($cache_lifetime)
+    {
+        $this->cache_lifetime = $cache_lifetime;
+    }
+
+    /**
+     * @param string $compile_id
+     */
+    public function setCompileId($compile_id)
+    {
+        $this->compile_id = $compile_id;
+    }
+
+    /**
+     * @param string $cache_id
+     */
+    public function setCacheId($cache_id)
+    {
+        $this->cache_id = $cache_id;
     }
 
 }
 
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/sources/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
index c745d29..6c3ea5f 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -2,28 +2,47 @@
 
 /**
  * Smarty Internal Plugin Smarty Template Compiler Base
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
  *
- * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
- *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
 
 /**
  * Main abstract compiler class
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Compiler
+ *
+ * @property Smarty_Internal_SmartyTemplateCompiler $prefixCompiledCode  = ''
+ * @property Smarty_Internal_SmartyTemplateCompiler $postfixCompiledCode = ''
+ * @method Smarty_Internal_SmartyTemplateCompiler registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+ * @method Smarty_Internal_SmartyTemplateCompiler unregisterPostCompileCallback($key)
  */
-abstract class Smarty_Internal_TemplateCompilerBase {
+abstract class Smarty_Internal_TemplateCompilerBase
+{
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Parser object
+     *
+     * @var Smarty_Internal_Templateparser
+     */
+    public $parser = null;
 
     /**
      * hash for nocache sections
      *
      * @var mixed
      */
-    private $nocache_hash = null;
+    public $nocache_hash = null;
 
     /**
      * suppress generation of nocache code
@@ -33,18 +52,11 @@ abstract class Smarty_Internal_TemplateCompilerBase {
     public $suppressNocacheProcessing = false;
 
     /**
-     * suppress generation of merged template code
-     *
-     * @var bool
-     */
-    public $suppressMergedTemplates = false;
-
-    /**
-     * compile tag objects
+     * compile tag objects cache
      *
      * @var array
      */
-    public static $_tag_objects = array();
+    public $_tag_objects = array();
 
     /**
      * tag stack
@@ -61,18 +73,53 @@ abstract class Smarty_Internal_TemplateCompilerBase {
     public $template = null;
 
     /**
-     * merged templates
+     * merged included sub template data
      *
      * @var array
      */
-    public $merged_templates = array();
+    public $mergedSubTemplatesData = array();
 
     /**
-     * flag when compiling {block}
+     * merged sub template code
      *
-     * @var bool
+     * @var array
      */
-    public $inheritance = false;
+    public $mergedSubTemplatesCode = array();
+
+    /**
+     * collected template properties during compilation
+     *
+     * @var array
+     */
+    public $templateProperties = array();
+
+    /**
+     * source line offset for error messages
+     *
+     * @var int
+     */
+    public $trace_line_offset = 0;
+
+    /**
+     * trace uid
+     *
+     * @var string
+     */
+    public $trace_uid = '';
+
+    /**
+     * trace file path
+     *
+     * @var string
+     */
+    public $trace_filepath = '';
+
+    /**
+     * stack for tracing file and line of nested {block} tags
+     *
+     * @var array
+     */
+    public $trace_stack = array();
 
     /**
      * plugins loaded by default plugin handler
@@ -90,174 +137,380 @@ abstract class Smarty_Internal_TemplateCompilerBase {
 
     /**
      * force compilation of complete template as nocache
+     *
      * @var boolean
      */
     public $forceNocache = false;
 
-    /**
-     * suppress Smarty header code in compiled template
-     * @var bool
-     */
-    public $suppressHeader = false;
-
-    /**
-     * suppress template property header code in compiled template
-     * @var bool
-     */
-    public $suppressTemplatePropertyHeader = false;
-
     /**
      * flag if compiled template file shall we written
+     *
      * @var bool
      */
     public $write_compiled_code = true;
 
     /**
-     * flag if currently a template function is compiled
-     * @var bool
+     * Template functions
+     *
+     * @var array
      */
-    public $compiles_template_function = false;
+    public $tpl_function = array();
 
     /**
-     * called subfuntions from template function
+     * called sub functions from template function
+     *
      * @var array
      */
     public $called_functions = array();
 
+    /**
+     * compiled template or block function code
+     *
+     * @var string
+     */
+    public $blockOrFunctionCode = '';
+
+    /**
+     * php_handling setting either from Smarty or security
+     *
+     * @var int
+     */
+    public $php_handling = 0;
+
     /**
      * flags for used modifier plugins
+     *
      * @var array
      */
     public $modifier_plugins = array();
 
     /**
      * type of already compiled modifier
+     *
      * @var array
      */
     public $known_modifier_type = array();
 
     /**
-     * Methode to compile a Smarty template
+     * parent compiler object for merged subtemplates and template functions
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $parent_compiler = null;
+
+    /**
+     * Flag true when compiling nocache section
+     *
+     * @var bool
+     */
+    public $nocache = false;
+
+    /**
+     * Flag true when tag is compiled as nocache
+     *
+     * @var bool
+     */
+    public $tag_nocache = false;
+
+    /**
+     * Compiled tag prefix code
+     *
+     * @var array
+     */
+    public $prefix_code = array();
+
+    /**
+     * Prefix code  stack
+     *
+     * @var array
+     */
+    public $prefixCodeStack = array();
+
+    /**
+     * Tag has compiled code
+     *
+     * @var bool
+     */
+    public $has_code = false;
+
+    /**
+     * A variable string was compiled
+     *
+     * @var bool
+     */
+    public $has_variable_string = false;
+
+    /**
+     * Tag creates output
+     *
+     * @var bool
+     */
+    public $has_output = false;
+
+    /**
+     * Stack for {setfilter} {/setfilter}
+     *
+     * @var array
+     */
+    public $variable_filter_stack = array();
+
+    /**
+     * variable filters for {setfilter} {/setfilter}
+     *
+     * @var array
+     */
+    public $variable_filters = array();
+
+    /**
+     * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
+     *
+     * @var int
+     */
+    public $loopNesting = 0;
+
+    /**
+     * Strip preg pattern
+     *
+     * @var string
+     */
+    public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
+
+    /**
+     * plugin search order
+     *
+     * @var array
+     */
+    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+
+    /**
+     * General storage area for tag compiler plugins
+     *
+     * @var array
+     */
+    public $_cache = array();
+
+    /**
+     * method to compile a Smarty template
+     *
+     * @param mixed $_content template source
+     * @param bool  $isTemplateSource
      *
-     * @param  mixed $_content template source
      * @return bool true if compiling succeeded, false if it failed
      */
-    abstract protected function doCompile($_content);
+    abstract protected function doCompile($_content, $isTemplateSource = false);
 
     /**
      * Initialize compiler
+     *
+     * @param Smarty $smarty global instance
      */
-    public function __construct() {
-        $this->nocache_hash = str_replace('.', '-', uniqid(rand(), true));
+    public function __construct(Smarty $smarty)
+    {
+        $this->smarty = $smarty;
+        $this->nocache_hash = str_replace(array('.', ','), '_', uniqid(rand(), true));
     }
 
     /**
      * Method to compile a Smarty template
      *
-     * @param  Smarty_Internal_Template $template template object to compile
+     * @param  Smarty_Internal_Template                 $template template object to compile
+     * @param  bool                                     $nocache  true is shall be compiled in nocache mode
+     * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
+     *
      * @return bool true if compiling succeeded, false if it failed
+     * @throws \Exception
      */
-    public function compileTemplate(Smarty_Internal_Template $template) {
-        if (empty($template->properties['nocache_hash'])) {
-            $template->properties['nocache_hash'] = $this->nocache_hash;
-        } else {
-            $this->nocache_hash = $template->properties['nocache_hash'];
-        }
-        // flag for nochache sections
-        $this->nocache = false;
-        $this->tag_nocache = false;
-        // save template object in compiler class
-        $this->template = $template;
-        // reset has noche code flag
-        $this->template->has_nocache_code = false;
-        $this->smarty->_current_file = $saved_filepath = $this->template->source->filepath;
-        // template header code
-        $template_header = '';
-        if (!$this->suppressHeader) {
-            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-            $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
-        }
+    public function compileTemplate(Smarty_Internal_Template $template, $nocache = null,
+                                    Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
+    {
+        // get code frame of compiled template
+        $_compiled_code = $template->smarty->ext->_codeFrame->create($template,
+                                                                     $this->compileTemplateSource($template, $nocache,
+                                                                                                  $parent_compiler),
+                                                                     $this->postFilter($this->blockOrFunctionCode) .
+                                                                     join('', $this->mergedSubTemplatesCode), false,
+                                                                     $this);
+        return $_compiled_code;
+    }
 
-        do {
-            // flag for aborting current and start recompile
-            $this->abort_and_recompile = false;
+    /**
+     * Compile template source and run optional post filter
+     *
+     * @param \Smarty_Internal_Template             $template
+     * @param null|bool                             $nocache flag if template must be compiled in nocache mode
+     * @param \Smarty_Internal_TemplateCompilerBase $parent_compiler
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function compileTemplateSource(Smarty_Internal_Template $template, $nocache = null,
+                                          Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
+    {
+        try {
+            // save template object in compiler class
+            $this->template = $template;
+            if (property_exists($this->template->smarty, 'plugin_search_order')) {
+                $this->plugin_search_order = $this->template->smarty->plugin_search_order;
+            }
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->start_compile($this->template);
+            }
+            if (isset($this->template->smarty->security_policy)) {
+                $this->php_handling = $this->template->smarty->security_policy->php_handling;
+            } else {
+                $this->php_handling = $this->template->smarty->php_handling;
+            }
+            $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
+            $nocache = isset($nocache) ? $nocache : false;
+            if (empty($template->compiled->nocache_hash)) {
+                $template->compiled->nocache_hash = $this->nocache_hash;
+            } else {
+                $this->nocache_hash = $template->compiled->nocache_hash;
+            }
+            // flag for nocache sections
+            $this->nocache = $nocache;
+            $this->tag_nocache = false;
+            // reset has nocache code flag
+            $this->template->compiled->has_nocache_code = false;
+            $this->has_variable_string = false;
+            $this->prefix_code = array();
+            // add file dependency
+            $this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] =
+                array($this->template->source->filepath, $this->template->source->getTimeStamp(),
+                      $this->template->source->type);
+            $this->smarty->_current_file = $this->template->source->filepath;
             // get template source
-            $_content = $template->source->content;
-            // run prefilter if required
-            if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) {
-                $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
-            }
-            // on empty template just return header
-            if ($_content == '') {
-                if ($this->suppressTemplatePropertyHeader) {
-                    $code = '';
-                } else {
-                    $code = $template_header . $template->createTemplateCodeFrame();
-                }
-                return $code;
-            }
-            // call compiler
-            $_compiled_code = $this->doCompile($_content);
-        } while ($this->abort_and_recompile);
-        $this->template->source->filepath = $saved_filepath;
-        // free memory
-        unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex, $this->template);
-        self::$_tag_objects = array();
-        // return compiled code to template object
-        $merged_code = '';
-        if (!$this->suppressMergedTemplates && !empty($this->merged_templates)) {
-            foreach ($this->merged_templates as $code) {
-                $merged_code .= $code;
-            }
-            // run postfilter if required on merged code
-            if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
-                $merged_code = Smarty_Internal_Filter_Handler::runFilter('post', $merged_code, $template);
+            if (!empty($this->template->source->components)) {
+                // we have array of inheritance templates by extends: resource
+                // generate corresponding source code sequence
+                $_content =
+                    Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template->source->components);
+            } else {
+                // get template source
+                $_content = $this->template->source->getContent();
             }
+            $_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
         }
-        // run postfilter if required on compiled template code
-        if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
-            $_compiled_code = Smarty_Internal_Filter_Handler::runFilter('post', $_compiled_code, $template);
+        catch (Exception $e) {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_compile($this->template);
+            }
+            $this->_tag_stack = array();
+            $this->_tag_objects = array();
+            // free memory
+            $this->parent_compiler = null;
+            $this->template = null;
+            $this->parser = null;
+            throw $e;
         }
-        if ($this->suppressTemplatePropertyHeader) {
-            $code = $_compiled_code . $merged_code;
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        $this->parent_compiler = null;
+        $this->template = null;
+        $this->parser = null;
+        return $_compiled_code;
+    }
+
+    /**
+     * Optionally process compiled code by post filter
+     *
+     * @param string $code compiled code
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function postFilter($code)
+    {
+        // run post filter if on code
+        if (!empty($code) &&
+            (isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
         } else {
-            $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code;
+            return $code;
         }
-        // unset content because template inheritance could have replace source with parent code
-        unset ($template->source->content);
-        return $code;
+    }
+
+    /**
+     * Run optional prefilter
+     *
+     * @param string $_content template source
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function preFilter($_content)
+    {
+        // run pre filter if required
+        if ($_content != '' &&
+            ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
+        } else {
+            return $_content;
+        }
+    }
+
+    /**
+     * Compile Tag
+     * This is a call back from the lexer/parser
+     *
+     * Save current prefix code
+     * Compile tag
+     * Merge tag prefix code with saved one
+     * (required nested tags in attributes)
+     *
+     * @param  string $tag       tag name
+     * @param  array  $args      array with tag attributes
+     * @param  array  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
+     * @throws SmartyException
+     * @return string compiled code
+     */
+    public function compileTag($tag, $args, $parameter = array())
+    {
+        $this->prefixCodeStack[] = $this->prefix_code;
+        $this->prefix_code = array();
+        $result = $this->compileTag2($tag, $args, $parameter);
+        $this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+        return $result;
     }
 
     /**
      * Compile Tag
      *
-     * This is a call back from the lexer/parser
-     * It executes the required compile plugin for the Smarty tag
+     * @param  string $tag       tag name
+     * @param  array  $args      array with tag attributes
+     * @param  array  $parameter array with compilation parameter
      *
-     * @param string $tag       tag name
-     * @param array  $args      array with tag attributes
-     * @param array  $parameter array with compilation parameter
+     * @throws SmartyCompilerException
+     * @throws SmartyException
      * @return string compiled code
      */
-    public function compileTag($tag, $args, $parameter = array()) {
+    private function compileTag2($tag, $args, $parameter)
+    {
+        $plugin_type = '';
         // $args contains the attributes parsed and compiled by the lexer/parser
         // assume that tag does compile into code, but creates no HTML output
         $this->has_code = true;
         $this->has_output = false;
         // log tag/attributes
-        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
-            $this->template->used_tags[] = array($tag, $args);
+        if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
+            $this->template->_cache[ 'used_tags' ][] = array($tag, $args);
         }
         // check nocache option flag
-        if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args)
-                || in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args)) {
+        if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args) ||
+            in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args)
+        ) {
             $this->tag_nocache = true;
         }
-        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
+        // compile the smarty tag (required compile classes to compile the tag are auto loaded)
         if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->smarty->template_functions[$tag])) {
+            if (isset($this->parent_compiler->template->tpl_function[ $tag ])) {
                 // template defined by {template} tag
-                $args['_attr']['name'] = "'" . $tag . "'";
+                $args[ '_attr' ][ 'name' ] = "'" . $tag . "'";
                 $_output = $this->callTagCompiler('call', $args, $parameter);
             }
         }
@@ -274,33 +527,39 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                 }
             }
             // tag did not produce compiled code
-            return '';
+            return null;
         } else {
             // map_named attributes
-            if (isset($args['_attr'])) {
-                foreach ($args['_attr'] as $key => $attribute) {
+            if (isset($args[ '_attr' ])) {
+                foreach ($args[ '_attr' ] as $key => $attribute) {
                     if (is_array($attribute)) {
                         $args = array_merge($args, $attribute);
                     }
                 }
             }
             // not an internal compiler tag
-            if (strlen($tag) < 6 || substr($tag, -5) != 'close') {
+            if (strlen($tag) < 6 || substr($tag, - 5) != 'close') {
                 // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_methode'])) {
-                    $methode = $parameter['object_methode'];
-                    if (!in_array($methode, $this->smarty->registered_objects[$tag][3]) &&
-                            (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) {
-                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $methode);
-                    } elseif (in_array($methode, $this->smarty->registered_objects[$tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
+                    $method = $parameter[ 'object_method' ];
+                    if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ]) &&
+                        (empty($this->smarty->registered_objects[ $tag ][ 1 ]) ||
+                            in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
+                    ) {
+                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
+                    } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
+                                                      $method);
                     } else {
-                        return $this->trigger_template_error('unallowed methode "' . $methode . '" in registered object "' . $tag . '"', $this->lex->taglineno);
+                        // throw exception
+                        $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' .
+                                                      $tag . '"', null, true);
                     }
                 }
                 // check if tag is registered
-                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type) {
-                    if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) {
+                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type)
+                {
+                    if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
                         // if compiler function plugin call it now
                         if ($plugin_type == Smarty::PLUGIN_COMPILER) {
                             $new_args = array();
@@ -308,30 +567,36 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                                 if (is_array($mixed)) {
                                     $new_args = array_merge($new_args, $mixed);
                                 } else {
-                                    $new_args[$key] = $mixed;
+                                    $new_args[ $key ] = $mixed;
                                 }
                             }
-                            if (!$this->smarty->registered_plugins[$plugin_type][$tag][1]) {
+                            if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
                                 $this->tag_nocache = true;
                             }
-                            $function = $this->smarty->registered_plugins[$plugin_type][$tag][0];
+                            $function = $this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ];
                             if (!is_array($function)) {
                                 return $function($new_args, $this);
-                            } else if (is_object($function[0])) {
-                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
+                            } elseif (is_object($function[ 0 ])) {
+                                return $this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ][ 0 ]->{$function[ 1 ]}($new_args,
+                                                                                                                             $this);
                             } else {
                                 return call_user_func_array($function, array($new_args, $this));
                             }
                         }
                         // compile registered function or block function
                         if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
+                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
+                                                          $tag);
                         }
                     }
                 }
                 // check plugins from plugins folder
-                foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                    if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) {
+                foreach ($this->plugin_search_order as $plugin_type) {
+                    if ($plugin_type == Smarty::PLUGIN_COMPILER &&
+                        $this->smarty->loadPlugin('smarty_compiler_' . $tag) &&
+                        (!isset($this->smarty->security_policy) ||
+                            $this->smarty->security_policy->isTrustedTag($tag, $this))
+                    ) {
                         $plugin = 'smarty_compiler_' . $tag;
                         if (is_callable($plugin)) {
                             // convert arguments format for old compiler plugins
@@ -340,9 +605,10 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                                 if (is_array($mixed)) {
                                     $new_args = array_merge($new_args, $mixed);
                                 } else {
-                                    $new_args[$key] = $mixed;
+                                    $new_args[ $key ] = $mixed;
                                 }
                             }
+
                             return $plugin($new_args, $this->smarty);
                         }
                         if (class_exists($plugin, false)) {
@@ -354,8 +620,11 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                         throw new SmartyException("Plugin \"{$tag}\" not callable");
                     } else {
                         if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
+                            if (!isset($this->smarty->security_policy) ||
+                                $this->smarty->security_policy->isTrustedTag($tag, $this)
+                            ) {
+                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter,
+                                                              $tag, $function);
                             }
                         }
                     }
@@ -363,15 +632,15 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                 if (is_callable($this->smarty->default_plugin_handler_func)) {
                     $found = false;
                     // look for already resolved tags
-                    foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                        if (isset($this->default_handler_plugins[$plugin_type][$tag])) {
+                    foreach ($this->plugin_search_order as $plugin_type) {
+                        if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
                             $found = true;
                             break;
                         }
                     }
                     if (!$found) {
                         // call default handler
-                        foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                        foreach ($this->plugin_search_order as $plugin_type) {
                             if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
                                 $found = true;
                                 break;
@@ -385,51 +654,71 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                             foreach ($args as $mixed) {
                                 $new_args = array_merge($new_args, $mixed);
                             }
-                            $function = $this->default_handler_plugins[$plugin_type][$tag][0];
+                            $function = $this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ];
                             if (!is_array($function)) {
                                 return $function($new_args, $this);
-                            } else if (is_object($function[0])) {
-                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
+                            } elseif (is_object($function[ 0 ])) {
+                                return $this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ][ 0 ]->$function[ 1 ]($new_args,
+                                                                                                                        $this);
                             } else {
                                 return call_user_func_array($function, array($new_args, $this));
                             }
                         } else {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
+                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
+                                                          $tag);
                         }
                     }
                 }
             } else {
                 // compile closing tag of block function
-                $base_tag = substr($tag, 0, -5);
+                $base_tag = substr($tag, 0, - 5);
                 // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_methode'])) {
-                    $methode = $parameter['object_methode'];
-                    if (in_array($methode, $this->smarty->registered_objects[$base_tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
+                    $method = $parameter[ 'object_method' ];
+                    if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
+                                                      $method);
                     } else {
-                        return $this->trigger_template_error('unallowed closing tag methode "' . $methode . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
+                        // throw exception
+                        $this->trigger_template_error('not allowed closing tag method "' . $method .
+                                                      '" in registered object "' . $base_tag . '"', null, true);
                     }
                 }
                 // registered block tag ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) || isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ]) ||
+                    isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+                ) {
                     return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
                 }
+                // registered function tag ?
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
+                    return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
+                }
                 // block plugin?
                 if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
                     return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
                 }
+                // function plugin?
+                if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
+                    if (!isset($this->smarty->security_policy) ||
+                        $this->smarty->security_policy->isTrustedTag($tag, $this)
+                    ) {
+                        return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
+                    }
+                }
                 // registered compiler plugin ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag])) {
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
                     // if compiler function plugin call it now
                     $args = array();
-                    if (!$this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][1]) {
+                    if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
                         $this->tag_nocache = true;
                     }
-                    $function = $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0];
+                    $function = $this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ];
                     if (!is_array($function)) {
                         return $function($args, $this);
-                    } else if (is_object($function[0])) {
-                        return $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0][0]->$function[1]($args, $this);
+                    } elseif (is_object($function[ 0 ])) {
+                        return $this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ][ 0 ]->$function[ 1 ]($args,
+                                                                                                                              $this);
                     } else {
                         return call_user_func_array($function, array($args, $this));
                     }
@@ -448,73 +737,178 @@ abstract class Smarty_Internal_TemplateCompilerBase {
                     throw new SmartyException("Plugin \"{$tag}\" not callable");
                 }
             }
-            $this->trigger_template_error("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
+            $this->trigger_template_error("unknown tag \"" . $tag . "\"", null, true);
         }
     }
 
     /**
-     * lazy loads internal compile plugin for tag and calls the compile methode
+     * compile variable
      *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileVariable($variable)
+    {
+        if (strpos($variable, '(') == 0) {
+            // not a variable variable
+            $var = trim($variable, '\'');
+            $this->tag_nocache = $this->tag_nocache |
+                $this->template->ext->getTemplateVars->_getVariable($this->template, $var, null, true, false)->nocache;
+            // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
+        }
+        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
+    }
+
+    /**
+     * compile config variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileConfigVariable($variable)
+    {
+        // return '$_smarty_tpl->config_vars[' . $variable . ']';
+        return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
+    }
+
+    /**
+     * This method is called from parser to process a text content section
+     * - remove text from inheritance child templates as they may generate output
+     * - strip text if strip is enabled
+     *
+     * @param string $text
+     *
+     * @return null|\Smarty_Internal_ParseTree_Text
+     */
+    public function processText($text)
+    {
+        if ((string) $text != '') {
+            $store = array();
+            $_store = 0;
+            $_offset = 0;
+            if ($this->parser->strip) {
+                if (strpos($text, '<') !== false) {
+                    // capture html elements not to be messed with
+                    $_offset = 0;
+                    if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+                                       $text, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+                        foreach ($matches as $match) {
+                            $store[] = $match[ 0 ][ 0 ];
+                            $_length = strlen($match[ 0 ][ 0 ]);
+                            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+                            $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+
+                            $_offset += $_length - strlen($replace);
+                            $_store ++;
+                        }
+                    }
+
+                    $expressions = array(// replace multiple spaces between tags by a single space
+                                         // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
+                                         '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                                    => '\1 \2',
+                                         // remove spaces between attributes (but not in attribute values!)
+                                         '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+                                         '#^\s+<#Ss'                                                               => '<',
+                                         '#>\s+$#Ss'                                                               => '>',
+                                         $this->stripRegEx                                                         => '');
+
+                    $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+                    $_offset = 0;
+                    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $text, $matches,
+                                       PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+                        foreach ($matches as $match) {
+                            $_length = strlen($match[ 0 ][ 0 ]);
+                            $replace = $store[ $match[ 1 ][ 0 ] ];
+                            $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+
+                            $_offset += strlen($replace) - $_length;
+                            $_store ++;
+                        }
+                    }
+                } else {
+                    $text = preg_replace($this->stripRegEx, '', $text);
+                }
+            }
+            return new Smarty_Internal_ParseTree_Text($text);
+        }
+        return null;
+    }
+
+    /**
+     * lazy loads internal compile plugin for tag and calls the compile method
      * compile objects cached for reuse.
      * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_Tagname.php
+     * plugin filename format: Smarty_Internal_TagName.php
+     *
+     * @param  string $tag    tag name
+     * @param  array  $args   list of tag attributes
+     * @param  mixed  $param1 optional parameter
+     * @param  mixed  $param2 optional parameter
+     * @param  mixed  $param3 optional parameter
      *
-     * @param string $tag   tag name
-     * @param array $args   list of tag attributes
-     * @param mixed $param1 optional parameter
-     * @param mixed $param2 optional parameter
-     * @param mixed $param3 optional parameter
      * @return string compiled code
      */
-    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null) {
+    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
+    {
         // re-use object if already exists
-        if (isset(self::$_tag_objects[$tag])) {
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-        }
-        // lazy load internal compiler plugin
-        $class_name = 'Smarty_Internal_Compile_' . $tag;
-        if ($this->smarty->loadPlugin($class_name)) {
-            // check if tag allowed by security
-            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                // use plugin if found
-                self::$_tag_objects[$tag] = new $class_name;
-                // compile this tag
-                return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
+        if (!isset($this->_tag_objects[ $tag ])) {
+            // lazy load internal compiler plugin
+            $_tag = explode('_', $tag);
+            $_tag = array_map('ucfirst', $_tag);
+            $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
+            if (class_exists($class_name) &&
+                (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
+            ) {
+                $this->_tag_objects[ $tag ] = new $class_name;
+            } else {
+                $this->_tag_objects[ $tag ] = false;
+                return false;
             }
         }
-        // no internal compile plugin for this tag
-        return false;
+        // compile this tag
+        return $this->_tag_objects[ $tag ] === false ? false :
+            $this->_tag_objects[ $tag ]->compile($args, $this, $param1, $param2, $param3);
     }
 
     /**
      * Check for plugins and return function name
      *
-     * @param string $pugin_name  name of plugin or function
-     * @param string $plugin_type type of plugin
+     * @param         $plugin_name
+     * @param  string $plugin_type type of plugin
+     *
      * @return string call name of function
      */
-    public function getPlugin($plugin_name, $plugin_type) {
+    public function getPlugin($plugin_name, $plugin_type)
+    {
         $function = null;
         if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
+            if (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
+                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
             }
         } else {
-            if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            } else if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
+            if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            } elseif (isset($this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
+                    $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
             }
         }
         if (isset($function)) {
             if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[$plugin_name] = true;
+                $this->modifier_plugins[ $plugin_name ] = true;
             }
+
             return $function;
         }
         // loop through plugin dirs and find the plugin
@@ -523,92 +917,130 @@ abstract class Smarty_Internal_TemplateCompilerBase {
 
         if (is_string($file)) {
             if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] = $function;
+                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+                    $file;
+                $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+                    $function;
             } else {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] = $function;
+                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+                    $file;
+                $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+                    $function;
             }
             if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[$plugin_name] = true;
+                $this->modifier_plugins[ $plugin_name ] = true;
             }
+
             return $function;
         }
         if (is_callable($function)) {
             // plugin function is defined in the script
             return $function;
         }
+
         return false;
     }
 
     /**
      * Check for plugins by default plugin handler
      *
-     * @param string $tag         name of tag
-     * @param string $plugin_type type of plugin
+     * @param  string $tag         name of tag
+     * @param  string $plugin_type type of plugin
+     *
      * @return boolean true if found
      */
-    public function getPluginFromDefaultHandler($tag, $plugin_type) {
+    public function getPluginFromDefaultHandler($tag, $plugin_type)
+    {
         $callback = null;
         $script = null;
         $cacheable = true;
-        $result = call_user_func_array(
-                $this->smarty->default_plugin_handler_func, array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable)
-        );
+        $result = call_user_func_array($this->smarty->default_plugin_handler_func,
+                                       array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable));
         if ($result) {
             $this->tag_nocache = $this->tag_nocache || !$cacheable;
             if ($script !== null) {
                 if (is_file($script)) {
                     if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['function'] = $callback;
+                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
+                            $script;
+                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
+                            $callback;
                     } else {
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback;
+                        $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
+                            $script;
+                        $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
+                            $callback;
                     }
-                    include_once $script;
+                    require_once $script;
                 } else {
                     $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
                 }
             }
-            if (!is_string($callback) && !(is_array($callback) && is_string($callback[0]) && is_string($callback[1]))) {
+            if (!is_string($callback) &&
+                !(is_array($callback) && is_string($callback[ 0 ]) && is_string($callback[ 1 ]))
+            ) {
                 $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" must be a static function name or array of class and function name");
             }
             if (is_callable($callback)) {
-                $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
+                $this->default_handler_plugins[ $plugin_type ][ $tag ] = array($callback, true, array());
+
                 return true;
             } else {
                 $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
             }
         }
+
         return false;
     }
 
     /**
-     * Inject inline code for nocache template sections
+     * Append code segments and remove unneeded ?> <?php transitions
      *
+     * @param string $left
+     * @param string $right
+     *
+     * @return string
+     */
+    public function appendCode($left, $right)
+    {
+        if (preg_match('/\s*\?>\s*$/', $left) && preg_match('/^\s*<\?php\s+/', $right)) {
+            $left = preg_replace('/\s*\?>\s*$/', "\n", $left);
+            $left .= preg_replace('/^\s*<\?php\s+/', '', $right);
+        } else {
+            $left .= $right;
+        }
+        return $left;
+    }
+
+    /**
+     * Inject inline code for nocache template sections
      * This method gets the content of each template element from the parser.
      * If the content is compiled code and it should be not cached the code is injected
      * into the rendered output.
      *
-     * @param string  $content content of template element
-     * @param boolean $is_code true if content is compiled code
-     * @return string content
+     * @param  string  $content content of template element
+     * @param  boolean $is_code true if content is compiled code
+     *
+     * @return string  content
      */
-    public function processNocacheCode($content, $is_code) {
+    public function processNocacheCode($content, $is_code)
+    {
         // If the template is not evaluated and we have a nocache section and or a nocache tag
         if ($is_code && !empty($content)) {
             // generate replacement code
-            if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
-                    ($this->nocache || $this->tag_nocache || $this->forceNocache == 2)) {
-                $this->template->has_nocache_code = true;
-                $_output = addcslashes($content,'\'\\');
+            if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->template->caching &&
+                !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
+            ) {
+                $this->template->compiled->has_nocache_code = true;
+                $_output = addcslashes($content, '\'\\');
                 $_output = str_replace("^#^", "'", $_output);
-                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
-                // make sure we include modifer plugins for nocache code
+                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output .
+                    "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
+                // make sure we include modifier plugins for nocache code
                 foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
-                        $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
+                    if (isset($this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
+                        $this->parent_compiler->template->compiled->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
+                            $this->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
                     }
                 }
             } else {
@@ -620,51 +1052,119 @@ abstract class Smarty_Internal_TemplateCompilerBase {
         $this->modifier_plugins = array();
         $this->suppressNocacheProcessing = false;
         $this->tag_nocache = false;
+
         return $_output;
     }
 
     /**
-     * display compiler error messages without dying
+     * Get Id
      *
+     * @param string $input
+     *
+     * @return bool|string
+     */
+    public function getId($input)
+    {
+        if (preg_match('~^[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*$~', $input, $match)) {
+            return $match[ 1 ];
+        }
+        return false;
+    }
+
+    /**
+     * Get variable name from string
+     *
+     * @param string $input
+     *
+     * @return bool|string
+     */
+    public function getVariableName($input)
+    {
+        if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
+            return $match[ 1 ];
+        }
+        return false;
+    }
+
+    /**
+     * Generate nocache code string
+     *
+     * @param string $code PHP code
+     *
+     * @return string
+     */
+    public function makeNocacheCode($code)
+    {
+        return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
+        str_replace("^#^", "'", addcslashes($code, '\'\\')) . "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
+    }
+
+    /**
+     * display compiler error messages without dying
      * If parameter $args is empty it is a parser detected syntax error.
      * In this case the parser is called to obtain information about expected tokens.
-     *
      * If parameter $args contains a string this is used as error message
      *
-     * @param string $args individual error message or null
-     * @param string $line line-number
-     * @throws SmartyCompilerException when an unexpected token is found
+     * @param  string   $args    individual error message or null
+     * @param  string   $line    line-number
+     * @param null|bool $tagline if true the line number of last tag
+     *
+     * @throws \SmartyCompilerException when an unexpected token is found
      */
-    public function trigger_template_error($args = null, $line = null) {
-        // get template source line which has error
-        if (!isset($line)) {
-            $line = $this->lex->line;
+    public function trigger_template_error($args = null, $line = null, $tagline = null)
+    {
+        $lex = $this->parser->lex;
+        if ($tagline === true) {
+            // get line number of Tag
+            $line = $lex->taglineno;
+        } elseif (!isset($line)) {
+            // get template source line which has error
+            $line = $lex->line;
+        } else {
+            $line = (int) $line;
         }
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = 'Syntax Error in template "' . $this->template->source->filepath . '"  on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]))) . '" ';
+
+        if (in_array($this->template->source->type, array('eval', 'string'))) {
+            $templateName = $this->template->source->type . ':' . trim(preg_replace('![\t\r\n]+!', ' ',
+                                                                                    strlen($lex->data) > 40 ?
+                                                                                        substr($lex->data, 0, 40) .
+                                                                                        '...' : $lex->data));
+        } else {
+            $templateName = $this->template->source->type . ':' . $this->template->source->filepath;
+        }
+
+        //        $line += $this->trace_line_offset;
+        $match = preg_split("/\n/", $lex->data);
+        $error_text =
+            'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
+            '"  on line ' . ($line + $this->trace_line_offset) . ' "' .
+            trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])) . '" ';
         if (isset($args)) {
             // individual error message
             $error_text .= $args;
         } else {
+            $expect = array();
             // expected token from parser
-            $error_text .= ' - Unexpected "' . $this->lex->value . '"';
+            $error_text .= ' - Unexpected "' . $lex->value . '"';
             if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
                 foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                    $exp_token = $this->parser->yyTokenName[$token];
-                    if (isset($this->lex->smarty_token_names[$exp_token])) {
+                    $exp_token = $this->parser->yyTokenName[ $token ];
+                    if (isset($lex->smarty_token_names[ $exp_token ])) {
                         // token type from lexer
-                        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+                        $expect[] = '"' . $lex->smarty_token_names[ $exp_token ] . '"';
                     } else {
                         // otherwise internal token name
-                        $expect[] = $this->parser->yyTokenName[$token];
+                        $expect[] = $this->parser->yyTokenName[ $token ];
                     }
                 }
                 $error_text .= ', expected one of: ' . implode(' , ', $expect);
             }
         }
-        throw new SmartyCompilerException($error_text);
+        $e = new SmartyCompilerException($error_text);
+        $e->line = $line;
+        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
+        $e->desc = $args;
+        $e->template = $this->template->source->filepath;
+        throw $e;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/sources/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php
index a7d5fa9..993b7be 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_templatelexer.php
@@ -1,176 +1,319 @@
 <?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
-* Smarty Internal Plugin Templatelexer
-*
-* This is the lexer to break the template source into tokens
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-/**
-* Smarty Internal Plugin Templatelexer
-*/
+ * Smarty_Internal_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
 class Smarty_Internal_Templatelexer
 {
+    /**
+     * Source
+     *
+     * @var string
+     */
     public $data;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
     public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
     public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
     public $value;
-    public $node;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
     public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
     public $taglineno;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    public $phpType = '';
+
+    /**
+     * escaped left delimiter
+     *
+     * @var string
+     */
+    public $ldel = '';
+
+    /**
+     * escaped left delimiter length
+     *
+     * @var int
+     */
+    public $ldel_length = 0;
+
+    /**
+     * escaped right delimiter
+     *
+     * @var string
+     */
+    public $rdel = '';
+
+    /**
+     * escaped right delimiter length
+     *
+     * @var int
+     */
+    public $rdel_length = 0;
+
+    /**
+     * state number
+     *
+     * @var int
+     */
     public $state = 1;
-    private $heredoc_id_stack = Array();
-    public $smarty_token_names = array (		// Text for parser error messages
-    				'IDENTITY'	=> '===',
-    				'NONEIDENTITY'	=> '!==',
-    				'EQUALS'	=> '==',
-    				'NOTEQUALS'	=> '!=',
-    				'GREATEREQUAL' => '(>=,ge)',
-    				'LESSEQUAL' => '(<=,le)',
-    				'GREATERTHAN' => '(>,gt)',
-    				'LESSTHAN' => '(<,lt)',
-    				'MOD' => '(%,mod)',
-    				'NOT'			=> '(!,not)',
-    				'LAND'		=> '(&&,and)',
-    				'LOR'			=> '(||,or)',
-    				'LXOR'			=> 'xor',
-    				'OPENP'		=> '(',
-    				'CLOSEP'	=> ')',
-    				'OPENB'		=> '[',
-    				'CLOSEB'	=> ']',
-    				'PTR'			=> '->',
-    				'APTR'		=> '=>',
-    				'EQUAL'		=> '=',
-    				'NUMBER'	=> 'number',
-    				'UNIMATH'	=> '+" , "-',
-    				'MATH'		=> '*" , "/" , "%',
-    				'INCDEC'	=> '++" , "--',
-    				'SPACE'		=> ' ',
-    				'DOLLAR'	=> '$',
-    				'SEMICOLON' => ';',
-    				'COLON'		=> ':',
-    				'DOUBLECOLON'		=> '::',
-    				'AT'		=> '@',
-    				'HATCH'		=> '#',
-    				'QUOTE'		=> '"',
-    				'BACKTICK'		=> '`',
-    				'VERT'		=> '|',
-    				'DOT'			=> '.',
-    				'COMMA'		=> '","',
-    				'ANDSYM'		=> '"&"',
-    				'QMARK'		=> '"?"',
-    				'ID'			=> 'identifier',
-    				'TEXT'		=> 'text',
-     				'FAKEPHPSTARTTAG'	=> 'Fake PHP start tag',
-     				'PHPSTARTTAG'	=> 'PHP start tag',
-     				'PHPENDTAG'	=> 'PHP end tag',
- 						'LITERALSTART'  => 'Literal start',
- 						'LITERALEND'    => 'Literal end',
-    				'LDELSLASH' => 'closing tag',
-    				'COMMENT' => 'comment',
-    				'AS' => 'as',
-    				'TO' => 'to',
-    				);
 
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
 
-    function __construct($data,$compiler)
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * PHP start tag string
+     *
+     * @var string
+     */
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+                                               'NOT'         => '(!,not)', 'OPENP' => '(', 'CLOSEP' => ')',
+                                               'OPENB'       => '[', 'CLOSEB' => ']', 'PTR' => '->', 'APTR' => '=>',
+                                               'EQUAL'       => '=', 'NUMBER' => 'number', 'UNIMATH' => '+" , "-',
+                                               'MATH'        => '*" , "/" , "%', 'INCDEC' => '++" , "--',
+                                               'SPACE'       => ' ', 'DOLLAR' => '$', 'SEMICOLON' => ';',
+                                               'COLON'       => ':', 'DOUBLECOLON' => '::', 'AT' => '@', 'HATCH' => '#',
+                                               'QUOTE'       => '"', 'BACKTICK' => '`', 'VERT' => '"|" modifier',
+                                               'DOT'         => '.', 'COMMA' => '","', 'QMARK' => '"?"',
+                                               'ID'          => 'id, name', 'TEXT' => 'text',
+                                               'LDELSLASH'   => '{/..} closing tag', 'LDEL' => '{...} Smarty tag',
+                                               'COMMENT'     => 'comment', 'AS' => 'as', 'TO' => 'to',
+                                               'PHP'         => '"<?php", "<%", "{php}" tag',
+                                               'LOGOP'       => '"<", "==" ... logical operator',
+                                               'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'       => '"is even" ... if condition',);
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-//        $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
         $this->data = $data;
         $this->counter = 0;
+        if (preg_match('~^\xEF\xBB\xBF~i', $this->data, $match)) {
+            $this->counter += strlen($match[ 0 ]);
+        }
         $this->line = 1;
         $this->smarty = $compiler->smarty;
         $this->compiler = $compiler;
-        $this->ldel = preg_quote($this->smarty->left_delimiter,'/');
+        $this->ldel = preg_quote($this->smarty->left_delimiter, '~');
         $this->ldel_length = strlen($this->smarty->left_delimiter);
-        $this->rdel = preg_quote($this->smarty->right_delimiter,'/');
+        $this->rdel = preg_quote($this->smarty->right_delimiter, '~');
         $this->rdel_length = strlen($this->smarty->right_delimiter);
-        $this->smarty_token_names['LDEL'] =	$this->smarty->left_delimiter;
-        $this->smarty_token_names['RDEL'] =	$this->smarty->right_delimiter;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-     }
+        $this->smarty_token_names[ 'LDEL' ] = $this->smarty->left_delimiter;
+        $this->smarty_token_names[ 'RDEL' ] = $this->smarty->right_delimiter;
+    }
 
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    /*
+     * Check if this tag is autoliteral
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false;
+    }
 
     private $_yy_state = 1;
+
     private $_yy_stack = array();
 
-    function yylex()
+    public function yylex()
     {
         return $this->{'yylex' . $this->_yy_state}();
     }
 
-    function yypushstate($state)
+    public function yypushstate($state)
     {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
+        }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
+        }
     }
 
-    function yypopstate()
+    public function yypopstate()
     {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
+        }
         $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
+        }
     }
 
-    function yybegin($state)
+    public function yybegin($state)
     {
         $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
+        }
     }
 
-
-
-    function yylex1()
+    public function yylex1()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 1,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 1,
-              13 => 0,
-              14 => 0,
-              15 => 0,
-              16 => 0,
-              17 => 0,
-              18 => 0,
-              19 => 0,
-              20 => 0,
-              21 => 0,
-              22 => 0,
-              23 => 0,
-              24 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 =
+                "/\G([{][}])|\G(" . $this->ldel . "[*])|\G((" . $this->ldel . "\\s*php(.*?)" . $this->rdel . ")|(" .
+                $this->ldel . "\\s*[\/]php" . $this->rdel . "))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel .
+                ")|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel .
+                ")|\G((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|([?][>])|([%][>]))|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|\G(\\{\\})|\G(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|\G(".$this->ldel."strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s*setfilter\\s+)|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(".$this->rdel.")|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state TEXT');
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state TEXT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r1_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -179,305 +322,134 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const TEXT = 1;
-    function yy_r1_1($yy_subpatterns)
+
+    function yy_r1_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD;
-    }
-    function yy_r1_2($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-    function yy_r1_3($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
-    }
-    function yy_r1_5($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-    }
-    function yy_r1_6($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-    $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-  }
-    }
-    function yy_r1_7($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-    }
-    function yy_r1_8($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-  }
-    }
-    function yy_r1_9($yy_subpatterns)
-    {
-
-   $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-   $this->yypushstate(self::LITERAL);
-    }
-    function yy_r1_10($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_11($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_13($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_14($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_15($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_16($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_17($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r1_18($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r1_19($yy_subpatterns)
-    {
-
-  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-  } elseif ($this->value == '<?xml') {
-      $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-    $this->value = substr($this->value, 0, 2);
-  }
-     }
-    function yy_r1_20($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-    function yy_r1_21($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-    function yy_r1_22($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r1_23($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-    function yy_r1_24($yy_subpatterns)
-    {
-
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  preg_match("/{$this->ldel}|<\?|\?>|<%|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-  if (isset($match[0][1])) {
-    $to = $match[0][1];
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-
-    function yylex2()
+    function yy_r1_2()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 1,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 0,
-              12 => 0,
-              13 => 0,
-              14 => 0,
-              15 => 0,
-              16 => 0,
-              17 => 0,
-              18 => 0,
-              19 => 0,
-              20 => 1,
-              22 => 1,
-              24 => 1,
-              26 => 0,
-              27 => 0,
-              28 => 0,
-              29 => 0,
-              30 => 0,
-              31 => 0,
-              32 => 0,
-              33 => 0,
-              34 => 0,
-              35 => 0,
-              36 => 0,
-              37 => 0,
-              38 => 0,
-              39 => 0,
-              40 => 0,
-              41 => 0,
-              42 => 0,
-              43 => 3,
-              47 => 0,
-              48 => 0,
-              49 => 0,
-              50 => 0,
-              51 => 0,
-              52 => 0,
-              53 => 0,
-              54 => 0,
-              55 => 1,
-              57 => 1,
-              59 => 0,
-              60 => 0,
-              61 => 0,
-              62 => 0,
-              63 => 0,
-              64 => 0,
-              65 => 0,
-              66 => 0,
-              67 => 0,
-              68 => 0,
-              69 => 0,
-              70 => 0,
-              71 => 0,
-              72 => 0,
-              73 => 0,
-              74 => 0,
-              75 => 0,
-              76 => 0,
-              77 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+
+        preg_match("~[*]{$this->rdel}~", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
+        } else {
+            $this->compiler->trigger_template_error("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        return false;
+    }
+
+    function yy_r1_3()
+    {
+
+        $obj = new Smarty_Internal_Compile_Private_Php();
+        $obj->parsePhp($this);
+    }
+
+    function yy_r1_7()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+            $this->yypushstate(self::LITERAL);
+        }
+    }
+
+    function yy_r1_8()
+    {
+
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->yypushstate(self::TAG);
+            return true;
+        }
+    }
+
+    function yy_r1_9()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+    function yy_r1_10()
+    {
+
+        $obj = new Smarty_Internal_Compile_Private_Php();
+        $obj->parsePhp($this);
+    }
+
+    function yy_r1_19()
+    {
+
+        $to = strlen($this->data);
+        preg_match("~($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*[\"']?\s*php\s*[\"']?\s*>)|([?][>])|([%][>])~i",
+                   $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+    public function yylex2()
+    {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 =
+                "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" .
+                $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel .
+                "\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+                "\\s*[\/](?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+                "\\s*[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" .
+                $this->ldel . "\\s*)/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(".$this->rdel.")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(\\$)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(@)|\G(#)|\G(\")|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(\\s+)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state SMARTY');
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state TAG');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r2_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -486,450 +458,130 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
-
     } // end function
 
+    const TAG = 2;
 
-    const SMARTY = 2;
-    function yy_r2_1($yy_subpatterns)
+    function yy_r2_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_2($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_3($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_5($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_6($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_7($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_8($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-  $this->yypopstate();
-    }
-    function yy_r2_9($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r2_10($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r2_11($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-     $this->yypopstate();
-    }
-    function yy_r2_12($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
-    function yy_r2_13($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
-    function yy_r2_14($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
-    function yy_r2_15($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
-    function yy_r2_16($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-    }
-    function yy_r2_17($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
-    }
-    function yy_r2_18($yy_subpatterns)
+    function yy_r2_3()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_19($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
-    }
-    function yy_r2_20($yy_subpatterns)
+    function yy_r2_4()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_22($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
-    }
-    function yy_r2_24($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
-    }
-    function yy_r2_26($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
-    }
-    function yy_r2_27($yy_subpatterns)
+    function yy_r2_5()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_28($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_MOD;
-    }
-    function yy_r2_29($yy_subpatterns)
+    function yy_r2_6()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_NOT;
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
     }
-    function yy_r2_30($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LAND;
-    }
-    function yy_r2_31($yy_subpatterns)
+    function yy_r2_8()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LOR;
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
     }
-    function yy_r2_32($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LXOR;
-    }
-    function yy_r2_33($yy_subpatterns)
+    function yy_r2_9()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
+        if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] == self::TEXT) {
+            $this->yypopstate();
+            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+        } else {
+            $this->value = $this->smarty->left_delimiter;
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
     }
-    function yy_r2_34($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
-    }
-    function yy_r2_35($yy_subpatterns)
+    function yy_r2_11()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISODD;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_36($yy_subpatterns)
-    {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
-    }
-    function yy_r2_37($yy_subpatterns)
+    function yy_r2_12()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r2_38($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
-    }
-    function yy_r2_39($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
-    }
-    function yy_r2_40($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
-    }
-    function yy_r2_41($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
-    }
-    function yy_r2_42($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
-    }
-    function yy_r2_43($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-    }
-    function yy_r2_47($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
-    function yy_r2_48($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-    }
-    function yy_r2_49($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
-    function yy_r2_50($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-    }
-    function yy_r2_51($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PTR;
-    }
-    function yy_r2_52($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_APTR;
-    }
-    function yy_r2_53($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
-    function yy_r2_54($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-    }
-    function yy_r2_55($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
-    function yy_r2_57($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_MATH;
-    }
-    function yy_r2_59($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-    }
-    function yy_r2_60($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-    }
-    function yy_r2_61($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
-    function yy_r2_62($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COLON;
-    }
-    function yy_r2_63($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
-    function yy_r2_64($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_HATCH;
-    }
-    function yy_r2_65($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-  $this->yypushstate(self::DOUBLEQUOTEDSTRING);
-    }
-    function yy_r2_66($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-  $this->yypopstate();
-    }
-    function yy_r2_67($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
-    function yy_r2_68($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_DOT;
-    }
-    function yy_r2_69($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
-    function yy_r2_70($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
-    }
-    function yy_r2_71($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_QMARK;
-    }
-    function yy_r2_72($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_HEX;
-    }
-    function yy_r2_73($yy_subpatterns)
-    {
-
-  // resolve conflicts with shorttag and right_delimiter starting with '='
-  if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
-     preg_match("/\s+/",$this->value,$match);
-     $this->value = $match[0];
-     $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_ATTR;
-  }
-    }
-    function yy_r2_74($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ID;
-    }
-    function yy_r2_75($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-    }
-    function yy_r2_76($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-    }
-    function yy_r2_77($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-
 
-    function yylex3()
+    public function yylex3()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+                "\\s*)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor|(is\\s+(not\\s+)?(odd|even|div)\\s+by))\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(([!]\\s*)|(not\\s+))|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|])|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state LITERAL');
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state TAGBODY');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r3_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -938,128 +590,336 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
-
     } // end function
 
+    const TAGBODY = 3;
 
-    const LITERAL = 3;
-    function yy_r3_1($yy_subpatterns)
+    function yy_r3_1()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-  $this->yypushstate(self::LITERAL);
-    }
-    function yy_r3_2($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-  $this->yypopstate();
-    }
-    function yy_r3_3($yy_subpatterns)
-    {
-
-  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-   } else {
-    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-    $this->value = substr($this->value, 0, 2);
-   }
-    }
-    function yy_r3_4($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-    function yy_r3_5($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r3_6($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-    function yy_r3_7($yy_subpatterns)
-    {
-
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-  if (isset($match[0][1])) {
-    $to = $match[0][1];
-  } else {
-    $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
     }
 
-
-    function yylex4()
+    function yy_r3_2()
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 1,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 0,
-              12 => 0,
-              13 => 3,
-              17 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->yypushstate(self::TAG);
+            return true;
+        }
+    }
+
+    function yy_r3_3()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+    }
+
+    function yy_r3_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+    }
+
+    function yy_r3_5()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->taglineno = $this->line;
+    }
+
+    function yy_r3_7()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+    }
+
+    function yy_r3_8()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+    }
+
+    function yy_r3_9()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+    }
+
+    function yy_r3_10()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
+    }
+
+    function yy_r3_11()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
+    }
+
+    function yy_r3_12()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+    }
+
+    function yy_r3_13()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+    }
+
+    function yy_r3_14()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+    }
+
+    function yy_r3_19()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+    }
+
+    function yy_r3_24()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+    }
+
+    function yy_r3_27()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+    }
+
+    function yy_r3_30()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+    }
+
+    function yy_r3_34()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+    }
+
+    function yy_r3_35()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+    }
+
+    function yy_r3_36()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+    }
+
+    function yy_r3_37()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+    }
+
+    function yy_r3_38()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+    }
+
+    function yy_r3_39()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+    }
+
+    function yy_r3_40()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+    }
+
+    function yy_r3_41()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+    }
+
+    function yy_r3_43()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+    }
+
+    function yy_r3_45()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+    }
+
+    function yy_r3_47()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
+    }
+
+    function yy_r3_48()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+    }
+
+    function yy_r3_49()
+    {
+
+        // resolve conflicts with shorttag and right_delimiter starting with '='
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) ==
+            $this->smarty->right_delimiter
+        ) {
+            preg_match("~\s+~", $this->value, $match);
+            $this->value = $match[ 0 ];
+            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+        }
+    }
+
+    function yy_r3_50()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+    }
+
+    function yy_r3_53()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+    }
+
+    function yy_r3_54()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+    }
+
+    function yy_r3_55()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
+    }
+
+    function yy_r3_56()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+    }
+
+    function yy_r3_57()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+    }
+
+    function yy_r3_58()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+    }
+
+    function yy_r3_59()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+    }
+
+    function yy_r3_60()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+    }
+
+    function yy_r3_61()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+    }
+
+    function yy_r3_62()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+    }
+
+    function yy_r3_63()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+    }
+
+    function yy_r3_64()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+    }
+
+    function yy_r3_65()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+    public function yylex4()
+    {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 =
+                "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" .
+                $this->rdel . ")|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}();
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -1068,136 +928,208 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
-
     } // end function
 
+    const LITERAL = 4;
 
-    const DOUBLEQUOTEDSTRING = 4;
-    function yy_r4_1($yy_subpatterns)
+    function yy_r4_1()
     {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->literal_cnt ++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
-    function yy_r4_2($yy_subpatterns)
+
+    function yy_r4_2()
     {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        if ($this->literal_cnt) {
+            $this->literal_cnt --;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->yypopstate();
+        }
     }
-    function yy_r4_4($yy_subpatterns)
+
+    function yy_r4_3()
     {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $to = strlen($this->data);
+        preg_match("~{$this->ldel}[/]?literal{$this->rdel}~i", $this->data, $match, PREG_OFFSET_CAPTURE,
+                   $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
+        } else {
+            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
-    function yy_r4_5($yy_subpatterns)
+
+    public function yylex5()
+    {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 =
+                "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" .
+                $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*)|\G(" .
+                $this->ldel .
+                "\\s*)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" .
+                $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+
+        do {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r5_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    } // end function
+
+    const DOUBLEQUOTEDSTRING = 5;
+
+    function yy_r5_1()
     {
 
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_6($yy_subpatterns)
+
+    function yy_r5_2()
     {
 
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_7($yy_subpatterns)
+
+    function yy_r5_3()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->yypushstate(self::TAG);
+            return true;
+        }
     }
-    function yy_r4_8($yy_subpatterns)
+
+    function yy_r5_4()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->yypushstate(self::TAG);
+            return true;
+        }
     }
-    function yy_r4_9($yy_subpatterns)
+
+    function yy_r5_5()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-  $this->yypopstate();
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->taglineno = $this->line;
+            $this->yypushstate(self::TAGBODY);
+        }
     }
-    function yy_r4_10($yy_subpatterns)
+
+    function yy_r5_6()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-  $this->value = substr($this->value,0,-1);
-  $this->yypushstate(self::SMARTY);
-  $this->taglineno = $this->line;
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypopstate();
     }
-    function yy_r4_11($yy_subpatterns)
+
+    function yy_r5_7()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->value = substr($this->value, 0, - 1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
-    function yy_r4_12($yy_subpatterns)
+
+    function yy_r5_8()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
-    function yy_r4_13($yy_subpatterns)
+
+    function yy_r5_9()
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
-    function yy_r4_17($yy_subpatterns)
+
+    function yy_r5_10()
     {
 
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+    function yy_r5_14()
+    {
+
+        $to = strlen($this->data);
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
 }
+
+     
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_templateparser.php b/sources/include/smarty/libs/sysplugins/smarty_internal_templateparser.php
index b0393c6..a745d1d 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_templateparser.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_templateparser.php
@@ -1,20 +1,12 @@
 <?php
-/**
-* Smarty Internal Plugin Templateparser
-*
-* This is the template parser.
-* It is generated from the internal.templateparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
 
 class TP_yyToken implements ArrayAccess
 {
     public $string = '';
+
     public $metadata = array();
 
-    function __construct($s, $m = array())
+    public function __construct($s, $m = array())
     {
         if ($s instanceof TP_yyToken) {
             $this->string = $s->string;
@@ -29,28 +21,28 @@ class TP_yyToken implements ArrayAccess
         }
     }
 
-    function __toString()
+    public function __toString()
     {
-        return $this->_string;
+        return $this->string;
     }
 
-    function offsetExists($offset)
+    public function offsetExists($offset)
     {
-        return isset($this->metadata[$offset]);
+        return isset($this->metadata[ $offset ]);
     }
 
-    function offsetGet($offset)
+    public function offsetGet($offset)
     {
-        return $this->metadata[$offset];
+        return $this->metadata[ $offset ];
     }
 
-    function offsetSet($offset, $value)
+    public function offsetSet($offset, $value)
     {
         if ($offset === null) {
-            if (isset($value[0])) {
-                $x = ($value instanceof TP_yyToken) ?
-                    $value->metadata : $value;
+            if (isset($value[ 0 ])) {
+                $x = ($value instanceof TP_yyToken) ? $value->metadata : $value;
                 $this->metadata = array_merge($this->metadata, $x);
+
                 return;
             }
             $offset = count($this->metadata);
@@ -60,16 +52,16 @@ class TP_yyToken implements ArrayAccess
         }
         if ($value instanceof TP_yyToken) {
             if ($value->metadata) {
-                $this->metadata[$offset] = $value->metadata;
+                $this->metadata[ $offset ] = $value->metadata;
             }
         } elseif ($value) {
-            $this->metadata[$offset] = $value;
+            $this->metadata[ $offset ] = $value;
         }
     }
 
-    function offsetUnset($offset)
+    public function offsetUnset($offset)
     {
-        unset($this->metadata[$offset]);
+        unset($this->metadata[ $offset ]);
     }
 }
 
@@ -80,1446 +72,1007 @@ class TP_yyStackEntry
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-};
+}
 
+;
 
-#line 12 "smarty_internal_templateparser.y"
-class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php"
+#line 11 "../smarty/lexer/smarty_internal_templateparser.y"
+
+/**
+ * Smarty Template Parser Class
+ *
+ * This is the template parser.
+ * It is generated from the smarty_internal_templateparser.y file
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Templateparser
 {
-#line 14 "smarty_internal_templateparser.y"
+    #line 23 "../smarty/lexer/smarty_internal_templateparser.y"
 
     const Err1 = "Security error: Call to private object member not allowed";
-    const Err2 = "Security error: Call to dynamic object member not allowed";
-    const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
-    // states whether the parse was successful or not
-    public $successful = true;
-    public $retvalue = 0;
-    private $lex;
-    private $internalError = false;
-    private $strip = false;
 
-    function __construct($lex, $compiler) {
+    const Err2 = "Security error: Call to dynamic object member not allowed";
+
+    const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+
+    /**
+     * counter for prefix code
+     *
+     * @var int
+     */
+    public static $prefix_number = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
+    public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
+    public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var Smarty_Internal_ParseTree
+     */
+    public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var Smarty_Internal_ParseTree
+     */
+    public $current_buffer;
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Templatelexer
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var Smarty_Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * security object
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Templatelexer        $lex
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
         $this->lex = $lex;
         $this->compiler = $compiler;
-        $this->smarty = $this->compiler->smarty;
         $this->template = $this->compiler->template;
-        $this->compiler->has_variable_string = false;
+        $this->smarty = $this->template->smarty;
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
+        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
+    }
+
+    /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
+    }
+
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Smarty_Internal_ParseTree_Tag
+     */
+    public function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
         $this->compiler->prefix_code = array();
-        $this->prefix_number = 0;
-        $this->block_nesting_level = 0;
-        if ($this->security = isset($this->smarty->security_policy)) {
-            $this->php_handling = $this->smarty->security_policy->php_handling;
-        } else {
-            $this->php_handling = $this->smarty->php_handling;
-        }
-        $this->is_xml = false;
-        $this->asp_tags = (ini_get('asp_tags') != '0');
-        $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
+        $tmp .= $code;
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
     }
 
-    public static function escape_start_tag($tag_text) {
-        $tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1 , $count); //Escape tag
-        return $tag;
-    }
+    const TP_VERT = 1;
 
-    public static function escape_end_tag($tag_text) {
-        return '?<?php ?>>';
-    }
+    const TP_COLON = 2;
 
-    public function compileVariable($variable) {
-        if (strpos($variable,'(') == 0) {
-            // not a variable variable
-            $var = trim($variable,'\'');
-            $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable($var, null, true, false)->nocache;
-            $this->template->properties['variables'][$var] = $this->compiler->tag_nocache|$this->compiler->nocache;
-        }
-//       return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)';
-        return '$_smarty_tpl->tpl_vars['. $variable .']->value';
-    }
-#line 132 "smarty_internal_templateparser.php"
+    const TP_PHP = 3;
 
-    const TP_VERT                           =  1;
-    const TP_COLON                          =  2;
-    const TP_COMMENT                        =  3;
-    const TP_PHPSTARTTAG                    =  4;
-    const TP_PHPENDTAG                      =  5;
-    const TP_ASPSTARTTAG                    =  6;
-    const TP_ASPENDTAG                      =  7;
-    const TP_FAKEPHPSTARTTAG                =  8;
-    const TP_XMLTAG                         =  9;
-    const TP_TEXT                           = 10;
-    const TP_STRIPON                        = 11;
-    const TP_STRIPOFF                       = 12;
-    const TP_LITERALSTART                   = 13;
-    const TP_LITERALEND                     = 14;
-    const TP_LITERAL                        = 15;
-    const TP_LDEL                           = 16;
-    const TP_RDEL                           = 17;
-    const TP_DOLLAR                         = 18;
-    const TP_ID                             = 19;
-    const TP_EQUAL                          = 20;
-    const TP_PTR                            = 21;
-    const TP_LDELIF                         = 22;
-    const TP_LDELFOR                        = 23;
-    const TP_SEMICOLON                      = 24;
-    const TP_INCDEC                         = 25;
-    const TP_TO                             = 26;
-    const TP_STEP                           = 27;
-    const TP_LDELFOREACH                    = 28;
-    const TP_SPACE                          = 29;
-    const TP_AS                             = 30;
-    const TP_APTR                           = 31;
-    const TP_LDELSETFILTER                  = 32;
-    const TP_SMARTYBLOCKCHILD               = 33;
-    const TP_LDELSLASH                      = 34;
-    const TP_ATTR                           = 35;
-    const TP_INTEGER                        = 36;
-    const TP_COMMA                          = 37;
-    const TP_OPENP                          = 38;
-    const TP_CLOSEP                         = 39;
-    const TP_MATH                           = 40;
-    const TP_UNIMATH                        = 41;
-    const TP_ANDSYM                         = 42;
-    const TP_ISIN                           = 43;
-    const TP_ISDIVBY                        = 44;
-    const TP_ISNOTDIVBY                     = 45;
-    const TP_ISEVEN                         = 46;
-    const TP_ISNOTEVEN                      = 47;
-    const TP_ISEVENBY                       = 48;
-    const TP_ISNOTEVENBY                    = 49;
-    const TP_ISODD                          = 50;
-    const TP_ISNOTODD                       = 51;
-    const TP_ISODDBY                        = 52;
-    const TP_ISNOTODDBY                     = 53;
-    const TP_INSTANCEOF                     = 54;
-    const TP_QMARK                          = 55;
-    const TP_NOT                            = 56;
-    const TP_TYPECAST                       = 57;
-    const TP_HEX                            = 58;
-    const TP_DOT                            = 59;
-    const TP_SINGLEQUOTESTRING              = 60;
-    const TP_DOUBLECOLON                    = 61;
-    const TP_AT                             = 62;
-    const TP_HATCH                          = 63;
-    const TP_OPENB                          = 64;
-    const TP_CLOSEB                         = 65;
-    const TP_EQUALS                         = 66;
-    const TP_NOTEQUALS                      = 67;
-    const TP_GREATERTHAN                    = 68;
-    const TP_LESSTHAN                       = 69;
-    const TP_GREATEREQUAL                   = 70;
-    const TP_LESSEQUAL                      = 71;
-    const TP_IDENTITY                       = 72;
-    const TP_NONEIDENTITY                   = 73;
-    const TP_MOD                            = 74;
-    const TP_LAND                           = 75;
-    const TP_LOR                            = 76;
-    const TP_LXOR                           = 77;
-    const TP_QUOTE                          = 78;
-    const TP_BACKTICK                       = 79;
-    const TP_DOLLARID                       = 80;
-    const YY_NO_ACTION = 597;
-    const YY_ACCEPT_ACTION = 596;
-    const YY_ERROR_ACTION = 595;
+    const TP_NOCACHE = 4;
+
+    const TP_TEXT = 5;
+
+    const TP_STRIPON = 6;
+
+    const TP_STRIPOFF = 7;
+
+    const TP_LITERALSTART = 8;
+
+    const TP_LITERALEND = 9;
+
+    const TP_LITERAL = 10;
+
+    const TP_RDEL = 11;
+
+    const TP_SIMPELOUTPUT = 12;
+
+    const TP_LDEL = 13;
+
+    const TP_DOLLARID = 14;
+
+    const TP_EQUAL = 15;
+
+    const TP_SIMPLETAG = 16;
+
+    const TP_ID = 17;
+
+    const TP_PTR = 18;
+
+    const TP_LDELIF = 19;
+
+    const TP_LDELFOR = 20;
+
+    const TP_SEMICOLON = 21;
+
+    const TP_INCDEC = 22;
+
+    const TP_TO = 23;
+
+    const TP_STEP = 24;
+
+    const TP_LDELFOREACH = 25;
+
+    const TP_SPACE = 26;
+
+    const TP_AS = 27;
+
+    const TP_APTR = 28;
+
+    const TP_LDELSETFILTER = 29;
+
+    const TP_SMARTYBLOCKCHILDPARENT = 30;
+
+    const TP_CLOSETAG = 31;
+
+    const TP_LDELSLASH = 32;
+
+    const TP_ATTR = 33;
+
+    const TP_INTEGER = 34;
+
+    const TP_COMMA = 35;
+
+    const TP_OPENP = 36;
+
+    const TP_CLOSEP = 37;
+
+    const TP_MATH = 38;
+
+    const TP_UNIMATH = 39;
+
+    const TP_ISIN = 40;
+
+    const TP_INSTANCEOF = 41;
+
+    const TP_QMARK = 42;
+
+    const TP_NOT = 43;
+
+    const TP_TYPECAST = 44;
+
+    const TP_HEX = 45;
+
+    const TP_DOT = 46;
+
+    const TP_SINGLEQUOTESTRING = 47;
+
+    const TP_DOUBLECOLON = 48;
+
+    const TP_NAMESPACE = 49;
+
+    const TP_AT = 50;
+
+    const TP_HATCH = 51;
+
+    const TP_OPENB = 52;
+
+    const TP_CLOSEB = 53;
+
+    const TP_DOLLAR = 54;
+
+    const TP_LOGOP = 55;
+
+    const TP_TLOGOP = 56;
+
+    const TP_SINGLECOND = 57;
+
+    const TP_QUOTE = 58;
+
+    const TP_BACKTICK = 59;
+
+    const YY_NO_ACTION = 527;
+
+    const YY_ACCEPT_ACTION = 526;
+
+    const YY_ERROR_ACTION = 525;
+
+    const YY_SZ_ACTTAB = 2021;
+
+    static public $yy_action = array(242, 10, 131, 178, 255, 76, 157, 5, 83, 293, 12, 149, 152, 116, 292, 93, 331, 217,
+                                     284, 295, 221, 331, 226, 36, 21, 169, 35, 43, 308, 99, 26, 42, 39, 294, 235, 244,
+                                     30, 200, 187, 80, 1, 251, 320, 206, 442, 123, 53, 242, 10, 130, 98, 255, 194, 399,
+                                     5, 83, 442, 240, 298, 107, 116, 310, 174, 220, 217, 36, 295, 221, 399, 208, 135,
+                                     21, 26, 161, 43, 399, 8, 174, 42, 39, 294, 235, 218, 331, 200, 187, 80, 1, 312,
+                                     320, 11, 290, 313, 53, 242, 10, 133, 306, 255, 205, 187, 5, 83, 264, 266, 267, 211,
+                                     116, 353, 220, 52, 217, 298, 295, 221, 206, 226, 220, 21, 290, 290, 43, 321, 36,
+                                     249, 42, 39, 294, 235, 244, 26, 200, 206, 80, 1, 11, 320, 283, 52, 52, 53, 242, 10,
+                                     132, 248, 255, 205, 455, 5, 83, 84, 301, 151, 455, 116, 323, 92, 36, 217, 2, 295,
+                                     221, 331, 226, 26, 21, 290, 304, 43, 137, 36, 111, 42, 39, 294, 235, 244, 26, 200,
+                                     187, 80, 1, 225, 320, 320, 52, 123, 53, 242, 10, 133, 98, 255, 193, 175, 5, 83,
+                                     177, 280, 273, 234, 116, 310, 23, 278, 217, 13, 295, 221, 320, 203, 223, 21, 290,
+                                     442, 43, 138, 187, 326, 42, 39, 294, 235, 244, 216, 200, 442, 80, 1, 4, 320, 329,
+                                     52, 15, 53, 242, 10, 134, 91, 255, 205, 176, 5, 83, 293, 12, 16, 90, 116, 292, 300,
+                                     99, 217, 241, 295, 221, 320, 226, 215, 28, 213, 201, 43, 105, 187, 286, 42, 39,
+                                     294, 235, 244, 215, 200, 214, 80, 1, 105, 320, 11, 135, 285, 53, 242, 10, 133, 8,
+                                     255, 205, 164, 5, 83, 442, 215, 19, 239, 116, 99, 105, 331, 217, 6, 295, 221, 442,
+                                     192, 311, 21, 182, 289, 43, 308, 443, 32, 42, 39, 294, 235, 244, 296, 200, 17, 80,
+                                     1, 443, 320, 262, 107, 26, 53, 242, 10, 133, 122, 255, 191, 172, 5, 83, 183, 188,
+                                     148, 231, 116, 223, 168, 331, 217, 181, 295, 221, 331, 226, 206, 21, 331, 141, 43,
+                                     308, 206, 38, 42, 39, 294, 235, 244, 331, 200, 188, 80, 1, 187, 320, 155, 206, 308,
+                                     53, 242, 10, 133, 25, 255, 198, 188, 5, 83, 206, 145, 160, 308, 116, 228, 146, 206,
+                                     217, 180, 295, 221, 331, 226, 286, 21, 331, 359, 43, 179, 289, 38, 42, 39, 294,
+                                     235, 244, 250, 200, 271, 80, 1, 272, 320, 122, 94, 103, 53, 242, 10, 129, 3, 255,
+                                     205, 144, 5, 83, 185, 289, 170, 99, 116, 270, 322, 331, 217, 184, 295, 221, 331,
+                                     226, 99, 7, 171, 35, 43, 308, 89, 105, 42, 39, 294, 235, 244, 120, 200, 328, 80, 1,
+                                     187, 320, 82, 223, 4, 53, 242, 10, 134, 142, 255, 205, 107, 5, 83, 309, 324, 302,
+                                     20, 116, 316, 206, 291, 217, 290, 295, 221, 33, 226, 277, 28, 399, 243, 43, 257,
+                                     219, 189, 42, 39, 294, 235, 244, 110, 200, 140, 80, 399, 147, 320, 253, 327, 258,
+                                     53, 399, 14, 236, 220, 207, 154, 113, 65, 108, 319, 159, 238, 311, 98, 471, 471,
+                                     330, 237, 279, 471, 210, 325, 245, 299, 310, 86, 308, 143, 268, 263, 259, 260, 269,
+                                     177, 204, 287, 136, 242, 10, 150, 87, 255, 320, 139, 5, 83, 293, 12, 22, 195, 116,
+                                     292, 247, 258, 217, 153, 295, 221, 220, 207, 36, 126, 50, 104, 109, 112, 88, 26,
+                                     98, 246, 397, 330, 237, 85, 212, 210, 325, 245, 258, 310, 102, 299, 299, 220, 207,
+                                     397, 113, 65, 108, 320, 299, 134, 397, 98, 222, 442, 330, 237, 299, 299, 210, 325,
+                                     245, 258, 310, 299, 299, 442, 220, 207, 299, 126, 69, 108, 299, 288, 31, 299, 98,
+                                     299, 299, 330, 237, 299, 299, 210, 325, 245, 80, 310, 299, 320, 299, 258, 299, 299,
+                                     209, 299, 220, 207, 299, 126, 69, 108, 206, 299, 299, 455, 98, 299, 206, 330, 237,
+                                     455, 365, 210, 325, 245, 299, 310, 355, 227, 258, 299, 299, 299, 199, 220, 207, 36,
+                                     126, 64, 104, 299, 214, 36, 26, 98, 299, 442, 330, 237, 26, 299, 210, 325, 245,
+                                     258, 310, 471, 471, 442, 220, 207, 471, 126, 69, 108, 293, 12, 299, 299, 98, 292,
+                                     299, 330, 237, 299, 299, 210, 325, 245, 36, 310, 163, 299, 258, 299, 299, 26, 202,
+                                     220, 207, 299, 126, 44, 108, 471, 299, 299, 299, 98, 299, 299, 330, 237, 299, 299,
+                                     210, 325, 245, 299, 310, 299, 299, 258, 134, 299, 299, 252, 220, 207, 206, 126, 72,
+                                     108, 299, 299, 299, 299, 98, 299, 396, 330, 237, 299, 299, 210, 325, 245, 258, 310,
+                                     299, 299, 299, 220, 207, 396, 126, 74, 108, 254, 299, 80, 396, 98, 320, 299, 330,
+                                     237, 299, 297, 210, 325, 245, 299, 310, 299, 242, 9, 299, 299, 255, 299, 258, 5,
+                                     83, 299, 299, 220, 207, 116, 126, 68, 108, 217, 299, 295, 221, 98, 299, 299, 330,
+                                     237, 299, 299, 210, 325, 245, 299, 310, 299, 258, 299, 299, 299, 299, 220, 207,
+                                     299, 100, 70, 108, 299, 303, 29, 299, 98, 299, 299, 330, 237, 299, 297, 210, 325,
+                                     245, 299, 310, 299, 242, 9, 299, 299, 255, 299, 299, 5, 83, 299, 299, 299, 299,
+                                     116, 299, 299, 258, 217, 299, 295, 221, 220, 207, 299, 126, 66, 108, 299, 299, 299,
+                                     299, 98, 293, 12, 330, 237, 299, 292, 210, 325, 245, 299, 310, 258, 299, 299, 305,
+                                     29, 220, 207, 299, 126, 60, 108, 299, 293, 12, 299, 98, 299, 292, 330, 237, 299,
+                                     299, 210, 325, 245, 299, 310, 232, 299, 258, 299, 206, 299, 299, 220, 207, 299,
+                                     126, 49, 108, 299, 299, 299, 299, 98, 299, 299, 330, 237, 299, 230, 210, 325, 245,
+                                     299, 310, 258, 167, 299, 299, 299, 220, 207, 299, 126, 58, 108, 299, 41, 40, 37,
+                                     98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 258, 299, 256, 275, 282,
+                                     220, 97, 299, 81, 45, 106, 299, 299, 299, 299, 98, 299, 299, 330, 237, 299, 299,
+                                     210, 325, 245, 299, 310, 299, 299, 258, 299, 206, 299, 299, 220, 207, 299, 126, 63,
+                                     108, 299, 186, 299, 299, 98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310,
+                                     258, 299, 299, 299, 299, 220, 197, 299, 114, 59, 108, 299, 41, 40, 37, 98, 299,
+                                     299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 258, 299, 256, 275, 282, 220,
+                                     207, 299, 126, 55, 108, 299, 299, 299, 299, 98, 299, 299, 330, 237, 299, 299, 210,
+                                     325, 245, 299, 310, 299, 299, 258, 299, 206, 299, 299, 220, 207, 299, 126, 57, 108,
+                                     299, 41, 40, 37, 98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 258,
+                                     299, 256, 275, 282, 220, 95, 299, 81, 48, 106, 233, 41, 40, 37, 98, 299, 299, 330,
+                                     237, 299, 299, 210, 325, 245, 299, 310, 258, 299, 256, 275, 282, 220, 207, 299,
+                                     126, 78, 108, 299, 299, 299, 299, 98, 299, 299, 330, 237, 299, 299, 210, 325, 245,
+                                     299, 310, 299, 299, 258, 299, 206, 18, 299, 220, 207, 299, 96, 61, 108, 299, 299,
+                                     299, 299, 98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 258, 299, 299,
+                                     299, 299, 220, 207, 299, 126, 47, 108, 299, 41, 40, 37, 98, 299, 299, 330, 237,
+                                     299, 299, 210, 325, 245, 299, 310, 258, 299, 256, 275, 282, 220, 207, 299, 126, 75,
+                                     108, 299, 299, 299, 299, 98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310,
+                                     299, 299, 258, 299, 206, 299, 299, 220, 207, 299, 126, 64, 108, 299, 299, 299, 299,
+                                     98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 258, 299, 299, 299, 299,
+                                     220, 207, 299, 126, 56, 108, 317, 41, 40, 37, 98, 299, 299, 330, 237, 299, 299,
+                                     210, 325, 245, 299, 310, 258, 299, 256, 275, 282, 220, 207, 299, 115, 46, 108, 299,
+                                     299, 299, 299, 98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 299, 299,
+                                     258, 299, 206, 299, 299, 220, 207, 299, 126, 79, 108, 299, 190, 299, 299, 98, 299,
+                                     299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 258, 299, 299, 299, 299, 220,
+                                     207, 299, 126, 62, 108, 299, 41, 40, 37, 98, 299, 299, 330, 237, 299, 299, 210,
+                                     325, 245, 299, 310, 258, 299, 256, 275, 282, 220, 207, 299, 126, 71, 108, 299, 299,
+                                     299, 299, 98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 299, 299, 258,
+                                     299, 206, 299, 299, 220, 207, 299, 101, 67, 108, 299, 318, 299, 299, 98, 299, 299,
+                                     330, 237, 299, 299, 210, 325, 245, 299, 310, 258, 299, 299, 299, 299, 220, 207,
+                                     299, 126, 77, 108, 299, 41, 40, 37, 98, 299, 299, 330, 237, 299, 299, 210, 325,
+                                     245, 299, 310, 258, 299, 256, 275, 282, 220, 196, 299, 126, 54, 108, 299, 299, 299,
+                                     299, 98, 299, 299, 330, 237, 299, 299, 210, 325, 245, 299, 310, 299, 299, 258, 299,
+                                     206, 299, 299, 220, 207, 299, 126, 73, 108, 299, 274, 299, 299, 98, 299, 299, 330,
+                                     237, 299, 299, 210, 325, 245, 299, 310, 258, 299, 299, 299, 299, 220, 224, 299,
+                                     118, 299, 108, 299, 41, 40, 37, 98, 299, 299, 299, 261, 299, 299, 210, 325, 245,
+                                     299, 310, 258, 299, 256, 275, 282, 220, 224, 299, 128, 299, 108, 299, 299, 299,
+                                     299, 98, 299, 299, 229, 315, 206, 299, 210, 325, 245, 299, 310, 299, 471, 471, 307,
+                                     27, 299, 471, 455, 526, 51, 265, 266, 267, 211, 299, 299, 220, 299, 36, 299, 409,
+                                     409, 299, 299, 299, 26, 299, 299, 299, 299, 41, 40, 37, 206, 299, 455, 299, 455,
+                                     299, 471, 299, 455, 299, 299, 299, 299, 299, 256, 275, 282, 229, 299, 299, 117,
+                                     299, 442, 299, 409, 409, 409, 471, 471, 299, 299, 299, 471, 455, 442, 299, 299, 41,
+                                     40, 37, 299, 409, 409, 409, 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, 256,
+                                     275, 282, 299, 299, 299, 299, 455, 299, 455, 258, 471, 299, 455, 281, 220, 224,
+                                     299, 127, 299, 108, 299, 299, 299, 299, 98, 299, 299, 299, 299, 299, 299, 210, 325,
+                                     245, 258, 310, 206, 156, 299, 220, 224, 175, 121, 299, 108, 299, 299, 331, 299, 98,
+                                     23, 278, 299, 299, 299, 299, 210, 325, 245, 34, 310, 36, 299, 299, 187, 299, 299,
+                                     299, 26, 299, 299, 258, 299, 41, 40, 37, 220, 224, 299, 125, 299, 108, 299, 299,
+                                     299, 299, 98, 299, 299, 229, 256, 275, 282, 210, 325, 245, 299, 310, 299, 471, 471,
+                                     258, 31, 299, 471, 455, 220, 224, 299, 124, 299, 108, 299, 299, 299, 299, 98, 299,
+                                     299, 299, 299, 299, 299, 210, 325, 245, 258, 310, 206, 299, 299, 220, 224, 455,
+                                     119, 455, 108, 471, 299, 455, 299, 98, 299, 299, 229, 299, 299, 24, 210, 325, 245,
+                                     299, 310, 299, 471, 471, 299, 471, 471, 471, 455, 299, 471, 455, 206, 41, 40, 37,
+                                     299, 299, 299, 471, 471, 299, 299, 299, 471, 455, 299, 299, 276, 299, 256, 275,
+                                     282, 299, 299, 299, 455, 36, 455, 455, 471, 455, 455, 471, 26, 455, 299, 206, 403,
+                                     41, 40, 37, 206, 455, 299, 455, 299, 471, 403, 455, 403, 299, 299, 403, 299, 299,
+                                     256, 275, 282, 299, 403, 299, 403, 299, 403, 299, 299, 299, 299, 299, 299, 299,
+                                     299, 223, 41, 40, 37, 299, 299, 41, 40, 37, 299, 299, 299, 299, 299, 299, 299, 299,
+                                     173, 256, 275, 282, 175, 314, 256, 275, 282, 299, 331, 166, 299, 23, 278, 175, 162,
+                                     299, 299, 299, 175, 331, 299, 299, 23, 278, 331, 187, 299, 23, 278, 158, 299, 299,
+                                     299, 175, 299, 299, 187, 299, 299, 331, 165, 187, 23, 278, 175, 299, 299, 299, 299,
+                                     299, 331, 299, 299, 23, 278, 299, 187, 299, 299, 299, 299, 299, 299, 299, 299, 299,
+                                     299, 187,);
+
+    static public $yy_lookahead = array(12, 13, 14, 80, 16, 17, 71, 19, 20, 12, 13, 71, 91, 25, 17, 75, 81, 29, 30, 31,
+                                        32, 81, 34, 26, 36, 28, 15, 39, 93, 18, 33, 43, 44, 45, 46, 47, 28, 49, 98, 51,
+                                        52, 70, 54, 1, 36, 74, 58, 12, 13, 14, 79, 16, 17, 11, 19, 20, 48, 86, 64, 48,
+                                        25, 90, 75, 69, 29, 26, 31, 32, 26, 34, 46, 36, 33, 71, 39, 33, 52, 75, 43, 44,
+                                        45, 46, 47, 81, 49, 98, 51, 52, 53, 54, 35, 22, 37, 58, 12, 13, 14, 103, 16, 17,
+                                        98, 19, 20, 63, 64, 65, 66, 25, 11, 69, 41, 29, 64, 31, 32, 1, 34, 69, 36, 22,
+                                        22, 39, 53, 26, 95, 43, 44, 45, 46, 47, 33, 49, 1, 51, 52, 35, 54, 37, 41, 41,
+                                        58, 12, 13, 14, 14, 16, 17, 46, 19, 20, 102, 103, 71, 52, 25, 11, 75, 26, 29,
+                                        36, 31, 32, 81, 34, 33, 36, 22, 17, 39, 14, 26, 48, 43, 44, 45, 46, 47, 33, 49,
+                                        98, 51, 52, 70, 54, 54, 41, 74, 58, 12, 13, 14, 79, 16, 17, 75, 19, 20, 8, 9,
+                                        10, 50, 25, 90, 84, 85, 29, 13, 31, 32, 54, 34, 46, 36, 22, 36, 39, 14, 98, 53,
+                                        43, 44, 45, 46, 47, 46, 49, 48, 51, 52, 36, 54, 53, 41, 21, 58, 12, 13, 14, 36,
+                                        16, 17, 75, 19, 20, 12, 13, 15, 35, 25, 17, 59, 18, 29, 22, 31, 32, 54, 34, 74,
+                                        36, 76, 77, 39, 79, 98, 99, 43, 44, 45, 46, 47, 74, 49, 76, 51, 52, 79, 54, 35,
+                                        46, 37, 58, 12, 13, 14, 52, 16, 17, 71, 19, 20, 36, 74, 15, 76, 25, 18, 79, 81,
+                                        29, 35, 31, 32, 48, 34, 92, 36, 94, 95, 39, 93, 36, 15, 43, 44, 45, 46, 47, 53,
+                                        49, 26, 51, 52, 48, 54, 89, 48, 33, 58, 12, 13, 14, 96, 16, 17, 71, 19, 20, 14,
+                                        98, 71, 17, 25, 46, 71, 81, 29, 75, 31, 32, 81, 34, 1, 36, 81, 71, 39, 93, 1, 2,
+                                        43, 44, 45, 46, 47, 81, 49, 98, 51, 52, 98, 54, 91, 1, 93, 58, 12, 13, 14, 28,
+                                        16, 17, 98, 19, 20, 1, 91, 71, 93, 25, 18, 71, 1, 29, 80, 31, 32, 81, 34, 99,
+                                        36, 81, 11, 39, 94, 95, 2, 43, 44, 45, 46, 47, 89, 49, 65, 51, 52, 68, 54, 96,
+                                        80, 79, 58, 12, 13, 14, 36, 16, 17, 71, 19, 20, 94, 95, 71, 18, 25, 53, 96, 81,
+                                        29, 75, 31, 32, 81, 34, 18, 36, 74, 15, 39, 93, 91, 79, 43, 44, 45, 46, 47, 17,
+                                        49, 17, 51, 52, 98, 54, 17, 46, 36, 58, 12, 13, 14, 51, 16, 17, 48, 19, 20, 17,
+                                        34, 17, 42, 25, 17, 1, 34, 29, 22, 31, 32, 23, 34, 37, 36, 11, 17, 39, 5, 17,
+                                        17, 43, 44, 45, 46, 47, 17, 49, 51, 51, 26, 27, 54, 11, 53, 64, 58, 33, 13, 14,
+                                        69, 70, 17, 72, 73, 74, 53, 91, 81, 92, 79, 12, 13, 82, 83, 9, 17, 86, 87, 88,
+                                        104, 90, 79, 93, 91, 3, 4, 5, 6, 7, 8, 100, 101, 79, 12, 13, 91, 79, 16, 54, 91,
+                                        19, 20, 12, 13, 13, 14, 25, 17, 17, 64, 29, 91, 31, 32, 69, 70, 26, 72, 73, 74,
+                                        78, 76, 79, 33, 79, 34, 11, 82, 83, 79, 15, 86, 87, 88, 64, 90, 67, 104, 104,
+                                        69, 70, 26, 72, 73, 74, 54, 104, 14, 33, 79, 17, 36, 82, 83, 104, 104, 86, 87,
+                                        88, 64, 90, 104, 104, 48, 69, 70, 104, 72, 73, 74, 104, 101, 15, 104, 79, 104,
+                                        104, 82, 83, 104, 104, 86, 87, 88, 51, 90, 104, 54, 104, 64, 104, 104, 97, 104,
+                                        69, 70, 104, 72, 73, 74, 1, 104, 104, 46, 79, 104, 1, 82, 83, 52, 11, 86, 87,
+                                        88, 104, 90, 11, 18, 64, 104, 104, 104, 97, 69, 70, 26, 72, 73, 74, 104, 76, 26,
+                                        33, 79, 104, 36, 82, 83, 33, 104, 86, 87, 88, 64, 90, 12, 13, 48, 69, 70, 17,
+                                        72, 73, 74, 12, 13, 104, 104, 79, 17, 104, 82, 83, 104, 104, 86, 87, 88, 26, 90,
+                                        28, 104, 64, 104, 104, 33, 97, 69, 70, 104, 72, 73, 74, 50, 104, 104, 104, 79,
+                                        104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 14, 104, 104, 17,
+                                        69, 70, 1, 72, 73, 74, 104, 104, 104, 104, 79, 104, 11, 82, 83, 104, 104, 86,
+                                        87, 88, 64, 90, 104, 104, 104, 69, 70, 26, 72, 73, 74, 49, 104, 51, 33, 79, 54,
+                                        104, 82, 83, 104, 5, 86, 87, 88, 104, 90, 104, 12, 13, 14, 104, 16, 104, 64, 19,
+                                        20, 104, 104, 69, 70, 25, 72, 73, 74, 29, 104, 31, 32, 79, 104, 104, 82, 83,
+                                        104, 104, 86, 87, 88, 104, 90, 104, 64, 104, 104, 104, 104, 69, 70, 104, 72, 73,
+                                        74, 104, 58, 59, 104, 79, 104, 104, 82, 83, 104, 5, 86, 87, 88, 104, 90, 104,
+                                        12, 13, 14, 104, 16, 104, 104, 19, 20, 104, 104, 104, 104, 25, 104, 104, 64, 29,
+                                        104, 31, 32, 69, 70, 104, 72, 73, 74, 104, 104, 104, 104, 79, 12, 13, 82, 83,
+                                        104, 17, 86, 87, 88, 104, 90, 64, 104, 104, 58, 59, 69, 70, 104, 72, 73, 74,
+                                        104, 12, 13, 104, 79, 104, 17, 82, 83, 104, 104, 86, 87, 88, 104, 90, 50, 104,
+                                        64, 104, 1, 104, 104, 69, 70, 104, 72, 73, 74, 104, 104, 104, 104, 79, 104, 104,
+                                        82, 83, 104, 50, 86, 87, 88, 104, 90, 64, 27, 104, 104, 104, 69, 70, 104, 72,
+                                        73, 74, 104, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90,
+                                        64, 104, 55, 56, 57, 69, 70, 104, 72, 73, 74, 104, 104, 104, 104, 79, 104, 104,
+                                        82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 1, 104, 104, 69, 70,
+                                        104, 72, 73, 74, 104, 11, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88,
+                                        104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 72, 73, 74, 104, 38, 39, 40, 79,
+                                        104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57, 69, 70,
+                                        104, 72, 73, 74, 104, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88,
+                                        104, 90, 104, 104, 64, 104, 1, 104, 104, 69, 70, 104, 72, 73, 74, 104, 38, 39,
+                                        40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57,
+                                        69, 70, 104, 72, 73, 74, 37, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87,
+                                        88, 104, 90, 64, 104, 55, 56, 57, 69, 70, 104, 72, 73, 74, 104, 104, 104, 104,
+                                        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 1, 2,
+                                        104, 69, 70, 104, 72, 73, 74, 104, 104, 104, 104, 79, 104, 104, 82, 83, 104,
+                                        104, 86, 87, 88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 72, 73, 74, 104,
+                                        38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55,
+                                        56, 57, 69, 70, 104, 72, 73, 74, 104, 104, 104, 104, 79, 104, 104, 82, 83, 104,
+                                        104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 1, 104, 104, 69, 70, 104, 72, 73,
+                                        74, 104, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64,
+                                        104, 104, 104, 104, 69, 70, 104, 72, 73, 74, 37, 38, 39, 40, 79, 104, 104, 82,
+                                        83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57, 69, 70, 104, 72, 73, 74,
+                                        104, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104,
+                                        104, 64, 104, 1, 104, 104, 69, 70, 104, 72, 73, 74, 104, 11, 104, 104, 79, 104,
+                                        104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104,
+                                        72, 73, 74, 104, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104,
+                                        90, 64, 104, 55, 56, 57, 69, 70, 104, 72, 73, 74, 104, 104, 104, 104, 79, 104,
+                                        104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 1, 104, 104, 69,
+                                        70, 104, 72, 73, 74, 104, 11, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87,
+                                        88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 72, 73, 74, 104, 38, 39, 40,
+                                        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57, 69,
+                                        70, 104, 72, 73, 74, 104, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87,
+                                        88, 104, 90, 104, 104, 64, 104, 1, 104, 104, 69, 70, 104, 72, 73, 74, 104, 11,
+                                        104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 104,
+                                        104, 104, 69, 70, 104, 72, 104, 74, 104, 38, 39, 40, 79, 104, 104, 104, 83, 104,
+                                        104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57, 69, 70, 104, 72, 104, 74, 104,
+                                        104, 104, 104, 79, 104, 104, 2, 83, 1, 104, 86, 87, 88, 104, 90, 104, 12, 13,
+                                        11, 15, 104, 17, 18, 61, 62, 63, 64, 65, 66, 104, 104, 69, 104, 26, 104, 1, 2,
+                                        104, 104, 104, 33, 104, 104, 104, 104, 38, 39, 40, 1, 104, 46, 104, 48, 104, 50,
+                                        104, 52, 104, 104, 104, 104, 104, 55, 56, 57, 2, 104, 104, 21, 104, 36, 104, 38,
+                                        39, 40, 12, 13, 104, 104, 104, 17, 18, 48, 104, 104, 38, 39, 40, 104, 55, 56,
+                                        57, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 55, 56, 57, 104, 104, 104,
+                                        104, 46, 104, 48, 64, 50, 104, 52, 53, 69, 70, 104, 72, 104, 74, 104, 104, 104,
+                                        104, 79, 104, 104, 104, 104, 104, 104, 86, 87, 88, 64, 90, 1, 71, 104, 69, 70,
+                                        75, 72, 104, 74, 104, 104, 81, 104, 79, 84, 85, 104, 104, 104, 104, 86, 87, 88,
+                                        24, 90, 26, 104, 104, 98, 104, 104, 104, 33, 104, 104, 64, 104, 38, 39, 40, 69,
+                                        70, 104, 72, 104, 74, 104, 104, 104, 104, 79, 104, 104, 2, 55, 56, 57, 86, 87,
+                                        88, 104, 90, 104, 12, 13, 64, 15, 104, 17, 18, 69, 70, 104, 72, 104, 74, 104,
+                                        104, 104, 104, 79, 104, 104, 104, 104, 104, 104, 86, 87, 88, 64, 90, 1, 104,
+                                        104, 69, 70, 46, 72, 48, 74, 50, 104, 52, 104, 79, 104, 104, 2, 104, 104, 2, 86,
+                                        87, 88, 104, 90, 104, 12, 13, 104, 12, 13, 17, 18, 104, 17, 18, 1, 38, 39, 40,
+                                        104, 104, 104, 12, 13, 104, 104, 104, 17, 18, 104, 104, 53, 104, 55, 56, 57,
+                                        104, 104, 104, 46, 26, 48, 46, 50, 48, 52, 50, 33, 52, 104, 1, 11, 38, 39, 40,
+                                        1, 46, 104, 48, 104, 50, 21, 52, 23, 104, 104, 26, 104, 104, 55, 56, 57, 104,
+                                        33, 104, 35, 104, 37, 104, 104, 104, 104, 104, 104, 104, 104, 46, 38, 39, 40,
+                                        104, 104, 38, 39, 40, 104, 104, 104, 104, 104, 104, 104, 104, 71, 55, 56, 57,
+                                        75, 59, 55, 56, 57, 104, 81, 71, 104, 84, 85, 75, 71, 104, 104, 104, 75, 81,
+                                        104, 104, 84, 85, 81, 98, 104, 84, 85, 71, 104, 104, 104, 75, 104, 104, 98, 104,
+                                        104, 81, 71, 98, 84, 85, 75, 104, 104, 104, 104, 104, 81, 104, 104, 84, 85, 104,
+                                        98, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 98,);
+
+    const YY_SHIFT_USE_DFLT = - 13;
+
+    const YY_SHIFT_MAX = 236;
+
+    static public $yy_shift_ofst = array(542, 364, 82, 82, 82, 411, 364, 411, 35, - 12, - 12, 82, 82, 82, 82, 82, 82,
+                                         176, 82, 82, 129, 82, 82, 82, 317, 82, 82, 82, 82, 82, 82, 270, 82, 82, 82, 82,
+                                         176, 223, 223, 458, 458, 458, 458, 458, 1734, 1603, 1862, 1862, 1862, 1862,
+                                         1862, 542, 749, 803, 1897, 1448, 1531, 1199, 1643, 1826, 1365, 950, 1282, 1033,
+                                         1116, 1902, 1902, 1902, 1902, 1902, 1902, 1902, 1902, 1902, 1902, 1902, 660,
+                                         1902, 1089, 1089, 594, 666, 131, 202, 865, - 3, 703, 551, 551, 233, 202, 202,
+                                         131, 131, 357, 97, 484, 144, 920, 505, 42, 768, 189, 232, 11, 232, 278, 324,
+                                         428, 39, 372, 324, 39, 351, 384, 391, 294, 155, 114, 114, 114, 114, 417, 417,
+                                         114, 114, 114, 114, - 13, 1786, 1659, 1600, 1844, 1841, 1858, 552, 897, 519,
+                                         618, 24, 101, 39, 101, 24, 39, 24, 39, 130, 39, 39, 24, 39, 24, 24, 193, 24,
+                                         39, 39, 39, 24, 39, 39, 39, 130, 39, 39, 39, 130, 39, 130, 39, 231, 39, 39,
+                                         114, 114, 114, 526, 404, 417, 404, 114, 417, 390, 114, 417, - 13, - 13, - 13,
+                                         - 13, - 13, 1630, 1888, 576, 178, 694, 191, 69, 8, 100, 275, 212, 243, 297,
+                                         265, 255, 150, 98, 165, 55, 123, 493, 479, 468, 456, 434, 482, 483, 473, 461,
+                                         502, 489, 457, 452, 466, 422, 421, 449, 442, 444, 462, 432, 467, 440, 464, 446,
+                                         390,);
+
+    const YY_REDUCE_USE_DFLT = - 80;
+
+    const YY_REDUCE_MAX = 190;
+
+    static public $yy_reduce_ofst = array(1558, 451, 556, 640, 586, 506, 531, 615, 995, 939, 1078, 723, 1244, 968, 856,
+                                          912, 1354, 1134, 1105, 1161, 1051, 1217, 1022, 1188, 1300, 1466, 1383, 1271,
+                                          1327, 1437, 1410, 757, 698, 669, 885, 829, 785, 1493, 1520, 1761, 1706, 1669,
+                                          1644, 1736, 1880, 1665, 1896, 1911, 1665, 1891, 1922, 40, - 29, 48, 119, 119,
+                                          119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
+                                          119, 119, 119, 119, 119, 81, 119, 119, 119, 112, 2, - 60, 184, - 6, 264, 358,
+                                          - 65, 217, 213, 218, 197, 284, 269, 166, 363, - 13, 363, 295, 342, - 13, - 13,
+                                          349, 281, 310, 295, 310, 323, 310, 316, 272, 236, 273, - 13, - 13, - 13, 320,
+                                          374, - 13, - 13, 366, - 13, 338, 310, - 13, - 13, - 13, - 13, - 13, 465, 465,
+                                          465, 465, 465, 465, 474, 450, 465, 465, 437, 469, 447, 453, 437, 447, 437,
+                                          447, 463, 447, 447, 437, 447, 437, 437, 481, 437, 447, 447, 447, 437, 447,
+                                          447, 447, 478, 447, 447, 447, 511, 447, 504, 447, 503, 447, 447, 241, 241,
+                                          241, 530, 300, 29, 300, 241, 29, 361, 241, 29, - 79, - 77, 314, 340, 436,);
+
+    static public $yyExpectedTokens = array(array(3, 4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 25, 29, 31, 32,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 53, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 30, 31, 32, 34, 36, 39, 43, 44,
+                                                  45, 46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 30, 31, 32, 34, 36, 39, 43, 44,
+                                                  45, 46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(1, 24, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(3, 4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 25, 29, 31, 32,),
+                                            array(14, 17, 49, 51, 54,),
+                                            array(5, 12, 13, 14, 16, 19, 20, 25, 29, 31, 32, 58, 59,),
+                                            array(1, 38, 39, 40, 55, 56, 57, 59,),
+                                            array(1, 11, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 38, 39, 40, 55, 56, 57,), array(1, 2, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 21, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 53, 55, 56, 57,),
+                                            array(1, 11, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 27, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 37, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 37, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 18, 26, 33, 36, 48,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(38, 39, 40, 55, 56, 57,), array(38, 39, 40, 55, 56, 57,),
+                                            array(14, 17, 51, 54,), array(1, 11, 26, 33,), array(1, 26, 33,),
+                                            array(14, 36, 54,),
+                                            array(5, 12, 13, 14, 16, 19, 20, 25, 29, 31, 32, 58, 59,),
+                                            array(12, 13, 17, 26, 28, 33,), array(12, 13, 17, 26, 28, 33,),
+                                            array(12, 13, 17, 26, 33,), array(12, 13, 17, 26, 33,), array(18, 46, 52,),
+                                            array(14, 36, 54,), array(14, 36, 54,), array(1, 26, 33,),
+                                            array(1, 26, 33,), array(1, 2,), array(11, 22, 26, 33, 41,),
+                                            array(1, 11, 26, 27, 33,), array(11, 22, 26, 33, 41,),
+                                            array(12, 13, 17, 50,), array(13, 14, 17, 54,), array(1, 11, 26, 33,),
+                                            array(1, 11, 26, 33,), array(8, 9, 10,), array(12, 13, 17,),
+                                            array(15, 18, 48,), array(12, 13, 17,), array(15, 18, 48,), array(14, 17,),
+                                            array(18, 48,), array(26, 33,), array(1, 18,), array(14, 17,),
+                                            array(26, 33,), array(1, 28,), array(1, 53,), array(1, 11,), array(26, 33,),
+                                            array(14, 54,), array(1,), array(1,), array(1,), array(1,), array(18,),
+                                            array(18,), array(1,), array(1,), array(1,), array(1,), array(),
+                                            array(2, 12, 13, 15, 17, 18, 46, 48, 50, 52,),
+                                            array(2, 12, 13, 17, 18, 46, 48, 50, 52, 53,),
+                                            array(2, 12, 13, 15, 17, 18, 46, 48, 50, 52,),
+                                            array(2, 12, 13, 17, 18, 46, 48, 50, 52,),
+                                            array(2, 12, 13, 17, 18, 46, 48, 50, 52,),
+                                            array(12, 13, 17, 18, 46, 48, 50, 52,), array(13, 14, 17, 34, 54,),
+                                            array(12, 13, 17, 50,), array(12, 13, 17,), array(15, 46, 52,),
+                                            array(46, 52,), array(46, 52,), array(26, 33,), array(46, 52,),
+                                            array(46, 52,), array(26, 33,), array(46, 52,), array(26, 33,),
+                                            array(14, 54,), array(26, 33,), array(26, 33,), array(46, 52,),
+                                            array(26, 33,), array(46, 52,), array(46, 52,), array(13, 36,),
+                                            array(46, 52,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(46, 52,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(14, 54,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(14, 54,), array(26, 33,), array(14, 54,), array(26, 33,),
+                                            array(15, 22,), array(26, 33,), array(26, 33,), array(1,), array(1,),
+                                            array(1,), array(9,), array(2,), array(18,), array(2,), array(1,),
+                                            array(18,), array(36,), array(1,), array(18,), array(), array(), array(),
+                                            array(), array(), array(1, 2, 36, 38, 39, 40, 48, 55, 56, 57,),
+                                            array(11, 21, 23, 26, 33, 35, 37, 46,), array(11, 15, 26, 33, 36, 48,),
+                                            array(36, 46, 48, 53,), array(12, 13, 17, 50,), array(22, 41, 59,),
+                                            array(22, 41, 53,), array(28, 36, 48,), array(35, 37,), array(36, 48,),
+                                            array(21, 35,), array(35, 37,), array(15, 46,), array(35, 53,),
+                                            array(36, 48,), array(17, 50,), array(22, 41,), array(46, 53,),
+                                            array(35, 37,), array(36, 48,), array(5,), array(17,), array(23,),
+                                            array(37,), array(15,), array(17,), array(17,), array(53,), array(53,),
+                                            array(11,), array(17,), array(51,), array(34,), array(22,), array(51,),
+                                            array(46,), array(17,), array(17,), array(17,), array(17,), array(36,),
+                                            array(17,), array(42,), array(17,), array(34,), array(36,), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(),);
+
+    static public $yy_default = array(335, 510, 490, 490, 490, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525,
+                                      525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525,
+                                      525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 393, 525, 360, 393,
+                                      357, 393, 369, 332, 525, 525, 525, 525, 525, 525, 525, 525, 525, 398, 525, 525,
+                                      525, 513, 405, 395, 404, 489, 398, 374, 400, 511, 488, 414, 432, 512, 421, 420,
+                                      525, 407, 393, 525, 525, 393, 393, 393, 393, 502, 525, 525, 393, 393, 383, 422,
+                                      407, 422, 455, 525, 407, 407, 525, 455, 445, 455, 445, 525, 445, 393, 387, 525,
+                                      371, 407, 407, 407, 393, 525, 417, 425, 389, 410, 499, 445, 423, 411, 407, 424,
+                                      497, 444, 444, 444, 444, 444, 444, 525, 457, 455, 471, 449, 448, 366, 450, 451,
+                                      379, 453, 378, 525, 368, 367, 452, 364, 483, 480, 455, 481, 358, 380, 362, 482,
+                                      373, 356, 361, 525, 382, 370, 377, 525, 372, 525, 354, 525, 381, 376, 439, 413,
+                                      384, 348, 492, 477, 491, 388, 503, 455, 390, 500, 455, 496, 496, 496, 455, 432,
+                                      428, 432, 432, 456, 422, 422, 432, 525, 440, 525, 525, 428, 525, 432, 525, 422,
+                                      428, 525, 525, 340, 525, 401, 525, 525, 525, 525, 435, 525, 525, 525, 525, 430,
+                                      422, 525, 428, 525, 525, 525, 525, 501, 525, 434, 525, 525, 471, 412, 391, 402,
+                                      418, 375, 352, 394, 435, 436, 460, 459, 471, 479, 437, 419, 442, 351, 443, 363,
+                                      504, 342, 438, 341, 343, 416, 441, 339, 334, 333, 336, 337, 338, 344, 468, 349,
+                                      347, 350, 476, 505, 469, 406, 415, 345, 346, 466, 506, 486, 385, 487, 495, 508,
+                                      509, 478, 426, 429, 474, 475, 427, 386, 507, 524, 523, 520, 518, 517, 493, 514,
+                                      494, 515, 516, 522, 473, 446, 447, 454, 470, 485, 519, 498, 458, 434, 461, 464,
+                                      472, 467, 484, 521, 431, 433, 465, 463, 409, 462, 408, 392,);
+
+    const YYNOCODE = 105;
+
+    const YYSTACKDEPTH = 500;
+
+    const YYNSTATE = 332;
+
+    const YYNRULE = 193;
+
+    const YYERRORSYMBOL = 60;
 
-    const YY_SZ_ACTTAB = 2383;
-static public $yy_action = array(
- /*     0 */   225,  275,  263,  276,  259,  257,  260,  390,  356,  359,
- /*    10 */   353,  193,   18,  127,   42,  317,  381,  351,  196,  350,
- /*    20 */     6,  108,   24,   98,  128,  190,  134,  318,   41,   41,
- /*    30 */   249,  329,  231,   18,   43,   43,  317,   26,  298,   50,
- /*    40 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*    50 */   341,   40,   20,  387,  308,  307,  309,  374,  254,  248,
- /*    60 */   252,  217,  193,  385,  291,  375,  376,  377,  373,  372,
- /*    70 */   368,  367,  369,  370,  371,  378,  379,  225,  312,  255,
- /*    80 */   225,  225,  118,    2,  207,   76,  135,  596,   95,  281,
- /*    90 */   271,  264,    2,  366,  315,  386,  461,  383,  232,  294,
- /*   100 */   303,  388,  313,  389,  227,   41,  144,  225,  461,  245,
- /*   110 */   282,   43,  218,  358,  461,  144,   50,   47,   48,   44,
- /*   120 */    10,   13,  305,  306,   12,   11,  340,  341,   40,   20,
- /*   130 */   105,  177,  522,   46,   46,   41,   19,  522,  143,  297,
- /*   140 */   325,   43,  375,  376,  377,  373,  372,  368,  367,  369,
- /*   150 */   370,  371,  378,  379,  225,  312,  293,  206,  225,  141,
- /*   160 */   124,  225,   54,  119,  123,  225,  459,   38,  173,  246,
- /*   170 */   319,  315,  386,  347,  455,  232,  294,  303,  459,  313,
- /*   180 */   139,  321,   41,   31,  459,   41,   41,    2,   43,  188,
- /*   190 */     2,   43,   43,   50,   47,   48,   44,   10,   13,  305,
- /*   200 */   306,   12,   11,  340,  341,   40,   20,  225,  136,  301,
- /*   210 */   144,  194,  350,  144,   46,  202,  206,  328,  198,  375,
- /*   220 */   376,  377,  373,  372,  368,  367,  369,  370,  371,  378,
- /*   230 */   379,   21,    9,   28,  185,   41,  318,  225,  265,  271,
- /*   240 */   264,   43,  206,   27,  173,  206,   50,   47,   48,   44,
- /*   250 */    10,   13,  305,  306,   12,   11,  340,  341,   40,   20,
- /*   260 */   225,  178,   18,  212,  330,  317,   17,   32,    8,   14,
- /*   270 */   325,  267,  375,  376,  377,  373,  372,  368,  367,  369,
- /*   280 */   370,  371,  378,  379,  136,  363,  363,  207,   41,    4,
- /*   290 */    46,    5,  131,  233,   43,   25,  186,  289,  318,   50,
- /*   300 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*   310 */   341,   40,   20,  225,  100,  161,   18,  355,  361,  317,
- /*   320 */    26,  109,  360,  346,  325,  375,  376,  377,  373,  372,
- /*   330 */   368,  367,  369,  370,  371,  378,  379,  106,  201,  172,
- /*   340 */    25,  206,  288,   25,   18,  261,  181,  317,  325,   45,
- /*   350 */   339,  129,   50,   47,   48,   44,   10,   13,  305,  306,
- /*   360 */    12,   11,  340,  341,   40,   20,  225,  104,  162,   18,
- /*   370 */    16,  205,  317,  206,  248,  238,   43,  325,  375,  376,
- /*   380 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*   390 */   255,  354,  243,  229,  206,  342,   18,  239,  242,  241,
- /*   400 */   248,  266,  300,  330,  240,   50,   47,   48,   44,   10,
- /*   410 */    13,  305,  306,   12,   11,  340,  341,   40,   20,  225,
- /*   420 */   165,  176,  184,   18,   18,   18,  253,  215,  251,  325,
- /*   430 */   325,  375,  376,  377,  373,  372,  368,  367,  369,  370,
- /*   440 */   371,  378,  379,  304,  268,  159,  207,  207,  247,  206,
- /*   450 */   148,   41,  195,  350,  325,   27,   33,   43,   50,   47,
- /*   460 */    48,   44,   10,   13,  305,  306,   12,   11,  340,  341,
- /*   470 */    40,   20,  163,  225,  328,  199,  133,   29,  187,   23,
- /*   480 */   250,  325,  101,  225,  375,  376,  377,  373,  372,  368,
- /*   490 */   367,  369,  370,  371,  378,  379,  225,  298,  207,  334,
- /*   500 */   225,   45,  312,  103,  299,  192,  154,  364,   18,  302,
- /*   510 */   135,  317,  285,   35,  173,  203,  320,    3,  236,    6,
- /*   520 */   108,   41,  232,  294,  303,  134,  313,   43,  130,  249,
- /*   530 */   329,  231,  250,  225,  280,   50,   47,   48,   44,   10,
- /*   540 */    13,  305,  306,   12,   11,  340,  341,   40,   20,  336,
- /*   550 */    36,  166,  212,  230,  332,  228,  338,    8,  132,  330,
- /*   560 */   325,  375,  376,  377,  373,  372,  368,  367,  369,  370,
- /*   570 */   371,  378,  379,  225,  312,  345,   37,  362,  141,  312,
- /*   580 */    94,   77,  135,  156,  236,  182,  173,  135,  122,  204,
- /*   590 */   315,  386,  365,  225,  232,  294,  303,  137,  313,  232,
- /*   600 */   294,  303,  125,  313,   41,  222,  333,  180,  277,  337,
- /*   610 */    43,  225,   50,   47,   48,   44,   10,   13,  305,  306,
- /*   620 */    12,   11,  340,  341,   40,   20,  136,  335,  316,    5,
- /*   630 */    22,  197,  269,   34,  173,  148,  126,  116,  375,  376,
- /*   640 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*   650 */   225,  312,  298,  225,  292,  141,  312,  258,   77,  135,
- /*   660 */   153,  183,  318,  301,  135,  175,  284,  315,  386,  461,
- /*   670 */   117,  232,  294,  303,  325,  313,  232,  294,  303,  382,
- /*   680 */   313,  461,  220,  110,  329,  298,  318,  461,  329,   50,
- /*   690 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*   700 */   341,   40,   20,  225,   30,  191,   46,  189,  314,  107,
- /*   710 */   329,  329,  146,   97,  102,  375,  376,  377,  373,  372,
- /*   720 */   368,  367,  369,  370,  371,  378,  379,  298,  298,  298,
- /*   730 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*   740 */   329,  329,   50,   47,   48,   44,   10,   13,  305,  306,
- /*   750 */    12,   11,  340,  341,   40,   20,  225,  329,  329,  329,
- /*   760 */   329,  329,  329,  329,  329,  114,  160,  115,  375,  376,
- /*   770 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*   780 */   298,  298,  298,  329,  329,  329,  329,  329,  329,  329,
- /*   790 */   329,  329,  329,  329,  283,   50,   47,   48,   44,   10,
- /*   800 */    13,  305,  306,   12,   11,  340,  341,   40,   20,  329,
- /*   810 */   225,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*   820 */   329,  375,  376,  377,  373,  372,  368,  367,  369,  370,
- /*   830 */   371,  378,  379,  200,  329,  329,  329,  329,  329,  329,
- /*   840 */   329,  329,  329,  329,  329,  329,  329,  329,  329,   50,
- /*   850 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*   860 */   341,   40,   20,  225,  329,  329,  329,  329,  329,  329,
- /*   870 */   329,  329,  329,  329,  329,  375,  376,  377,  373,  372,
- /*   880 */   368,  367,  369,  370,  371,  378,  379,  329,  329,  329,
- /*   890 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*   900 */   329,  329,   50,   47,   48,   44,   10,   13,  305,  306,
- /*   910 */    12,   11,  340,  341,   40,   20,  329,  329,  329,  329,
- /*   920 */   329,  329,  329,  329,  329,  329,  329,  290,  375,  376,
- /*   930 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*   940 */   225,  312,  329,  225,  329,  141,  312,  329,   77,  135,
- /*   950 */   152,  329,  329,  329,  135,  158,  208,  315,  386,  458,
- /*   960 */   329,  232,  294,  303,  325,  313,  232,  294,  303,  329,
- /*   970 */   313,  458,  223,  329,  329,  329,  318,  458,  329,   50,
- /*   980 */    47,   48,   44,   10,   13,  305,  306,   12,   11,  340,
- /*   990 */   341,   40,   20,  225,  329,  329,   46,  329,  329,  329,
- /*  1000 */   329,  329,  329,  329,  329,  375,  376,  377,  373,  372,
- /*  1010 */   368,  367,  369,  370,  371,  378,  379,  329,  329,  329,
- /*  1020 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*  1030 */   329,  329,   50,   47,   48,   44,   10,   13,  305,  306,
- /*  1040 */    12,   11,  340,  341,   40,   20,  329,  329,  329,  329,
- /*  1050 */   329,  329,  329,  329,  329,  329,  329,  329,  375,  376,
- /*  1060 */   377,  373,  372,  368,  367,  369,  370,  371,  378,  379,
- /*  1070 */   329,  329,  329,   50,   47,   48,   44,   10,   13,  305,
- /*  1080 */   306,   12,   11,  340,  341,   40,   20,  329,  329,  329,
- /*  1090 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  375,
- /*  1100 */   376,  377,  373,  372,  368,  367,  369,  370,  371,  378,
- /*  1110 */   379,  329,  329,  329,  329,  329,   42,  329,  145,  211,
- /*  1120 */   329,  329,    6,  108,  329,  279,  329,  312,  134,  329,
- /*  1130 */   329,  150,  249,  329,  231,  135,  235,   41,   39,  329,
- /*  1140 */   329,   52,  329,   43,  311,  329,  312,  232,  294,  303,
- /*  1150 */   147,  313,  329,  170,  135,  329,   51,   49,  331,  237,
- /*  1160 */   296,  329,  325,  106,    1,  278,  232,  294,  303,  329,
- /*  1170 */   313,  155,  329,   42,  318,  145,  216,  329,   96,    6,
- /*  1180 */   108,   18,  329,  226,  317,  134,  329,  313,  329,  249,
- /*  1190 */   329,  231,  329,  235,   41,   39,  256,  329,   52,  329,
- /*  1200 */    43,  329,  312,  329,  329,  329,  141,  329,  329,   66,
- /*  1210 */   119,  238,  329,   51,   49,  331,  237,  296,  315,  386,
- /*  1220 */   106,    1,  232,  294,  303,  329,  313,  270,  329,  329,
- /*  1230 */    42,  329,  140,   92,  329,   96,    6,  108,   18,   41,
- /*  1240 */   169,  317,  134,  329,  273,   43,  249,  329,  231,  325,
- /*  1250 */   235,   41,   39,  244,  329,   52,   41,   43,  329,  312,
- /*  1260 */   329,  318,   43,  141,  329,  329,   67,  135,  225,  329,
- /*  1270 */    51,   49,  331,  237,  296,  315,  386,  106,    1,  224,
- /*  1280 */   294,  303,  329,  313,  310,  329,  329,   42,  329,  145,
- /*  1290 */   213,  329,   96,    6,  108,  329,   41,  329,  329,  134,
- /*  1300 */   329,  323,   43,  249,  329,  231,  329,  235,  329,   39,
- /*  1310 */   329,  329,   52,   41,  329,  329,  312,  329,  329,   43,
- /*  1320 */   141,   46,  329,   86,  135,  329,  329,   51,   49,  331,
- /*  1330 */   237,  296,  315,  386,  106,    1,  232,  294,  303,  329,
- /*  1340 */   313,  274,  329,  329,   42,  329,  142,  216,  329,   96,
- /*  1350 */     6,  108,  329,   41,  329,  329,  134,  329,  348,   43,
- /*  1360 */   249,  329,  231,  329,  235,  329,    7,  329,  329,   52,
- /*  1370 */    41,  329,  329,  312,  329,  329,   43,  141,  329,  329,
- /*  1380 */    90,  135,  329,  329,   51,   49,  331,  237,  296,  315,
- /*  1390 */   386,  106,    1,  232,  294,  303,  329,  313,  295,  329,
- /*  1400 */   329,   42,  329,  138,  216,  329,   96,    6,  108,  329,
- /*  1410 */    41,  329,  329,  134,  329,  322,   43,  249,  329,  231,
- /*  1420 */   329,  235,  329,   39,  329,  329,   52,   41,  329,  329,
- /*  1430 */   312,  329,  329,   43,  141,  329,  329,   87,  135,  329,
- /*  1440 */   329,   51,   49,  331,  237,  296,  315,  386,  106,    1,
- /*  1450 */   232,  294,  303,  329,  313,  384,  329,  329,   42,  329,
- /*  1460 */   131,  216,  329,   96,    6,  108,  329,   41,  329,  329,
- /*  1470 */   134,  329,  380,   43,  249,  329,  231,  329,  235,  329,
- /*  1480 */    15,  329,  329,   52,   41,  329,  329,  312,  329,  329,
- /*  1490 */    43,  141,  329,  329,   79,  135,  329,  329,   51,   49,
- /*  1500 */   331,  237,  296,  315,  386,  106,    1,  232,  294,  303,
- /*  1510 */   329,  313,  272,  329,  329,   42,  329,  145,  210,  329,
- /*  1520 */    96,    6,  108,  329,   41,  329,  329,  134,  329,  349,
- /*  1530 */    43,  249,  329,  231,  329,  221,  329,   39,  329,  329,
- /*  1540 */    52,   41,  329,  329,  312,  329,  329,   43,  141,  329,
- /*  1550 */   329,   70,  135,  329,  329,   51,   49,  331,  237,  296,
- /*  1560 */   315,  386,  106,    1,  232,  294,  303,  329,  313,  324,
- /*  1570 */   329,  329,   42,  329,  145,  209,  329,   96,    6,  108,
- /*  1580 */   329,   41,  329,  329,  134,  329,  326,   43,  249,  329,
- /*  1590 */   231,  329,  235,  329,   39,  329,  329,   52,   41,  329,
- /*  1600 */   329,  312,  329,  329,   43,  141,  329,  329,   74,  135,
- /*  1610 */   329,  329,   51,   49,  331,  237,  296,  315,  386,  106,
- /*  1620 */     1,  232,  294,  303,  329,  313,  262,  329,  329,   42,
- /*  1630 */   329,  131,  214,  329,   96,    6,  108,  329,   41,  329,
- /*  1640 */   329,  134,  329,  327,   43,  249,  329,  231,  329,  235,
- /*  1650 */   329,   15,  329,  329,   52,   41,  329,  329,  312,  329,
- /*  1660 */   329,   43,  141,  329,  329,   53,  135,  329,  329,   51,
- /*  1670 */    49,  331,  237,  296,  315,  386,  106,  329,  232,  294,
- /*  1680 */   303,  329,  313,  286,  329,  329,   42,  329,  131,  216,
- /*  1690 */   329,   96,    6,  108,  329,   41,  329,  329,  134,  329,
- /*  1700 */   343,   43,  249,  329,  231,  329,  235,  329,   15,  329,
- /*  1710 */   329,   52,   41,  329,  329,  312,  329,  329,   43,  118,
- /*  1720 */   329,  329,   76,  135,  329,  329,   51,   49,  331,  237,
- /*  1730 */   296,  315,  386,  106,  329,  232,  294,  303,  329,  313,
- /*  1740 */   329,  329,  329,  329,  504,  329,  329,  329,   96,  329,
- /*  1750 */   357,  504,  329,  504,  504,  364,  504,  504,  329,  329,
- /*  1760 */   329,   35,  504,  329,  504,    2,  504,    6,  108,  329,
- /*  1770 */   198,  174,  329,  134,  329,  329,  329,  249,  329,  231,
- /*  1780 */   325,  504,  329,   21,    9,  329,  329,  329,  144,  329,
- /*  1790 */   329,  329,  504,  329,  312,   99,  179,  206,  141,  329,
- /*  1800 */   329,   58,  135,  329,  329,  325,  504,  329,   21,    9,
- /*  1810 */   315,  386,  329,  312,  232,  294,  303,  141,  313,  329,
- /*  1820 */    71,  135,  206,  344,   37,  362,  329,  329,  329,  315,
- /*  1830 */   386,  329,  329,  232,  294,  303,  312,  313,  329,  329,
- /*  1840 */   141,  329,  329,   72,  135,  329,  329,  312,  329,  329,
- /*  1850 */   329,  141,  315,  386,   65,  135,  232,  294,  303,  329,
- /*  1860 */   313,  329,  329,  315,  386,  329,  329,  232,  294,  303,
- /*  1870 */   329,  313,  329,  329,  312,  198,  167,  329,  141,  329,
- /*  1880 */   329,   69,  135,  329,  329,  325,  329,  329,   21,    9,
- /*  1890 */   315,  386,  329,  329,  232,  294,  303,  312,  313,  329,
- /*  1900 */   329,  141,  206,  329,   85,  135,  329,  312,  329,  329,
- /*  1910 */   329,  149,  329,  315,  386,  135,  312,  232,  294,  303,
- /*  1920 */   141,  313,  329,   81,  135,  329,  329,  232,  294,  303,
- /*  1930 */   329,  313,  315,  386,  329,  329,  232,  294,  303,  312,
- /*  1940 */   313,  329,  329,  141,  329,  329,   82,  135,  329,  329,
- /*  1950 */   312,  329,  329,  329,  141,  315,  386,   63,  135,  232,
- /*  1960 */   294,  303,  329,  313,  329,  329,  315,  386,  329,  329,
- /*  1970 */   232,  294,  303,  329,  313,  329,  312,  329,  329,  329,
- /*  1980 */   141,  329,  329,   73,  135,  329,  329,  312,  329,  329,
- /*  1990 */   329,  141,  315,  386,   83,  135,  232,  294,  303,  329,
- /*  2000 */   313,  329,  329,  315,  386,  329,  312,  232,  294,  303,
- /*  2010 */   141,  313,  329,   89,  135,  329,  329,  329,  329,  329,
- /*  2020 */   329,  329,  315,  386,  329,  312,  232,  294,  303,  111,
- /*  2030 */   313,  329,   68,  135,  329,  329,  312,  329,  329,  329,
- /*  2040 */   141,  315,  386,   62,  135,  232,  294,  303,  329,  313,
- /*  2050 */   329,  329,  315,  386,  329,  329,  232,  294,  303,  329,
- /*  2060 */   313,  329,  312,  329,  329,  329,  141,  329,  329,   61,
- /*  2070 */   135,  329,  329,  312,  329,  329,  329,  141,  315,  386,
- /*  2080 */    91,  135,  232,  294,  303,  329,  313,  329,  329,  315,
- /*  2090 */   386,  329,  312,  232,  294,  303,  141,  313,  329,   78,
- /*  2100 */   135,  329,  329,  329,  329,  329,  329,  329,  315,  386,
- /*  2110 */   329,  312,  232,  294,  303,  141,  313,  329,   66,  135,
- /*  2120 */   329,  329,  312,  329,  329,  329,  141,  315,  386,   80,
- /*  2130 */   135,  232,  294,  303,  329,  313,  329,  329,  315,  386,
- /*  2140 */   329,  329,  232,  294,  303,  329,  313,  329,  312,  329,
- /*  2150 */   329,  329,  113,  329,  329,   88,  135,  329,  329,  312,
- /*  2160 */   329,  329,  329,  112,  315,  386,   84,  135,  232,  294,
- /*  2170 */   303,  329,  313,  329,  329,  315,  386,  329,  312,  232,
- /*  2180 */   294,  303,  141,  313,  329,   57,  135,  329,  329,  329,
- /*  2190 */   329,  329,  329,  329,  315,  386,  329,  312,  232,  294,
- /*  2200 */   303,   93,  313,  329,   59,  121,  329,  329,  312,  329,
- /*  2210 */   329,  329,  141,  315,  386,   75,  135,  232,  294,  303,
- /*  2220 */   329,  313,  329,  329,  315,  386,  329,  329,  232,  294,
- /*  2230 */   303,  329,  313,  329,  312,  329,  329,  329,  141,  329,
- /*  2240 */   329,   60,  135,  329,  329,  312,  329,  329,  329,  141,
- /*  2250 */   315,  386,   64,  135,  232,  294,  303,  329,  313,  329,
- /*  2260 */   329,  315,  386,  329,  312,  232,  294,  303,  120,  313,
- /*  2270 */   329,   55,  135,  329,  329,  329,  329,  329,  329,  329,
- /*  2280 */   315,  386,  329,  312,  232,  294,  303,   93,  313,  329,
- /*  2290 */    56,  121,  225,  329,  312,  329,  198,  164,  157,  315,
- /*  2300 */   386,  329,  135,  219,  294,  303,  325,  313,  352,   21,
- /*  2310 */     9,  287,  234,  329,  232,  294,  303,  329,  313,  329,
- /*  2320 */    41,  329,  329,  206,  312,  329,   43,  329,  151,    2,
- /*  2330 */   329,  329,  135,  329,  329,  329,  329,  329,  329,  329,
- /*  2340 */   198,  168,  329,  329,  232,  294,  303,  329,  313,  329,
- /*  2350 */   325,  329,  144,   21,    9,  198,  171,  329,  329,  329,
- /*  2360 */   329,  329,  329,  329,  329,  325,  329,  206,   21,    9,
- /*  2370 */   329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
- /*  2380 */   329,  329,  206,
-    );
-    static public $yy_lookahead = array(
- /*     0 */     1,    3,    4,    5,    6,    7,    8,    9,   10,   11,
- /*    10 */    12,   13,   16,   98,   16,   19,   17,   17,  113,  114,
- /*    20 */    22,   23,   16,   97,   18,   19,   28,  112,   29,   29,
- /*    30 */    32,   33,   34,   16,   35,   35,   19,   20,  112,   40,
- /*    40 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*    50 */    51,   52,   53,    4,    5,    6,    7,    8,   62,   93,
- /*    60 */    94,   95,   13,   14,   15,   66,   67,   68,   69,   70,
- /*    70 */    71,   72,   73,   74,   75,   76,   77,    1,   85,   62,
- /*    80 */     1,    1,   89,   38,  117,   92,   93,   82,   83,   84,
- /*    90 */    85,   86,   38,   17,  101,  102,   17,   17,  105,  106,
- /*   100 */   107,   86,  109,   88,   59,   29,   61,    1,   29,   30,
- /*   110 */    65,   35,  119,  120,   35,   61,   40,   41,   42,   43,
- /*   120 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
- /*   130 */    90,   91,   59,   54,   54,   29,   16,   64,   18,   19,
- /*   140 */   100,   35,   66,   67,   68,   69,   70,   71,   72,   73,
- /*   150 */    74,   75,   76,   77,    1,   85,   36,  117,    1,   89,
- /*   160 */    18,    1,   92,   93,   94,    1,   17,   20,   21,   20,
- /*   170 */    17,  101,  102,   17,   17,  105,  106,  107,   29,  109,
- /*   180 */    38,   17,   29,   31,   35,   29,   29,   38,   35,   90,
- /*   190 */    38,   35,   35,   40,   41,   42,   43,   44,   45,   46,
- /*   200 */    47,   48,   49,   50,   51,   52,   53,    1,   61,  111,
- /*   210 */    61,  113,  114,   61,   54,   90,  117,  118,   90,   66,
- /*   220 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*   230 */    77,  103,  104,   27,  110,   29,  112,    1,   84,   85,
- /*   240 */    86,   35,  117,   20,   21,  117,   40,   41,   42,   43,
- /*   250 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
- /*   260 */     1,   91,   16,   59,   25,   19,   20,   31,   64,   16,
- /*   270 */   100,   25,   66,   67,   68,   69,   70,   71,   72,   73,
- /*   280 */    74,   75,   76,   77,   61,   85,   85,  117,   29,   37,
- /*   290 */    54,   38,   18,   19,   35,   37,  110,   39,  112,   40,
- /*   300 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   310 */    51,   52,   53,    1,   90,   91,   16,   65,   79,   19,
- /*   320 */    20,  121,  122,  122,  100,   66,   67,   68,   69,   70,
- /*   330 */    71,   72,   73,   74,   75,   76,   77,   63,   24,   91,
- /*   340 */    37,  117,   39,   37,   16,   39,   90,   19,  100,    2,
- /*   350 */    19,   37,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   360 */    48,   49,   50,   51,   52,   53,    1,   90,   91,   16,
- /*   370 */    29,   19,   19,  117,   93,   94,   35,  100,   66,   67,
- /*   380 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   390 */    62,   79,   96,   62,  117,   17,   16,   18,   19,   19,
- /*   400 */    93,   94,   19,   25,   39,   40,   41,   42,   43,   44,
- /*   410 */    45,   46,   47,   48,   49,   50,   51,   52,   53,    1,
- /*   420 */    91,   91,   90,   16,   16,   16,   19,   19,   19,  100,
- /*   430 */   100,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   440 */    75,   76,   77,  108,   29,   91,  117,  117,   30,  117,
- /*   450 */   115,   29,  113,  114,  100,   20,   96,   35,   40,   41,
- /*   460 */    42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
- /*   470 */    52,   53,   91,    1,  118,   99,   18,   26,  110,   20,
- /*   480 */     2,  100,   97,    1,   66,   67,   68,   69,   70,   71,
- /*   490 */    72,   73,   74,   75,   76,   77,    1,  112,  117,   17,
- /*   500 */     1,    2,   85,   99,   19,  110,   89,   10,   16,   19,
- /*   510 */    93,   19,   17,   16,   21,   99,   17,   38,   59,   22,
- /*   520 */    23,   29,  105,  106,  107,   28,  109,   35,   18,   32,
- /*   530 */    33,   34,    2,    1,   65,   40,   41,   42,   43,   44,
- /*   540 */    45,   46,   47,   48,   49,   50,   51,   52,   53,   17,
- /*   550 */    20,   91,   59,   21,   36,   19,   19,   64,   19,   25,
- /*   560 */   100,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   570 */    75,   76,   77,    1,   85,   78,   79,   80,   89,   85,
- /*   580 */    19,   92,   93,   89,   59,   63,   21,   93,   19,   17,
- /*   590 */   101,  102,   17,    1,  105,  106,  107,   18,  109,  105,
- /*   600 */   106,  107,   18,  109,   29,  116,   36,   63,   19,   17,
- /*   610 */    35,    1,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   620 */    48,   49,   50,   51,   52,   53,   61,   17,  108,   38,
- /*   630 */     2,   19,   39,   55,   21,  115,   18,   97,   66,   67,
- /*   640 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   650 */     1,   85,  112,    1,  100,   89,   85,  115,   92,   93,
- /*   660 */    89,  110,  112,  111,   93,   91,   17,  101,  102,   17,
- /*   670 */    97,  105,  106,  107,  100,  109,  105,  106,  107,   14,
- /*   680 */   109,   29,  116,   87,  123,  112,  112,   35,  123,   40,
- /*   690 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   700 */    51,   52,   53,    1,    2,  110,   54,  110,  114,  110,
- /*   710 */   123,  123,   97,   97,   97,   66,   67,   68,   69,   70,
- /*   720 */    71,   72,   73,   74,   75,   76,   77,  112,  112,  112,
- /*   730 */   123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*   740 */   123,  123,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   750 */    48,   49,   50,   51,   52,   53,    1,  123,  123,  123,
- /*   760 */   123,  123,  123,  123,  123,   97,   97,   97,   66,   67,
- /*   770 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   780 */   112,  112,  112,  123,  123,  123,  123,  123,  123,  123,
- /*   790 */   123,  123,  123,  123,   39,   40,   41,   42,   43,   44,
- /*   800 */    45,   46,   47,   48,   49,   50,   51,   52,   53,  123,
- /*   810 */     1,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*   820 */   123,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   830 */    75,   76,   77,   24,  123,  123,  123,  123,  123,  123,
- /*   840 */   123,  123,  123,  123,  123,  123,  123,  123,  123,   40,
- /*   850 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   860 */    51,   52,   53,    1,  123,  123,  123,  123,  123,  123,
- /*   870 */   123,  123,  123,  123,  123,   66,   67,   68,   69,   70,
- /*   880 */    71,   72,   73,   74,   75,   76,   77,  123,  123,  123,
- /*   890 */   123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*   900 */   123,  123,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   910 */    48,   49,   50,   51,   52,   53,  123,  123,  123,  123,
- /*   920 */   123,  123,  123,  123,  123,  123,  123,   65,   66,   67,
- /*   930 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   940 */     1,   85,  123,    1,  123,   89,   85,  123,   92,   93,
- /*   950 */    89,  123,  123,  123,   93,   91,   17,  101,  102,   17,
- /*   960 */   123,  105,  106,  107,  100,  109,  105,  106,  107,  123,
- /*   970 */   109,   29,  116,  123,  123,  123,  112,   35,  123,   40,
- /*   980 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   990 */    51,   52,   53,    1,  123,  123,   54,  123,  123,  123,
- /*  1000 */   123,  123,  123,  123,  123,   66,   67,   68,   69,   70,
- /*  1010 */    71,   72,   73,   74,   75,   76,   77,  123,  123,  123,
- /*  1020 */   123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*  1030 */   123,  123,   40,   41,   42,   43,   44,   45,   46,   47,
- /*  1040 */    48,   49,   50,   51,   52,   53,  123,  123,  123,  123,
- /*  1050 */   123,  123,  123,  123,  123,  123,  123,  123,   66,   67,
- /*  1060 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
- /*  1070 */   123,  123,  123,   40,   41,   42,   43,   44,   45,   46,
- /*  1080 */    47,   48,   49,   50,   51,   52,   53,  123,  123,  123,
- /*  1090 */   123,  123,  123,  123,  123,  123,  123,  123,  123,   66,
- /*  1100 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*  1110 */    77,  123,  123,  123,  123,  123,   16,  123,   18,   19,
- /*  1120 */   123,  123,   22,   23,  123,   17,  123,   85,   28,  123,
- /*  1130 */   123,   89,   32,   33,   34,   93,   36,   29,   38,  123,
- /*  1140 */   123,   41,  123,   35,  102,  123,   85,  105,  106,  107,
- /*  1150 */    89,  109,  123,   91,   93,  123,   56,   57,   58,   59,
- /*  1160 */    60,  123,  100,   63,   64,   65,  105,  106,  107,  123,
- /*  1170 */   109,   93,  123,   16,  112,   18,   19,  123,   78,   22,
- /*  1180 */    23,   16,  123,  105,   19,   28,  123,  109,  123,   32,
- /*  1190 */    33,   34,  123,   36,   29,   38,   31,  123,   41,  123,
- /*  1200 */    35,  123,   85,  123,  123,  123,   89,  123,  123,   92,
- /*  1210 */    93,   94,  123,   56,   57,   58,   59,   60,  101,  102,
- /*  1220 */    63,   64,  105,  106,  107,  123,  109,   17,  123,  123,
- /*  1230 */    16,  123,   18,   19,  123,   78,   22,   23,   16,   29,
- /*  1240 */    91,   19,   28,  123,   17,   35,   32,   33,   34,  100,
- /*  1250 */    36,   29,   38,   31,  123,   41,   29,   35,  123,   85,
- /*  1260 */   123,  112,   35,   89,  123,  123,   92,   93,    1,  123,
- /*  1270 */    56,   57,   58,   59,   60,  101,  102,   63,   64,  105,
- /*  1280 */   106,  107,  123,  109,   17,  123,  123,   16,  123,   18,
- /*  1290 */    19,  123,   78,   22,   23,  123,   29,  123,  123,   28,
- /*  1300 */   123,   17,   35,   32,   33,   34,  123,   36,  123,   38,
- /*  1310 */   123,  123,   41,   29,  123,  123,   85,  123,  123,   35,
- /*  1320 */    89,   54,  123,   92,   93,  123,  123,   56,   57,   58,
- /*  1330 */    59,   60,  101,  102,   63,   64,  105,  106,  107,  123,
- /*  1340 */   109,   17,  123,  123,   16,  123,   18,   19,  123,   78,
- /*  1350 */    22,   23,  123,   29,  123,  123,   28,  123,   17,   35,
- /*  1360 */    32,   33,   34,  123,   36,  123,   38,  123,  123,   41,
- /*  1370 */    29,  123,  123,   85,  123,  123,   35,   89,  123,  123,
- /*  1380 */    92,   93,  123,  123,   56,   57,   58,   59,   60,  101,
- /*  1390 */   102,   63,   64,  105,  106,  107,  123,  109,   17,  123,
- /*  1400 */   123,   16,  123,   18,   19,  123,   78,   22,   23,  123,
- /*  1410 */    29,  123,  123,   28,  123,   17,   35,   32,   33,   34,
- /*  1420 */   123,   36,  123,   38,  123,  123,   41,   29,  123,  123,
- /*  1430 */    85,  123,  123,   35,   89,  123,  123,   92,   93,  123,
- /*  1440 */   123,   56,   57,   58,   59,   60,  101,  102,   63,   64,
- /*  1450 */   105,  106,  107,  123,  109,   17,  123,  123,   16,  123,
- /*  1460 */    18,   19,  123,   78,   22,   23,  123,   29,  123,  123,
- /*  1470 */    28,  123,   17,   35,   32,   33,   34,  123,   36,  123,
- /*  1480 */    38,  123,  123,   41,   29,  123,  123,   85,  123,  123,
- /*  1490 */    35,   89,  123,  123,   92,   93,  123,  123,   56,   57,
- /*  1500 */    58,   59,   60,  101,  102,   63,   64,  105,  106,  107,
- /*  1510 */   123,  109,   17,  123,  123,   16,  123,   18,   19,  123,
- /*  1520 */    78,   22,   23,  123,   29,  123,  123,   28,  123,   17,
- /*  1530 */    35,   32,   33,   34,  123,   36,  123,   38,  123,  123,
- /*  1540 */    41,   29,  123,  123,   85,  123,  123,   35,   89,  123,
- /*  1550 */   123,   92,   93,  123,  123,   56,   57,   58,   59,   60,
- /*  1560 */   101,  102,   63,   64,  105,  106,  107,  123,  109,   17,
- /*  1570 */   123,  123,   16,  123,   18,   19,  123,   78,   22,   23,
- /*  1580 */   123,   29,  123,  123,   28,  123,   17,   35,   32,   33,
- /*  1590 */    34,  123,   36,  123,   38,  123,  123,   41,   29,  123,
- /*  1600 */   123,   85,  123,  123,   35,   89,  123,  123,   92,   93,
- /*  1610 */   123,  123,   56,   57,   58,   59,   60,  101,  102,   63,
- /*  1620 */    64,  105,  106,  107,  123,  109,   17,  123,  123,   16,
- /*  1630 */   123,   18,   19,  123,   78,   22,   23,  123,   29,  123,
- /*  1640 */   123,   28,  123,   17,   35,   32,   33,   34,  123,   36,
- /*  1650 */   123,   38,  123,  123,   41,   29,  123,  123,   85,  123,
- /*  1660 */   123,   35,   89,  123,  123,   92,   93,  123,  123,   56,
- /*  1670 */    57,   58,   59,   60,  101,  102,   63,  123,  105,  106,
- /*  1680 */   107,  123,  109,   17,  123,  123,   16,  123,   18,   19,
- /*  1690 */   123,   78,   22,   23,  123,   29,  123,  123,   28,  123,
- /*  1700 */    17,   35,   32,   33,   34,  123,   36,  123,   38,  123,
- /*  1710 */   123,   41,   29,  123,  123,   85,  123,  123,   35,   89,
- /*  1720 */   123,  123,   92,   93,  123,  123,   56,   57,   58,   59,
- /*  1730 */    60,  101,  102,   63,  123,  105,  106,  107,  123,  109,
- /*  1740 */   123,  123,  123,  123,   17,  123,  123,  123,   78,  123,
- /*  1750 */   120,   24,  123,   26,   27,   10,   29,   30,  123,  123,
- /*  1760 */   123,   16,   35,  123,   37,   38,   39,   22,   23,  123,
- /*  1770 */    90,   91,  123,   28,  123,  123,  123,   32,   33,   34,
- /*  1780 */   100,   54,  123,  103,  104,  123,  123,  123,   61,  123,
- /*  1790 */   123,  123,   65,  123,   85,   90,   91,  117,   89,  123,
- /*  1800 */   123,   92,   93,  123,  123,  100,   79,  123,  103,  104,
- /*  1810 */   101,  102,  123,   85,  105,  106,  107,   89,  109,  123,
- /*  1820 */    92,   93,  117,   78,   79,   80,  123,  123,  123,  101,
- /*  1830 */   102,  123,  123,  105,  106,  107,   85,  109,  123,  123,
- /*  1840 */    89,  123,  123,   92,   93,  123,  123,   85,  123,  123,
- /*  1850 */   123,   89,  101,  102,   92,   93,  105,  106,  107,  123,
- /*  1860 */   109,  123,  123,  101,  102,  123,  123,  105,  106,  107,
- /*  1870 */   123,  109,  123,  123,   85,   90,   91,  123,   89,  123,
- /*  1880 */   123,   92,   93,  123,  123,  100,  123,  123,  103,  104,
- /*  1890 */   101,  102,  123,  123,  105,  106,  107,   85,  109,  123,
- /*  1900 */   123,   89,  117,  123,   92,   93,  123,   85,  123,  123,
- /*  1910 */   123,   89,  123,  101,  102,   93,   85,  105,  106,  107,
- /*  1920 */    89,  109,  123,   92,   93,  123,  123,  105,  106,  107,
- /*  1930 */   123,  109,  101,  102,  123,  123,  105,  106,  107,   85,
- /*  1940 */   109,  123,  123,   89,  123,  123,   92,   93,  123,  123,
- /*  1950 */    85,  123,  123,  123,   89,  101,  102,   92,   93,  105,
- /*  1960 */   106,  107,  123,  109,  123,  123,  101,  102,  123,  123,
- /*  1970 */   105,  106,  107,  123,  109,  123,   85,  123,  123,  123,
- /*  1980 */    89,  123,  123,   92,   93,  123,  123,   85,  123,  123,
- /*  1990 */   123,   89,  101,  102,   92,   93,  105,  106,  107,  123,
- /*  2000 */   109,  123,  123,  101,  102,  123,   85,  105,  106,  107,
- /*  2010 */    89,  109,  123,   92,   93,  123,  123,  123,  123,  123,
- /*  2020 */   123,  123,  101,  102,  123,   85,  105,  106,  107,   89,
- /*  2030 */   109,  123,   92,   93,  123,  123,   85,  123,  123,  123,
- /*  2040 */    89,  101,  102,   92,   93,  105,  106,  107,  123,  109,
- /*  2050 */   123,  123,  101,  102,  123,  123,  105,  106,  107,  123,
- /*  2060 */   109,  123,   85,  123,  123,  123,   89,  123,  123,   92,
- /*  2070 */    93,  123,  123,   85,  123,  123,  123,   89,  101,  102,
- /*  2080 */    92,   93,  105,  106,  107,  123,  109,  123,  123,  101,
- /*  2090 */   102,  123,   85,  105,  106,  107,   89,  109,  123,   92,
- /*  2100 */    93,  123,  123,  123,  123,  123,  123,  123,  101,  102,
- /*  2110 */   123,   85,  105,  106,  107,   89,  109,  123,   92,   93,
- /*  2120 */   123,  123,   85,  123,  123,  123,   89,  101,  102,   92,
- /*  2130 */    93,  105,  106,  107,  123,  109,  123,  123,  101,  102,
- /*  2140 */   123,  123,  105,  106,  107,  123,  109,  123,   85,  123,
- /*  2150 */   123,  123,   89,  123,  123,   92,   93,  123,  123,   85,
- /*  2160 */   123,  123,  123,   89,  101,  102,   92,   93,  105,  106,
- /*  2170 */   107,  123,  109,  123,  123,  101,  102,  123,   85,  105,
- /*  2180 */   106,  107,   89,  109,  123,   92,   93,  123,  123,  123,
- /*  2190 */   123,  123,  123,  123,  101,  102,  123,   85,  105,  106,
- /*  2200 */   107,   89,  109,  123,   92,   93,  123,  123,   85,  123,
- /*  2210 */   123,  123,   89,  101,  102,   92,   93,  105,  106,  107,
- /*  2220 */   123,  109,  123,  123,  101,  102,  123,  123,  105,  106,
- /*  2230 */   107,  123,  109,  123,   85,  123,  123,  123,   89,  123,
- /*  2240 */   123,   92,   93,  123,  123,   85,  123,  123,  123,   89,
- /*  2250 */   101,  102,   92,   93,  105,  106,  107,  123,  109,  123,
- /*  2260 */   123,  101,  102,  123,   85,  105,  106,  107,   89,  109,
- /*  2270 */   123,   92,   93,  123,  123,  123,  123,  123,  123,  123,
- /*  2280 */   101,  102,  123,   85,  105,  106,  107,   89,  109,  123,
- /*  2290 */    92,   93,    1,  123,   85,  123,   90,   91,   89,  101,
- /*  2300 */   102,  123,   93,  105,  106,  107,  100,  109,   17,  103,
- /*  2310 */   104,  102,   21,  123,  105,  106,  107,  123,  109,  123,
- /*  2320 */    29,  123,  123,  117,   85,  123,   35,  123,   89,   38,
- /*  2330 */   123,  123,   93,  123,  123,  123,  123,  123,  123,  123,
- /*  2340 */    90,   91,  123,  123,  105,  106,  107,  123,  109,  123,
- /*  2350 */   100,  123,   61,  103,  104,   90,   91,  123,  123,  123,
- /*  2360 */   123,  123,  123,  123,  123,  100,  123,  117,  103,  104,
- /*  2370 */   123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
- /*  2380 */   123,  123,  117,
-);
-    const YY_SHIFT_USE_DFLT = -5;
-    const YY_SHIFT_MAX = 256;
-    static public $yy_shift_ofst = array(
- /*     0 */    -2, 1271, 1157, 1157, 1271, 1157, 1328, 1328, 1100, 1157,
- /*    10 */  1157, 1157, 1157, 1157, 1157, 1157, 1499, 1157, 1157, 1157,
- /*    20 */  1157, 1157, 1556, 1157, 1157, 1157, 1157, 1157, 1157, 1157,
- /*    30 */  1157, 1157, 1157, 1157, 1385, 1214, 1157, 1157, 1157, 1157,
- /*    40 */  1157, 1499, 1214, 1157, 1442, 1442, 1613, 1670, 1670, 1670,
- /*    50 */  1670, 1670, 1670,  206,  153,   76,   -1,  259,  259,  259,
- /*    60 */   809,  939,  755,  862,  702,  649,  365,  312,  418,  495,
- /*    70 */   572,  992,  992,  992,  992,  992,  992,  992,  992,  992,
- /*    80 */   992,  992,  992,  992,  992,  992,  992,  992,  992,  992,
- /*    90 */  1033, 1033, 2291, 1267,  106,   -2, 1745, 1222, 1165,  157,
- /*   100 */   157,  492,  492,  499,  106,  106,  274,  493,  142,  497,
- /*   110 */    49,   79,  942,  652,  246,   17,  328,  300,  236,  223,
- /*   120 */    80,  147,  532, 1227,  353,  353,  353,  422,  407,  142,
- /*   130 */   353,  353,  610,  353,  341,  565,  379,  353,  380,  142,
- /*   140 */   408,  160,  409,  353,  379,  409,  353,  472,  613,  472,
- /*   150 */   472,  472,  472,  472,  472,  613,  472,   -5, 1284, 1210,
- /*   160 */    -4, 1108,    0,  156,  575, 1683, 1552, 1512, 1569, 1609,
- /*   170 */  1666, 1324, 1626,    6, 1495, 1398, 1381, 1341, 1438, 1455,
- /*   180 */    73,  482,   73,  204,  592,  204,  204,  204,  164,  204,
- /*   190 */   253,  204,  204,  665,  613,  613,  613,  479,  472,  347,
- /*   200 */   415,  415,  472,  347,   -5,   -5,   -5,   -5,   -5, 1727,
- /*   210 */   149,   45,  120,  152,   54,  530,   54,  314,  252,  378,
- /*   220 */   306,  459,  258,  303,  239,  331,  522,  536,  469,  537,
- /*   230 */   539,  569,  534,  544,  561,  525,  518,  570,  593,  612,
- /*   240 */   578,  628,  591,  579,  510,  584,  589,  458,  435,  352,
- /*   250 */   485,  478,  451,  479,  490,  383,  618,
-);
-    const YY_REDUCE_USE_DFLT = -96;
-    const YY_REDUCE_MAX = 208;
-    static public $yy_reduce_ofst = array(
- /*     0 */     5,   -7,  489,  566, 1630,  856,   70, 1117, 1865, 1854,
- /*    10 */  1831, 1812, 1891, 1902, 1977, 1951, 1940, 1921, 1789, 1762,
- /*    20 */  1402, 1345, 1288, 1231, 1459, 1516, 1751, 1728, 1709, 1573,
- /*    30 */  1988, 2007, 2123, 2149, 2160, 2198, 2179, 1174, 2093, 2026,
- /*    40 */  2037, 2063, 2112, 2074, 1042, 2209, 1822, 2239, 1061,  861,
- /*    50 */   494,  417,  571, 2265, 2250, 2206, 1705, 1785, 1680, 1705,
- /*    60 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    70 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    80 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    90 */   128,  128,  277,  224,   40,  154,  200,  864, 1062,  170,
- /*   100 */   330,  574, 1149,   99,  329,  381, 1078,   98,  -34,  201,
- /*   110 */    15,  125,  125,  125,  -85,  124,  124,  124,  125,  -95,
- /*   120 */   125,  -95,  332,  354,  573,  616,  617,  460,  615,  307,
- /*   130 */   385,  540,  256,  -74,  248,  -95,  335,  668,  540,  281,
- /*   140 */   540,  125,  670,  669,  520,  540,  186,  125,  339,  125,
- /*   150 */   125,  125,  125,  125,  125,  -95,  125,  125,  554,  554,
- /*   160 */   550,  554,  554,  554,  554,  554,  554,  554,  554,  554,
- /*   170 */   554,  554,  554,  542,  554,  554,  554,  554,  554,  554,
- /*   180 */   595,  -33,  551,  552,  -33,  552,  552,  552,  -33,  552,
- /*   190 */   597,  552,  552,  596,  594,  594,  594,  599,  -33,  356,
- /*   200 */   296,  360,  -33,  356,  395,  404,  376,  416,  368,
-);
-    static public $yyExpectedTokens = array(
-        /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ),
-        /* 1 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 2 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 3 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 4 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 5 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 6 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 7 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 8 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 65, 78, ),
-        /* 9 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 10 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 11 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 12 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 13 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 14 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 15 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 16 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 17 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 18 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 19 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 20 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 21 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 22 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 23 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 24 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 25 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 26 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 27 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 28 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 29 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 30 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 31 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 32 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 33 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 34 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 35 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 36 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 37 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 38 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 39 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 40 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 41 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 42 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 43 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 44 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 45 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 64, 78, ),
-        /* 46 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 47 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 48 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 49 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 50 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 51 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 52 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 36, 38, 41, 56, 57, 58, 59, 60, 63, 78, ),
-        /* 53 */ array(1, 27, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 54 */ array(1, 17, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 55 */ array(1, 17, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 56 */ array(1, 17, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 57 */ array(1, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 58 */ array(1, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 59 */ array(1, 29, 35, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 60 */ array(1, 24, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 61 */ array(1, 17, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 62 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 63 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 64 */ array(1, 2, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 65 */ array(1, 17, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 66 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 67 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 79, ),
-        /* 68 */ array(1, 30, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 69 */ array(1, 17, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 70 */ array(1, 17, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 71 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 72 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 73 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 74 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 75 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 76 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 77 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 78 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 79 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 80 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 81 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 82 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 83 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 84 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 85 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 86 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 87 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 88 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 89 */ array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 90 */ array(40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 91 */ array(40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, ),
-        /* 92 */ array(1, 17, 21, 29, 35, 38, 61, ),
-        /* 93 */ array(1, 17, 29, 35, 54, ),
-        /* 94 */ array(1, 29, 35, ),
-        /* 95 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ),
-        /* 96 */ array(10, 16, 22, 23, 28, 32, 33, 34, 78, 79, 80, ),
-        /* 97 */ array(16, 19, 29, 31, 35, ),
-        /* 98 */ array(16, 19, 29, 31, 35, ),
-        /* 99 */ array(1, 17, 29, 35, ),
-        /* 100 */ array(1, 17, 29, 35, ),
-        /* 101 */ array(16, 19, 29, 35, ),
-        /* 102 */ array(16, 19, 29, 35, ),
-        /* 103 */ array(1, 2, 17, ),
-        /* 104 */ array(1, 29, 35, ),
-        /* 105 */ array(1, 29, 35, ),
-        /* 106 */ array(18, 19, 63, ),
-        /* 107 */ array(21, 59, 64, ),
-        /* 108 */ array(18, 38, ),
-        /* 109 */ array(10, 16, 22, 23, 28, 32, 33, 34, 78, 79, 80, ),
-        /* 110 */ array(4, 5, 6, 7, 8, 13, 14, 15, ),
-        /* 111 */ array(1, 17, 29, 30, 35, 54, ),
-        /* 112 */ array(1, 17, 29, 35, 54, ),
-        /* 113 */ array(1, 17, 29, 35, 54, ),
-        /* 114 */ array(16, 19, 20, 25, ),
-        /* 115 */ array(16, 19, 20, 62, ),
-        /* 116 */ array(16, 19, 62, ),
-        /* 117 */ array(16, 19, 20, ),
-        /* 118 */ array(1, 31, 54, ),
-        /* 119 */ array(20, 21, 61, ),
-        /* 120 */ array(1, 17, 54, ),
-        /* 121 */ array(20, 21, 61, ),
-        /* 122 */ array(1, 17, 21, ),
-        /* 123 */ array(17, 29, 35, ),
-        /* 124 */ array(16, 19, ),
-        /* 125 */ array(16, 19, ),
-        /* 126 */ array(16, 19, ),
-        /* 127 */ array(29, 35, ),
-        /* 128 */ array(16, 19, ),
-        /* 129 */ array(18, 38, ),
-        /* 130 */ array(16, 19, ),
-        /* 131 */ array(16, 19, ),
-        /* 132 */ array(1, 17, ),
-        /* 133 */ array(16, 19, ),
-        /* 134 */ array(29, 35, ),
-        /* 135 */ array(21, 61, ),
-        /* 136 */ array(18, 19, ),
-        /* 137 */ array(16, 19, ),
-        /* 138 */ array(16, 19, ),
-        /* 139 */ array(18, 38, ),
-        /* 140 */ array(16, 19, ),
-        /* 141 */ array(1, 54, ),
-        /* 142 */ array(16, 19, ),
-        /* 143 */ array(16, 19, ),
-        /* 144 */ array(18, 19, ),
-        /* 145 */ array(16, 19, ),
-        /* 146 */ array(16, 19, ),
-        /* 147 */ array(1, ),
-        /* 148 */ array(21, ),
-        /* 149 */ array(1, ),
-        /* 150 */ array(1, ),
-        /* 151 */ array(1, ),
-        /* 152 */ array(1, ),
-        /* 153 */ array(1, ),
-        /* 154 */ array(1, ),
-        /* 155 */ array(21, ),
-        /* 156 */ array(1, ),
-        /* 157 */ array(),
-        /* 158 */ array(17, 29, 35, ),
-        /* 159 */ array(17, 29, 35, ),
-        /* 160 */ array(16, 19, 62, ),
-        /* 161 */ array(17, 29, 35, ),
-        /* 162 */ array(17, 29, 35, ),
-        /* 163 */ array(17, 29, 35, ),
-        /* 164 */ array(17, 29, 35, ),
-        /* 165 */ array(17, 29, 35, ),
-        /* 166 */ array(17, 29, 35, ),
-        /* 167 */ array(17, 29, 35, ),
-        /* 168 */ array(17, 29, 35, ),
-        /* 169 */ array(17, 29, 35, ),
-        /* 170 */ array(17, 29, 35, ),
-        /* 171 */ array(17, 29, 35, ),
-        /* 172 */ array(17, 29, 35, ),
-        /* 173 */ array(16, 18, 19, ),
-        /* 174 */ array(17, 29, 35, ),
-        /* 175 */ array(17, 29, 35, ),
-        /* 176 */ array(17, 29, 35, ),
-        /* 177 */ array(17, 29, 35, ),
-        /* 178 */ array(17, 29, 35, ),
-        /* 179 */ array(17, 29, 35, ),
-        /* 180 */ array(59, 64, ),
-        /* 181 */ array(1, 17, ),
-        /* 182 */ array(59, 64, ),
-        /* 183 */ array(59, 64, ),
-        /* 184 */ array(1, 17, ),
-        /* 185 */ array(59, 64, ),
-        /* 186 */ array(59, 64, ),
-        /* 187 */ array(59, 64, ),
-        /* 188 */ array(1, 17, ),
-        /* 189 */ array(59, 64, ),
-        /* 190 */ array(16, 38, ),
-        /* 191 */ array(59, 64, ),
-        /* 192 */ array(59, 64, ),
-        /* 193 */ array(14, ),
-        /* 194 */ array(21, ),
-        /* 195 */ array(21, ),
-        /* 196 */ array(21, ),
-        /* 197 */ array(38, ),
-        /* 198 */ array(1, ),
-        /* 199 */ array(2, ),
-        /* 200 */ array(29, ),
-        /* 201 */ array(29, ),
-        /* 202 */ array(1, ),
-        /* 203 */ array(2, ),
-        /* 204 */ array(),
-        /* 205 */ array(),
-        /* 206 */ array(),
-        /* 207 */ array(),
-        /* 208 */ array(),
-        /* 209 */ array(17, 24, 26, 27, 29, 30, 35, 37, 38, 39, 54, 61, 65, 79, ),
-        /* 210 */ array(17, 20, 29, 35, 38, 61, ),
-        /* 211 */ array(38, 59, 61, 65, ),
-        /* 212 */ array(16, 18, 19, 36, ),
-        /* 213 */ array(31, 38, 61, ),
-        /* 214 */ array(38, 61, ),
-        /* 215 */ array(2, 20, ),
-        /* 216 */ array(38, 61, ),
-        /* 217 */ array(24, 37, ),
-        /* 218 */ array(37, 65, ),
-        /* 219 */ array(17, 25, ),
-        /* 220 */ array(37, 39, ),
-        /* 221 */ array(20, 59, ),
-        /* 222 */ array(37, 39, ),
-        /* 223 */ array(37, 39, ),
-        /* 224 */ array(25, 79, ),
-        /* 225 */ array(19, 62, ),
-        /* 226 */ array(63, ),
-        /* 227 */ array(19, ),
-        /* 228 */ array(65, ),
-        /* 229 */ array(19, ),
-        /* 230 */ array(19, ),
-        /* 231 */ array(19, ),
-        /* 232 */ array(25, ),
-        /* 233 */ array(63, ),
-        /* 234 */ array(19, ),
-        /* 235 */ array(59, ),
-        /* 236 */ array(36, ),
-        /* 237 */ array(36, ),
-        /* 238 */ array(39, ),
-        /* 239 */ array(19, ),
-        /* 240 */ array(55, ),
-        /* 241 */ array(2, ),
-        /* 242 */ array(38, ),
-        /* 243 */ array(18, ),
-        /* 244 */ array(18, ),
-        /* 245 */ array(18, ),
-        /* 246 */ array(19, ),
-        /* 247 */ array(18, ),
-        /* 248 */ array(20, ),
-        /* 249 */ array(19, ),
-        /* 250 */ array(19, ),
-        /* 251 */ array(2, ),
-        /* 252 */ array(26, ),
-        /* 253 */ array(38, ),
-        /* 254 */ array(19, ),
-        /* 255 */ array(19, ),
-        /* 256 */ array(18, ),
-        /* 257 */ array(),
-        /* 258 */ array(),
-        /* 259 */ array(),
-        /* 260 */ array(),
-        /* 261 */ array(),
-        /* 262 */ array(),
-        /* 263 */ array(),
-        /* 264 */ array(),
-        /* 265 */ array(),
-        /* 266 */ array(),
-        /* 267 */ array(),
-        /* 268 */ array(),
-        /* 269 */ array(),
-        /* 270 */ array(),
-        /* 271 */ array(),
-        /* 272 */ array(),
-        /* 273 */ array(),
-        /* 274 */ array(),
-        /* 275 */ array(),
-        /* 276 */ array(),
-        /* 277 */ array(),
-        /* 278 */ array(),
-        /* 279 */ array(),
-        /* 280 */ array(),
-        /* 281 */ array(),
-        /* 282 */ array(),
-        /* 283 */ array(),
-        /* 284 */ array(),
-        /* 285 */ array(),
-        /* 286 */ array(),
-        /* 287 */ array(),
-        /* 288 */ array(),
-        /* 289 */ array(),
-        /* 290 */ array(),
-        /* 291 */ array(),
-        /* 292 */ array(),
-        /* 293 */ array(),
-        /* 294 */ array(),
-        /* 295 */ array(),
-        /* 296 */ array(),
-        /* 297 */ array(),
-        /* 298 */ array(),
-        /* 299 */ array(),
-        /* 300 */ array(),
-        /* 301 */ array(),
-        /* 302 */ array(),
-        /* 303 */ array(),
-        /* 304 */ array(),
-        /* 305 */ array(),
-        /* 306 */ array(),
-        /* 307 */ array(),
-        /* 308 */ array(),
-        /* 309 */ array(),
-        /* 310 */ array(),
-        /* 311 */ array(),
-        /* 312 */ array(),
-        /* 313 */ array(),
-        /* 314 */ array(),
-        /* 315 */ array(),
-        /* 316 */ array(),
-        /* 317 */ array(),
-        /* 318 */ array(),
-        /* 319 */ array(),
-        /* 320 */ array(),
-        /* 321 */ array(),
-        /* 322 */ array(),
-        /* 323 */ array(),
-        /* 324 */ array(),
-        /* 325 */ array(),
-        /* 326 */ array(),
-        /* 327 */ array(),
-        /* 328 */ array(),
-        /* 329 */ array(),
-        /* 330 */ array(),
-        /* 331 */ array(),
-        /* 332 */ array(),
-        /* 333 */ array(),
-        /* 334 */ array(),
-        /* 335 */ array(),
-        /* 336 */ array(),
-        /* 337 */ array(),
-        /* 338 */ array(),
-        /* 339 */ array(),
-        /* 340 */ array(),
-        /* 341 */ array(),
-        /* 342 */ array(),
-        /* 343 */ array(),
-        /* 344 */ array(),
-        /* 345 */ array(),
-        /* 346 */ array(),
-        /* 347 */ array(),
-        /* 348 */ array(),
-        /* 349 */ array(),
-        /* 350 */ array(),
-        /* 351 */ array(),
-        /* 352 */ array(),
-        /* 353 */ array(),
-        /* 354 */ array(),
-        /* 355 */ array(),
-        /* 356 */ array(),
-        /* 357 */ array(),
-        /* 358 */ array(),
-        /* 359 */ array(),
-        /* 360 */ array(),
-        /* 361 */ array(),
-        /* 362 */ array(),
-        /* 363 */ array(),
-        /* 364 */ array(),
-        /* 365 */ array(),
-        /* 366 */ array(),
-        /* 367 */ array(),
-        /* 368 */ array(),
-        /* 369 */ array(),
-        /* 370 */ array(),
-        /* 371 */ array(),
-        /* 372 */ array(),
-        /* 373 */ array(),
-        /* 374 */ array(),
-        /* 375 */ array(),
-        /* 376 */ array(),
-        /* 377 */ array(),
-        /* 378 */ array(),
-        /* 379 */ array(),
-        /* 380 */ array(),
-        /* 381 */ array(),
-        /* 382 */ array(),
-        /* 383 */ array(),
-        /* 384 */ array(),
-        /* 385 */ array(),
-        /* 386 */ array(),
-        /* 387 */ array(),
-        /* 388 */ array(),
-        /* 389 */ array(),
-        /* 390 */ array(),
-);
-    static public $yy_default = array(
- /*     0 */   394,  578,  549,  549,  595,  549,  595,  595,  595,  595,
- /*    10 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*    20 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*    30 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*    40 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*    50 */   595,  595,  595,  455,  595,  595,  595,  455,  455,  455,
- /*    60 */   595,  595,  595,  595,  595,  595,  595,  595,  460,  595,
- /*    70 */   595,  466,  465,  484,  547,  579,  581,  548,  580,  489,
- /*    80 */   488,  480,  479,  481,  457,  485,  462,  476,  460,  437,
- /*    90 */   492,  493,  504,  468,  455,  391,  595,  455,  455,  475,
- /*   100 */   512,  455,  455,  595,  455,  455,  595,  561,  595,  595,
- /*   110 */   595,  468,  468,  468,  595,  522,  522,  522,  468,  513,
- /*   120 */   468,  513,  595,  595,  595,  595,  595,  455,  595,  595,
- /*   130 */   595,  595,  595,  595,  455,  513,  595,  595,  595,  595,
- /*   140 */   595,  468,  595,  595,  595,  595,  522,  473,  558,  491,
- /*   150 */   478,  472,  497,  495,  496,  513,  471,  556,  595,  595,
- /*   160 */   523,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*   170 */   595,  595,  595,  595,  595,  595,  595,  595,  595,  595,
- /*   180 */   516,  595,  518,  519,  595,  520,  540,  542,  595,  539,
- /*   190 */   522,  517,  541,  410,  562,  559,  536,  522,  475,  551,
- /*   200 */   594,  594,  512,  550,  522,  555,  555,  555,  522,  470,
- /*   210 */   504,  504,  595,  504,  490,  534,  504,  595,  595,  494,
- /*   220 */   595,  500,  595,  595,  494,  595,  595,  595,  595,  595,
- /*   230 */   595,  595,  494,  595,  595,  500,  502,  595,  595,  595,
- /*   240 */   506,  534,  560,  595,  595,  595,  595,  595,  595,  595,
- /*   250 */   595,  534,  463,  534,  595,  595,  595,  401,  543,  400,
- /*   260 */   402,  546,  445,  398,  397,  393,  464,  438,  593,  467,
- /*   270 */   435,  395,  440,  434,  439,  396,  399,  456,  531,  420,
- /*   280 */   529,  392,  528,  506,  527,  535,  444,  557,  545,  544,
- /*   290 */   530,  412,  453,  526,  505,  419,  507,  525,  532,  470,
- /*   300 */   514,  521,  524,  508,  510,  482,  483,  416,  415,  417,
- /*   310 */   418,  477,  511,  515,  538,  469,  509,  534,  533,  432,
- /*   320 */   446,  447,  443,  442,  436,  454,  433,  441,  554,  448,
- /*   330 */   498,  499,  501,  503,  452,  451,  449,  450,  552,  553,
- /*   340 */   486,  487,  589,  430,  582,  583,  584,  431,  429,  426,
- /*   350 */   537,  427,  428,  406,  587,  575,  404,  577,  576,  405,
- /*   360 */   585,  586,  588,  591,  592,  425,  424,  569,  568,  570,
- /*   370 */   571,  572,  567,  566,  414,  563,  564,  565,  573,  574,
- /*   380 */   422,  590,  407,  423,  421,  408,  474,  413,  411,  409,
- /*   390 */   403,
-);
-    const YYNOCODE = 124;
-    const YYSTACKDEPTH = 100;
-    const YYNSTATE = 391;
-    const YYNRULE = 204;
-    const YYERRORSYMBOL = 81;
     const YYERRSYMDT = 'yy0';
+
     const YYFALLBACK = 0;
-    static public $yyFallback = array(
-    );
-    static function Trace($TraceFILE, $zTracePrompt)
+
+    public static $yyFallback = array();
+
+    public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
             $zTracePrompt = 0;
         } elseif (!$zTracePrompt) {
             $TraceFILE = 0;
         }
-        self::$yyTraceFILE = $TraceFILE;
-        self::$yyTracePrompt = $zTracePrompt;
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
     }
 
-    static function PrintTrace()
+    public function PrintTrace()
     {
-        self::$yyTraceFILE = fopen('php://output', 'w');
-        self::$yyTracePrompt = '<br>';
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
     }
 
-    static public $yyTraceFILE;
-    static public $yyTracePrompt;
+    public $yyTraceFILE;
+
+    public $yyTracePrompt;
+
     public $yyidx;                    /* Index of top element in stack */
     public $yyerrcnt;                 /* Shifts left before out of the error */
     public $yystack = array();  /* The parser's stack */
 
-    public $yyTokenName = array(
-  '$',             'VERT',          'COLON',         'COMMENT',
-  'PHPSTARTTAG',   'PHPENDTAG',     'ASPSTARTTAG',   'ASPENDTAG',
-  'FAKEPHPSTARTTAG',  'XMLTAG',        'TEXT',          'STRIPON',
-  'STRIPOFF',      'LITERALSTART',  'LITERALEND',    'LITERAL',
-  'LDEL',          'RDEL',          'DOLLAR',        'ID',
-  'EQUAL',         'PTR',           'LDELIF',        'LDELFOR',
-  'SEMICOLON',     'INCDEC',        'TO',            'STEP',
-  'LDELFOREACH',   'SPACE',         'AS',            'APTR',
-  'LDELSETFILTER',  'SMARTYBLOCKCHILD',  'LDELSLASH',     'ATTR',
-  'INTEGER',       'COMMA',         'OPENP',         'CLOSEP',
-  'MATH',          'UNIMATH',       'ANDSYM',        'ISIN',
-  'ISDIVBY',       'ISNOTDIVBY',    'ISEVEN',        'ISNOTEVEN',
-  'ISEVENBY',      'ISNOTEVENBY',   'ISODD',         'ISNOTODD',
-  'ISODDBY',       'ISNOTODDBY',    'INSTANCEOF',    'QMARK',
-  'NOT',           'TYPECAST',      'HEX',           'DOT',
-  'SINGLEQUOTESTRING',  'DOUBLECOLON',   'AT',            'HATCH',
-  'OPENB',         'CLOSEB',        'EQUALS',        'NOTEQUALS',
-  'GREATERTHAN',   'LESSTHAN',      'GREATEREQUAL',  'LESSEQUAL',
-  'IDENTITY',      'NONEIDENTITY',  'MOD',           'LAND',
-  'LOR',           'LXOR',          'QUOTE',         'BACKTICK',
-  'DOLLARID',      'error',         'start',         'template',
-  'template_element',  'smartytag',     'literal',       'literal_elements',
-  'literal_element',  'value',         'modifierlist',  'attributes',
-  'expr',          'varindexed',    'statement',     'statements',
-  'optspace',      'varvar',        'foraction',     'modparameters',
-  'attribute',     'ternary',       'array',         'ifcond',
-  'lop',           'variable',      'function',      'doublequoted_with_quotes',
-  'static_class_access',  'object',        'arrayindex',    'indexdef',
-  'varvarele',     'objectchain',   'objectelement',  'method',
-  'params',        'modifier',      'modparameter',  'arrayelements',
-  'arrayelement',  'doublequoted',  'doublequotedcontent',
-    );
+    public $yyTokenName = array('$', 'VERT', 'COLON', 'PHP', 'NOCACHE', 'TEXT', 'STRIPON', 'STRIPOFF', 'LITERALSTART',
+                                'LITERALEND', 'LITERAL', 'RDEL', 'SIMPELOUTPUT', 'LDEL', 'DOLLARID', 'EQUAL',
+                                'SIMPLETAG', 'ID', 'PTR', 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO', 'STEP',
+                                'LDELFOREACH', 'SPACE', 'AS', 'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT',
+                                'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA', 'OPENP', 'CLOSEP', 'MATH',
+                                'UNIMATH', 'ISIN', 'INSTANCEOF', 'QMARK', 'NOT', 'TYPECAST', 'HEX', 'DOT',
+                                'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH', 'OPENB', 'CLOSEB',
+                                'DOLLAR', 'LOGOP', 'TLOGOP', 'SINGLECOND', 'QUOTE', 'BACKTICK', 'error', 'start',
+                                'template', 'template_element', 'smartytag', 'literal', 'text_content',
+                                'literal_elements', 'literal_element', 'tag', 'variable', 'attributes', 'value', 'expr',
+                                'varindexed', 'modifierlist', 'statement', 'statements', 'foraction', 'varvar',
+                                'modparameters', 'attribute', 'ternary', 'array', 'lop', 'scond', 'ns1', 'function',
+                                'doublequoted_with_quotes', 'static_class_access', 'object', 'arrayindex', 'indexdef',
+                                'varvarele', 'objectchain', 'objectelement', 'method', 'params', 'modifier',
+                                'modparameter', 'arrayelements', 'arrayelement', 'doublequoted',
+                                'doublequotedcontent',);
 
-    static public $yyRuleName = array(
- /*   0 */ "start ::= template",
- /*   1 */ "template ::= template_element",
- /*   2 */ "template ::= template template_element",
- /*   3 */ "template ::=",
- /*   4 */ "template_element ::= smartytag",
- /*   5 */ "template_element ::= COMMENT",
- /*   6 */ "template_element ::= literal",
- /*   7 */ "template_element ::= PHPSTARTTAG",
- /*   8 */ "template_element ::= PHPENDTAG",
- /*   9 */ "template_element ::= ASPSTARTTAG",
- /*  10 */ "template_element ::= ASPENDTAG",
- /*  11 */ "template_element ::= FAKEPHPSTARTTAG",
- /*  12 */ "template_element ::= XMLTAG",
- /*  13 */ "template_element ::= TEXT",
- /*  14 */ "template_element ::= STRIPON",
- /*  15 */ "template_element ::= STRIPOFF",
- /*  16 */ "literal ::= LITERALSTART LITERALEND",
- /*  17 */ "literal ::= LITERALSTART literal_elements LITERALEND",
- /*  18 */ "literal_elements ::= literal_elements literal_element",
- /*  19 */ "literal_elements ::=",
- /*  20 */ "literal_element ::= literal",
- /*  21 */ "literal_element ::= LITERAL",
- /*  22 */ "literal_element ::= PHPSTARTTAG",
- /*  23 */ "literal_element ::= FAKEPHPSTARTTAG",
- /*  24 */ "literal_element ::= PHPENDTAG",
- /*  25 */ "literal_element ::= ASPSTARTTAG",
- /*  26 */ "literal_element ::= ASPENDTAG",
- /*  27 */ "smartytag ::= LDEL value RDEL",
- /*  28 */ "smartytag ::= LDEL value modifierlist attributes RDEL",
- /*  29 */ "smartytag ::= LDEL value attributes RDEL",
- /*  30 */ "smartytag ::= LDEL expr modifierlist attributes RDEL",
- /*  31 */ "smartytag ::= LDEL expr attributes RDEL",
- /*  32 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL",
- /*  33 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL",
- /*  34 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL",
- /*  35 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL",
- /*  36 */ "smartytag ::= LDEL ID attributes RDEL",
- /*  37 */ "smartytag ::= LDEL ID RDEL",
- /*  38 */ "smartytag ::= LDEL ID PTR ID attributes RDEL",
- /*  39 */ "smartytag ::= LDEL ID modifierlist attributes RDEL",
- /*  40 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL",
- /*  41 */ "smartytag ::= LDELIF expr RDEL",
- /*  42 */ "smartytag ::= LDELIF expr attributes RDEL",
- /*  43 */ "smartytag ::= LDELIF statement RDEL",
- /*  44 */ "smartytag ::= LDELIF statement attributes RDEL",
- /*  45 */ "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL",
- /*  46 */ "foraction ::= EQUAL expr",
- /*  47 */ "foraction ::= INCDEC",
- /*  48 */ "smartytag ::= LDELFOR statement TO expr attributes RDEL",
- /*  49 */ "smartytag ::= LDELFOR statement TO expr STEP expr attributes RDEL",
- /*  50 */ "smartytag ::= LDELFOREACH attributes RDEL",
- /*  51 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL",
- /*  52 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
- /*  53 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL",
- /*  54 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
- /*  55 */ "smartytag ::= LDELSETFILTER ID modparameters RDEL",
- /*  56 */ "smartytag ::= LDELSETFILTER ID modparameters modifierlist RDEL",
- /*  57 */ "smartytag ::= SMARTYBLOCKCHILD",
- /*  58 */ "smartytag ::= LDELSLASH ID RDEL",
- /*  59 */ "smartytag ::= LDELSLASH ID modifierlist RDEL",
- /*  60 */ "smartytag ::= LDELSLASH ID PTR ID RDEL",
- /*  61 */ "smartytag ::= LDELSLASH ID PTR ID modifierlist RDEL",
- /*  62 */ "attributes ::= attributes attribute",
- /*  63 */ "attributes ::= attribute",
- /*  64 */ "attributes ::=",
- /*  65 */ "attribute ::= SPACE ID EQUAL ID",
- /*  66 */ "attribute ::= ATTR expr",
- /*  67 */ "attribute ::= ATTR value",
- /*  68 */ "attribute ::= SPACE ID",
- /*  69 */ "attribute ::= SPACE expr",
- /*  70 */ "attribute ::= SPACE value",
- /*  71 */ "attribute ::= SPACE INTEGER EQUAL expr",
- /*  72 */ "statements ::= statement",
- /*  73 */ "statements ::= statements COMMA statement",
- /*  74 */ "statement ::= DOLLAR varvar EQUAL expr",
- /*  75 */ "statement ::= varindexed EQUAL expr",
- /*  76 */ "statement ::= OPENP statement CLOSEP",
- /*  77 */ "expr ::= value",
- /*  78 */ "expr ::= ternary",
- /*  79 */ "expr ::= DOLLAR ID COLON ID",
- /*  80 */ "expr ::= expr MATH value",
- /*  81 */ "expr ::= expr UNIMATH value",
- /*  82 */ "expr ::= expr ANDSYM value",
- /*  83 */ "expr ::= array",
- /*  84 */ "expr ::= expr modifierlist",
- /*  85 */ "expr ::= expr ifcond expr",
- /*  86 */ "expr ::= expr ISIN array",
- /*  87 */ "expr ::= expr ISIN value",
- /*  88 */ "expr ::= expr lop expr",
- /*  89 */ "expr ::= expr ISDIVBY expr",
- /*  90 */ "expr ::= expr ISNOTDIVBY expr",
- /*  91 */ "expr ::= expr ISEVEN",
- /*  92 */ "expr ::= expr ISNOTEVEN",
- /*  93 */ "expr ::= expr ISEVENBY expr",
- /*  94 */ "expr ::= expr ISNOTEVENBY expr",
- /*  95 */ "expr ::= expr ISODD",
- /*  96 */ "expr ::= expr ISNOTODD",
- /*  97 */ "expr ::= expr ISODDBY expr",
- /*  98 */ "expr ::= expr ISNOTODDBY expr",
- /*  99 */ "expr ::= value INSTANCEOF ID",
- /* 100 */ "expr ::= value INSTANCEOF value",
- /* 101 */ "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
- /* 102 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
- /* 103 */ "value ::= variable",
- /* 104 */ "value ::= UNIMATH value",
- /* 105 */ "value ::= NOT value",
- /* 106 */ "value ::= TYPECAST value",
- /* 107 */ "value ::= variable INCDEC",
- /* 108 */ "value ::= HEX",
- /* 109 */ "value ::= INTEGER",
- /* 110 */ "value ::= INTEGER DOT INTEGER",
- /* 111 */ "value ::= INTEGER DOT",
- /* 112 */ "value ::= DOT INTEGER",
- /* 113 */ "value ::= ID",
- /* 114 */ "value ::= function",
- /* 115 */ "value ::= OPENP expr CLOSEP",
- /* 116 */ "value ::= SINGLEQUOTESTRING",
- /* 117 */ "value ::= doublequoted_with_quotes",
- /* 118 */ "value ::= ID DOUBLECOLON static_class_access",
- /* 119 */ "value ::= varindexed DOUBLECOLON static_class_access",
- /* 120 */ "value ::= smartytag",
- /* 121 */ "value ::= value modifierlist",
- /* 122 */ "variable ::= varindexed",
- /* 123 */ "variable ::= DOLLAR varvar AT ID",
- /* 124 */ "variable ::= object",
- /* 125 */ "variable ::= HATCH ID HATCH",
- /* 126 */ "variable ::= HATCH ID HATCH arrayindex",
- /* 127 */ "variable ::= HATCH variable HATCH",
- /* 128 */ "variable ::= HATCH variable HATCH arrayindex",
- /* 129 */ "varindexed ::= DOLLAR varvar arrayindex",
- /* 130 */ "arrayindex ::= arrayindex indexdef",
- /* 131 */ "arrayindex ::=",
- /* 132 */ "indexdef ::= DOT DOLLAR varvar",
- /* 133 */ "indexdef ::= DOT DOLLAR varvar AT ID",
- /* 134 */ "indexdef ::= DOT ID",
- /* 135 */ "indexdef ::= DOT INTEGER",
- /* 136 */ "indexdef ::= DOT LDEL expr RDEL",
- /* 137 */ "indexdef ::= OPENB ID CLOSEB",
- /* 138 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
- /* 139 */ "indexdef ::= OPENB expr CLOSEB",
- /* 140 */ "indexdef ::= OPENB CLOSEB",
- /* 141 */ "varvar ::= varvarele",
- /* 142 */ "varvar ::= varvar varvarele",
- /* 143 */ "varvarele ::= ID",
- /* 144 */ "varvarele ::= LDEL expr RDEL",
- /* 145 */ "object ::= varindexed objectchain",
- /* 146 */ "objectchain ::= objectelement",
- /* 147 */ "objectchain ::= objectchain objectelement",
- /* 148 */ "objectelement ::= PTR ID arrayindex",
- /* 149 */ "objectelement ::= PTR DOLLAR varvar arrayindex",
- /* 150 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
- /* 151 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
- /* 152 */ "objectelement ::= PTR method",
- /* 153 */ "function ::= ID OPENP params CLOSEP",
- /* 154 */ "method ::= ID OPENP params CLOSEP",
- /* 155 */ "method ::= DOLLAR ID OPENP params CLOSEP",
- /* 156 */ "params ::= params COMMA expr",
- /* 157 */ "params ::= expr",
- /* 158 */ "params ::=",
- /* 159 */ "modifierlist ::= modifierlist modifier modparameters",
- /* 160 */ "modifierlist ::= modifier modparameters",
- /* 161 */ "modifier ::= VERT AT ID",
- /* 162 */ "modifier ::= VERT ID",
- /* 163 */ "modparameters ::= modparameters modparameter",
- /* 164 */ "modparameters ::=",
- /* 165 */ "modparameter ::= COLON value",
- /* 166 */ "modparameter ::= COLON array",
- /* 167 */ "static_class_access ::= method",
- /* 168 */ "static_class_access ::= method objectchain",
- /* 169 */ "static_class_access ::= ID",
- /* 170 */ "static_class_access ::= DOLLAR ID arrayindex",
- /* 171 */ "static_class_access ::= DOLLAR ID arrayindex objectchain",
- /* 172 */ "ifcond ::= EQUALS",
- /* 173 */ "ifcond ::= NOTEQUALS",
- /* 174 */ "ifcond ::= GREATERTHAN",
- /* 175 */ "ifcond ::= LESSTHAN",
- /* 176 */ "ifcond ::= GREATEREQUAL",
- /* 177 */ "ifcond ::= LESSEQUAL",
- /* 178 */ "ifcond ::= IDENTITY",
- /* 179 */ "ifcond ::= NONEIDENTITY",
- /* 180 */ "ifcond ::= MOD",
- /* 181 */ "lop ::= LAND",
- /* 182 */ "lop ::= LOR",
- /* 183 */ "lop ::= LXOR",
- /* 184 */ "array ::= OPENB arrayelements CLOSEB",
- /* 185 */ "arrayelements ::= arrayelement",
- /* 186 */ "arrayelements ::= arrayelements COMMA arrayelement",
- /* 187 */ "arrayelements ::=",
- /* 188 */ "arrayelement ::= value APTR expr",
- /* 189 */ "arrayelement ::= ID APTR expr",
- /* 190 */ "arrayelement ::= expr",
- /* 191 */ "doublequoted_with_quotes ::= QUOTE QUOTE",
- /* 192 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
- /* 193 */ "doublequoted ::= doublequoted doublequotedcontent",
- /* 194 */ "doublequoted ::= doublequotedcontent",
- /* 195 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
- /* 196 */ "doublequotedcontent ::= BACKTICK expr BACKTICK",
- /* 197 */ "doublequotedcontent ::= DOLLARID",
- /* 198 */ "doublequotedcontent ::= LDEL variable RDEL",
- /* 199 */ "doublequotedcontent ::= LDEL expr RDEL",
- /* 200 */ "doublequotedcontent ::= smartytag",
- /* 201 */ "doublequotedcontent ::= TEXT",
- /* 202 */ "optspace ::= SPACE",
- /* 203 */ "optspace ::=",
-    );
+    public static $yyRuleName = array('start ::= template', 'template ::= template_element',
+                                      'template ::= template template_element', 'template ::=',
+                                      'template_element ::= smartytag', 'template_element ::= literal',
+                                      'template_element ::= PHP', 'template_element ::= NOCACHE',
+                                      'template_element ::= text_content', 'text_content ::= TEXT',
+                                      'text_content ::= text_content TEXT', 'template_element ::= STRIPON',
+                                      'template_element ::= STRIPOFF', 'literal ::= LITERALSTART LITERALEND',
+                                      'literal ::= LITERALSTART literal_elements LITERALEND',
+                                      'literal_elements ::= literal_elements literal_element', 'literal_elements ::=',
+                                      'literal_element ::= literal', 'literal_element ::= LITERAL',
+                                      'smartytag ::= tag RDEL', 'smartytag ::= SIMPELOUTPUT', 'tag ::= LDEL variable',
+                                      'tag ::= LDEL variable attributes', 'tag ::= LDEL value',
+                                      'tag ::= LDEL value attributes', 'tag ::= LDEL expr',
+                                      'tag ::= LDEL expr attributes', 'tag ::= LDEL DOLLARID EQUAL value',
+                                      'tag ::= LDEL DOLLARID EQUAL expr', 'tag ::= LDEL DOLLARID EQUAL expr attributes',
+                                      'tag ::= LDEL varindexed EQUAL expr attributes', 'smartytag ::= SIMPLETAG',
+                                      'tag ::= LDEL ID attributes', 'tag ::= LDEL ID',
+                                      'tag ::= LDEL ID modifierlist attributes', 'tag ::= LDEL ID PTR ID attributes',
+                                      'tag ::= LDEL ID PTR ID modifierlist attributes', 'tag ::= LDELIF expr',
+                                      'tag ::= LDELIF expr attributes', 'tag ::= LDELIF statement',
+                                      'tag ::= LDELIF statement attributes',
+                                      'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+                                      'foraction ::= EQUAL expr', 'foraction ::= INCDEC',
+                                      'tag ::= LDELFOR statement TO expr attributes',
+                                      'tag ::= LDELFOR statement TO expr STEP expr attributes',
+                                      'tag ::= LDELFOREACH attributes',
+                                      'tag ::= LDELFOREACH SPACE value AS varvar attributes',
+                                      'tag ::= LDELFOREACH SPACE value AS varvar APTR varvar attributes',
+                                      'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+                                      'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+                                      'tag ::= LDELSETFILTER ID modparameters',
+                                      'tag ::= LDELSETFILTER ID modparameters modifierlist',
+                                      'tag ::= LDEL SMARTYBLOCKCHILDPARENT', 'smartytag ::= CLOSETAG',
+                                      'tag ::= LDELSLASH ID', 'tag ::= LDELSLASH ID modifierlist',
+                                      'tag ::= LDELSLASH ID PTR ID', 'tag ::= LDELSLASH ID PTR ID modifierlist',
+                                      'attributes ::= attributes attribute', 'attributes ::= attribute',
+                                      'attributes ::=', 'attribute ::= SPACE ID EQUAL ID', 'attribute ::= ATTR expr',
+                                      'attribute ::= ATTR value', 'attribute ::= SPACE ID', 'attribute ::= SPACE expr',
+                                      'attribute ::= SPACE value', 'attribute ::= SPACE INTEGER EQUAL expr',
+                                      'statements ::= statement', 'statements ::= statements COMMA statement',
+                                      'statement ::= DOLLARID EQUAL INTEGER', 'statement ::= DOLLARID EQUAL expr',
+                                      'statement ::= varindexed EQUAL expr', 'statement ::= OPENP statement CLOSEP',
+                                      'expr ::= value', 'expr ::= ternary', 'expr ::= DOLLARID COLON ID',
+                                      'expr ::= expr MATH value', 'expr ::= expr UNIMATH value', 'expr ::= array',
+                                      'expr ::= expr modifierlist', 'expr ::= expr lop expr', 'expr ::= expr scond',
+                                      'expr ::= expr ISIN array', 'expr ::= expr ISIN value',
+                                      'expr ::= variable INSTANCEOF ns1', 'expr ::= variable INSTANCEOF variable',
+                                      'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
+                                      'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr', 'value ::= variable',
+                                      'value ::= UNIMATH value', 'value ::= NOT value', 'value ::= TYPECAST value',
+                                      'value ::= variable INCDEC', 'value ::= HEX', 'value ::= INTEGER',
+                                      'value ::= INTEGER DOT INTEGER', 'value ::= INTEGER DOT', 'value ::= DOT INTEGER',
+                                      'value ::= ID', 'value ::= function', 'value ::= OPENP expr CLOSEP',
+                                      'value ::= SINGLEQUOTESTRING', 'value ::= doublequoted_with_quotes',
+                                      'value ::= varindexed DOUBLECOLON static_class_access', 'value ::= smartytag',
+                                      'value ::= value modifierlist', 'value ::= NAMESPACE',
+                                      'value ::= ns1 DOUBLECOLON static_class_access', 'ns1 ::= ID',
+                                      'ns1 ::= NAMESPACE', 'variable ::= DOLLARID', 'variable ::= varindexed',
+                                      'variable ::= varvar AT ID', 'variable ::= object', 'variable ::= HATCH ID HATCH',
+                                      'variable ::= HATCH ID HATCH arrayindex', 'variable ::= HATCH variable HATCH',
+                                      'variable ::= HATCH variable HATCH arrayindex',
+                                      'varindexed ::= DOLLARID arrayindex', 'varindexed ::= varvar arrayindex',
+                                      'arrayindex ::= arrayindex indexdef', 'arrayindex ::=',
+                                      'indexdef ::= DOT DOLLARID', 'indexdef ::= DOT varvar',
+                                      'indexdef ::= DOT varvar AT ID', 'indexdef ::= DOT ID',
+                                      'indexdef ::= DOT INTEGER', 'indexdef ::= DOT LDEL expr RDEL',
+                                      'indexdef ::= OPENB ID CLOSEB', 'indexdef ::= OPENB ID DOT ID CLOSEB',
+                                      'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+                                      'indexdef ::= OPENB INTEGER CLOSEB', 'indexdef ::= OPENB DOLLARID CLOSEB',
+                                      'indexdef ::= OPENB variable CLOSEB', 'indexdef ::= OPENB value CLOSEB',
+                                      'indexdef ::= OPENB expr CLOSEB', 'indexdef ::= OPENB CLOSEB',
+                                      'varvar ::= DOLLARID', 'varvar ::= DOLLAR', 'varvar ::= varvar varvarele',
+                                      'varvarele ::= ID', 'varvarele ::= SIMPELOUTPUT', 'varvarele ::= LDEL expr RDEL',
+                                      'object ::= varindexed objectchain', 'objectchain ::= objectelement',
+                                      'objectchain ::= objectchain objectelement',
+                                      'objectelement ::= PTR ID arrayindex', 'objectelement ::= PTR varvar arrayindex',
+                                      'objectelement ::= PTR LDEL expr RDEL arrayindex',
+                                      'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+                                      'objectelement ::= PTR method', 'function ::= ns1 OPENP params CLOSEP',
+                                      'method ::= ID OPENP params CLOSEP', 'method ::= DOLLARID OPENP params CLOSEP',
+                                      'params ::= params COMMA expr', 'params ::= expr', 'params ::=',
+                                      'modifierlist ::= modifierlist modifier modparameters',
+                                      'modifierlist ::= modifier modparameters', 'modifier ::= VERT AT ID',
+                                      'modifier ::= VERT ID', 'modparameters ::= modparameters modparameter',
+                                      'modparameters ::=', 'modparameter ::= COLON value',
+                                      'modparameter ::= COLON array', 'static_class_access ::= method',
+                                      'static_class_access ::= method objectchain', 'static_class_access ::= ID',
+                                      'static_class_access ::= DOLLARID arrayindex',
+                                      'static_class_access ::= DOLLARID arrayindex objectchain', 'lop ::= LOGOP',
+                                      'lop ::= TLOGOP', 'scond ::= SINGLECOND', 'array ::= OPENB arrayelements CLOSEB',
+                                      'arrayelements ::= arrayelement',
+                                      'arrayelements ::= arrayelements COMMA arrayelement', 'arrayelements ::=',
+                                      'arrayelement ::= value APTR expr', 'arrayelement ::= ID APTR expr',
+                                      'arrayelement ::= expr', 'doublequoted_with_quotes ::= QUOTE QUOTE',
+                                      'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+                                      'doublequoted ::= doublequoted doublequotedcontent',
+                                      'doublequoted ::= doublequotedcontent',
+                                      'doublequotedcontent ::= BACKTICK variable BACKTICK',
+                                      'doublequotedcontent ::= BACKTICK expr BACKTICK',
+                                      'doublequotedcontent ::= DOLLARID', 'doublequotedcontent ::= LDEL variable RDEL',
+                                      'doublequotedcontent ::= LDEL expr RDEL', 'doublequotedcontent ::= smartytag',
+                                      'doublequotedcontent ::= TEXT',);
 
-    function tokenName($tokenType)
+    public function tokenName($tokenType)
     {
         if ($tokenType === 0) {
             return 'End of Input';
         }
         if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[$tokenType];
+            return $this->yyTokenName[ $tokenType ];
         } else {
             return "Unknown";
         }
     }
 
-    static function yy_destructor($yymajor, $yypminor)
+    public static function yy_destructor($yymajor, $yypminor)
     {
         switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
+            default:
+                break;   /* If no destructor action specified: do nothing */
         }
     }
 
-    function yy_pop_parser_stack()
+    public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
-        if (self::$yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(self::$yyTraceFILE,
-                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] . "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx--;
+        $this->yyidx --;
+
         return $yymajor;
     }
 
-    function __destruct()
+    public function __destruct()
     {
         while ($this->yystack !== Array()) {
             $this->yy_pop_parser_stack();
         }
-        if (is_resource(self::$yyTraceFILE)) {
-            fclose(self::$yyTraceFILE);
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
         }
     }
 
-    function yy_get_expected_tokens($token)
+    public function yy_get_expected_tokens($token)
     {
-        $state = $this->yystack[$this->yyidx]->stateno;
-        $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[ $this->yyidx ]->stateno;
+        $expected = self::$yyExpectedTokens[ $state ];
+        if (isset($res3[ $state ][ $token ])) {
+            if ($res3[ $state ][ $token ]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+                return $expected;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -1529,7 +1082,7 @@ static public $yy_action = array(
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done ++ == 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -1537,26 +1090,34 @@ static public $yy_action = array(
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate])) {
-		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                            if (in_array($token,
-                                  self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return array_unique($expected);
+                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno,
+                                                              self::$yyRuleInfo[ $yyruleno ][ 0 ]);
+                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
+                        if (isset($res4[ $nextstate ][ $token ])) {
+                            if ($res4[ $nextstate ][ $token ]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[ $nextstate ][ $token ] =
+                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)
+                            ) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
                         }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
-                        $this->yyidx++;
+                        $this->yyidx ++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
+                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+                        $this->yystack[ $this->yyidx ] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
@@ -1577,19 +1138,28 @@ static public $yy_action = array(
             }
             break;
         } while (true);
-	$this->yyidx = $yyidx;
-	$this->yystack = $stack;
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
         return array_unique($expected);
     }
 
-    function yy_is_expected_token($token)
+    public function yy_is_expected_token($token)
     {
+        static $res = array();
+        static $res2 = array();
         if ($token === 0) {
             return true; // 0 is not part of this
         }
-        $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
+        $state = $this->yystack[ $this->yyidx ]->stateno;
+        if (isset($res[ $state ][ $token ])) {
+            if ($res[ $state ][ $token ]) {
+                return true;
+            }
+        } else {
+            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+                return true;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -1599,7 +1169,7 @@ static public $yy_action = array(
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done++ == 100) {
+                    if ($done ++ == 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -1607,23 +1177,31 @@ static public $yy_action = array(
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        return true;
+                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno,
+                                                              self::$yyRuleInfo[ $yyruleno ][ 0 ]);
+                    if (isset($res2[ $nextstate ][ $token ])) {
+                        if ($res2[ $nextstate ][ $token ]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[ $nextstate ][ $token ] = (isset(self::$yyExpectedTokens[ $nextstate ]) &&
+                            in_array($token, self::$yyExpectedTokens[ $nextstate ], true))
+                        ) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
-                        $this->yyidx++;
+                        $this->yyidx ++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
+                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+                        $this->yystack[ $this->yyidx ] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
@@ -1650,1473 +1228,1481 @@ static public $yy_action = array(
         } while (true);
         $this->yyidx = $yyidx;
         $this->yystack = $stack;
+
         return true;
     }
 
-   function yy_find_shift_action($iLookAhead)
+    public function yy_find_shift_action($iLookAhead)
     {
-        $stateno = $this->yystack[$this->yyidx]->stateno;
+        $stateno = $this->yystack[ $this->yyidx ]->stateno;
 
         /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[$stateno])) {
+        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
             // no shift actions
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         }
-        $i = self::$yy_shift_ofst[$stateno];
+        $i = self::$yy_shift_ofst[ $stateno ];
         if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         }
         if ($iLookAhead == self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if (self::$yyTraceFILE) {
-                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) &&
+                ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0
+            ) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE,
+                           $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[ $iLookAhead ] . " => " .
+                           $this->yyTokenName[ $iFallback ] . "\n");
                 }
+
                 return $this->yy_find_shift_action($iFallback);
             }
-            return self::$yy_default[$stateno];
+
+            return self::$yy_default[ $stateno ];
         } else {
-            return self::$yy_action[$i];
+            return self::$yy_action[ $i ];
         }
     }
 
-    function yy_find_reduce_action($stateno, $iLookAhead)
+    public function yy_find_reduce_action($stateno, $iLookAhead)
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
 
-        if (!isset(self::$yy_reduce_ofst[$stateno])) {
-            return self::$yy_default[$stateno];
+        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
+            return self::$yy_default[ $stateno ];
         }
-        $i = self::$yy_reduce_ofst[$stateno];
+        $i = self::$yy_reduce_ofst[ $stateno ];
         if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[$stateno];
+            return self::$yy_default[ $stateno ];
         }
         if ($iLookAhead == self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            return self::$yy_default[$stateno];
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) {
+            return self::$yy_default[ $stateno ];
         } else {
-            return self::$yy_action[$i];
+            return self::$yy_action[ $i ];
         }
     }
 
-    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
-        $this->yyidx++;
+        $this->yyidx ++;
         if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
-            if (self::$yyTraceFILE) {
-                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            $this->yyidx --;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
             }
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-#line 84 "smarty_internal_templateparser.y"
+            #line 214 "../smarty/lexer/smarty_internal_templateparser.y"
+
+            $this->internalError = true;
+            $this->compiler->trigger_template_error("Stack overflow in template parser");
 
-    $this->internalError = true;
-    $this->compiler->trigger_template_error("Stack overflow in template parser");
-#line 1724 "smarty_internal_templateparser.php"
             return;
         }
         $yytos = new TP_yyStackEntry;
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
-        if (self::$yyTraceFILE && $this->yyidx > 0) {
-            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
-                $yyNewState);
-            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
-            for($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(self::$yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i ++) {
+                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[ $this->yystack[ $i ]->major ]);
             }
-            fwrite(self::$yyTraceFILE,"\n");
+            fwrite($this->yyTraceFILE, "\n");
         }
     }
 
-    static public $yyRuleInfo = array(
-  array( 'lhs' => 82, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 2 ),
-  array( 'lhs' => 83, 'rhs' => 0 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 3 ),
-  array( 'lhs' => 87, 'rhs' => 2 ),
-  array( 'lhs' => 87, 'rhs' => 0 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 7 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 7 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 12 ),
-  array( 'lhs' => 98, 'rhs' => 2 ),
-  array( 'lhs' => 98, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 85, 'rhs' => 8 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 8 ),
-  array( 'lhs' => 85, 'rhs' => 11 ),
-  array( 'lhs' => 85, 'rhs' => 8 ),
-  array( 'lhs' => 85, 'rhs' => 11 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 85, 'rhs' => 4 ),
-  array( 'lhs' => 85, 'rhs' => 5 ),
-  array( 'lhs' => 85, 'rhs' => 6 ),
-  array( 'lhs' => 91, 'rhs' => 2 ),
-  array( 'lhs' => 91, 'rhs' => 1 ),
-  array( 'lhs' => 91, 'rhs' => 0 ),
-  array( 'lhs' => 100, 'rhs' => 4 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 4 ),
-  array( 'lhs' => 95, 'rhs' => 1 ),
-  array( 'lhs' => 95, 'rhs' => 3 ),
-  array( 'lhs' => 94, 'rhs' => 4 ),
-  array( 'lhs' => 94, 'rhs' => 3 ),
-  array( 'lhs' => 94, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 1 ),
-  array( 'lhs' => 92, 'rhs' => 1 ),
-  array( 'lhs' => 92, 'rhs' => 4 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 1 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 2 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 101, 'rhs' => 8 ),
-  array( 'lhs' => 101, 'rhs' => 7 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 105, 'rhs' => 1 ),
-  array( 'lhs' => 105, 'rhs' => 4 ),
-  array( 'lhs' => 105, 'rhs' => 1 ),
-  array( 'lhs' => 105, 'rhs' => 3 ),
-  array( 'lhs' => 105, 'rhs' => 4 ),
-  array( 'lhs' => 105, 'rhs' => 3 ),
-  array( 'lhs' => 105, 'rhs' => 4 ),
-  array( 'lhs' => 93, 'rhs' => 3 ),
-  array( 'lhs' => 110, 'rhs' => 2 ),
-  array( 'lhs' => 110, 'rhs' => 0 ),
-  array( 'lhs' => 111, 'rhs' => 3 ),
-  array( 'lhs' => 111, 'rhs' => 5 ),
-  array( 'lhs' => 111, 'rhs' => 2 ),
-  array( 'lhs' => 111, 'rhs' => 2 ),
-  array( 'lhs' => 111, 'rhs' => 4 ),
-  array( 'lhs' => 111, 'rhs' => 3 ),
-  array( 'lhs' => 111, 'rhs' => 5 ),
-  array( 'lhs' => 111, 'rhs' => 3 ),
-  array( 'lhs' => 111, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 1 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 112, 'rhs' => 1 ),
-  array( 'lhs' => 112, 'rhs' => 3 ),
-  array( 'lhs' => 109, 'rhs' => 2 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 2 ),
-  array( 'lhs' => 114, 'rhs' => 3 ),
-  array( 'lhs' => 114, 'rhs' => 4 ),
-  array( 'lhs' => 114, 'rhs' => 5 ),
-  array( 'lhs' => 114, 'rhs' => 6 ),
-  array( 'lhs' => 114, 'rhs' => 2 ),
-  array( 'lhs' => 106, 'rhs' => 4 ),
-  array( 'lhs' => 115, 'rhs' => 4 ),
-  array( 'lhs' => 115, 'rhs' => 5 ),
-  array( 'lhs' => 116, 'rhs' => 3 ),
-  array( 'lhs' => 116, 'rhs' => 1 ),
-  array( 'lhs' => 116, 'rhs' => 0 ),
-  array( 'lhs' => 90, 'rhs' => 3 ),
-  array( 'lhs' => 90, 'rhs' => 2 ),
-  array( 'lhs' => 117, 'rhs' => 3 ),
-  array( 'lhs' => 117, 'rhs' => 2 ),
-  array( 'lhs' => 99, 'rhs' => 2 ),
-  array( 'lhs' => 99, 'rhs' => 0 ),
-  array( 'lhs' => 118, 'rhs' => 2 ),
-  array( 'lhs' => 118, 'rhs' => 2 ),
-  array( 'lhs' => 108, 'rhs' => 1 ),
-  array( 'lhs' => 108, 'rhs' => 2 ),
-  array( 'lhs' => 108, 'rhs' => 1 ),
-  array( 'lhs' => 108, 'rhs' => 3 ),
-  array( 'lhs' => 108, 'rhs' => 4 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 1 ),
-  array( 'lhs' => 119, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 0 ),
-  array( 'lhs' => 120, 'rhs' => 3 ),
-  array( 'lhs' => 120, 'rhs' => 3 ),
-  array( 'lhs' => 120, 'rhs' => 1 ),
-  array( 'lhs' => 107, 'rhs' => 2 ),
-  array( 'lhs' => 107, 'rhs' => 3 ),
-  array( 'lhs' => 121, 'rhs' => 2 ),
-  array( 'lhs' => 121, 'rhs' => 1 ),
-  array( 'lhs' => 122, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 1 ),
-  array( 'lhs' => 122, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 1 ),
-  array( 'lhs' => 122, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 0 ),
-    );
+    public static $yyRuleInfo = array(array(0 => 61, 1 => 1), array(0 => 62, 1 => 1), array(0 => 62, 1 => 2),
+                                      array(0 => 62, 1 => 0), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1),
+                                      array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1),
+                                      array(0 => 66, 1 => 1), array(0 => 66, 1 => 2), array(0 => 63, 1 => 1),
+                                      array(0 => 63, 1 => 1), array(0 => 65, 1 => 2), array(0 => 65, 1 => 3),
+                                      array(0 => 67, 1 => 2), array(0 => 67, 1 => 0), array(0 => 68, 1 => 1),
+                                      array(0 => 68, 1 => 1), array(0 => 64, 1 => 2), array(0 => 64, 1 => 1),
+                                      array(0 => 69, 1 => 2), array(0 => 69, 1 => 3), array(0 => 69, 1 => 2),
+                                      array(0 => 69, 1 => 3), array(0 => 69, 1 => 2), array(0 => 69, 1 => 3),
+                                      array(0 => 69, 1 => 4), array(0 => 69, 1 => 4), array(0 => 69, 1 => 5),
+                                      array(0 => 69, 1 => 5), array(0 => 64, 1 => 1), array(0 => 69, 1 => 3),
+                                      array(0 => 69, 1 => 2), array(0 => 69, 1 => 4), array(0 => 69, 1 => 5),
+                                      array(0 => 69, 1 => 6), array(0 => 69, 1 => 2), array(0 => 69, 1 => 3),
+                                      array(0 => 69, 1 => 2), array(0 => 69, 1 => 3), array(0 => 69, 1 => 8),
+                                      array(0 => 78, 1 => 2), array(0 => 78, 1 => 1), array(0 => 69, 1 => 5),
+                                      array(0 => 69, 1 => 7), array(0 => 69, 1 => 2), array(0 => 69, 1 => 6),
+                                      array(0 => 69, 1 => 8), array(0 => 69, 1 => 6), array(0 => 69, 1 => 8),
+                                      array(0 => 69, 1 => 3), array(0 => 69, 1 => 4), array(0 => 69, 1 => 2),
+                                      array(0 => 64, 1 => 1), array(0 => 69, 1 => 2), array(0 => 69, 1 => 3),
+                                      array(0 => 69, 1 => 4), array(0 => 69, 1 => 5), array(0 => 71, 1 => 2),
+                                      array(0 => 71, 1 => 1), array(0 => 71, 1 => 0), array(0 => 81, 1 => 4),
+                                      array(0 => 81, 1 => 2), array(0 => 81, 1 => 2), array(0 => 81, 1 => 2),
+                                      array(0 => 81, 1 => 2), array(0 => 81, 1 => 2), array(0 => 81, 1 => 4),
+                                      array(0 => 77, 1 => 1), array(0 => 77, 1 => 3), array(0 => 76, 1 => 3),
+                                      array(0 => 76, 1 => 3), array(0 => 76, 1 => 3), array(0 => 76, 1 => 3),
+                                      array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3),
+                                      array(0 => 73, 1 => 3), array(0 => 73, 1 => 3), array(0 => 73, 1 => 1),
+                                      array(0 => 73, 1 => 2), array(0 => 73, 1 => 3), array(0 => 73, 1 => 2),
+                                      array(0 => 73, 1 => 3), array(0 => 73, 1 => 3), array(0 => 73, 1 => 3),
+                                      array(0 => 73, 1 => 3), array(0 => 82, 1 => 7), array(0 => 82, 1 => 7),
+                                      array(0 => 72, 1 => 1), array(0 => 72, 1 => 2), array(0 => 72, 1 => 2),
+                                      array(0 => 72, 1 => 2), array(0 => 72, 1 => 2), array(0 => 72, 1 => 1),
+                                      array(0 => 72, 1 => 1), array(0 => 72, 1 => 3), array(0 => 72, 1 => 2),
+                                      array(0 => 72, 1 => 2), array(0 => 72, 1 => 1), array(0 => 72, 1 => 1),
+                                      array(0 => 72, 1 => 3), array(0 => 72, 1 => 1), array(0 => 72, 1 => 1),
+                                      array(0 => 72, 1 => 3), array(0 => 72, 1 => 1), array(0 => 72, 1 => 2),
+                                      array(0 => 72, 1 => 1), array(0 => 72, 1 => 3), array(0 => 86, 1 => 1),
+                                      array(0 => 86, 1 => 1), array(0 => 70, 1 => 1), array(0 => 70, 1 => 1),
+                                      array(0 => 70, 1 => 3), array(0 => 70, 1 => 1), array(0 => 70, 1 => 3),
+                                      array(0 => 70, 1 => 4), array(0 => 70, 1 => 3), array(0 => 70, 1 => 4),
+                                      array(0 => 74, 1 => 2), array(0 => 74, 1 => 2), array(0 => 91, 1 => 2),
+                                      array(0 => 91, 1 => 0), array(0 => 92, 1 => 2), array(0 => 92, 1 => 2),
+                                      array(0 => 92, 1 => 4), array(0 => 92, 1 => 2), array(0 => 92, 1 => 2),
+                                      array(0 => 92, 1 => 4), array(0 => 92, 1 => 3), array(0 => 92, 1 => 5),
+                                      array(0 => 92, 1 => 3), array(0 => 92, 1 => 3), array(0 => 92, 1 => 3),
+                                      array(0 => 92, 1 => 3), array(0 => 92, 1 => 3), array(0 => 92, 1 => 3),
+                                      array(0 => 92, 1 => 2), array(0 => 79, 1 => 1), array(0 => 79, 1 => 1),
+                                      array(0 => 79, 1 => 2), array(0 => 93, 1 => 1), array(0 => 93, 1 => 1),
+                                      array(0 => 93, 1 => 3), array(0 => 90, 1 => 2), array(0 => 94, 1 => 1),
+                                      array(0 => 94, 1 => 2), array(0 => 95, 1 => 3), array(0 => 95, 1 => 3),
+                                      array(0 => 95, 1 => 5), array(0 => 95, 1 => 6), array(0 => 95, 1 => 2),
+                                      array(0 => 87, 1 => 4), array(0 => 96, 1 => 4), array(0 => 96, 1 => 4),
+                                      array(0 => 97, 1 => 3), array(0 => 97, 1 => 1), array(0 => 97, 1 => 0),
+                                      array(0 => 75, 1 => 3), array(0 => 75, 1 => 2), array(0 => 98, 1 => 3),
+                                      array(0 => 98, 1 => 2), array(0 => 80, 1 => 2), array(0 => 80, 1 => 0),
+                                      array(0 => 99, 1 => 2), array(0 => 99, 1 => 2), array(0 => 89, 1 => 1),
+                                      array(0 => 89, 1 => 2), array(0 => 89, 1 => 1), array(0 => 89, 1 => 2),
+                                      array(0 => 89, 1 => 3), array(0 => 84, 1 => 1), array(0 => 84, 1 => 1),
+                                      array(0 => 85, 1 => 1), array(0 => 83, 1 => 3), array(0 => 100, 1 => 1),
+                                      array(0 => 100, 1 => 3), array(0 => 100, 1 => 0), array(0 => 101, 1 => 3),
+                                      array(0 => 101, 1 => 3), array(0 => 101, 1 => 1), array(0 => 88, 1 => 2),
+                                      array(0 => 88, 1 => 3), array(0 => 102, 1 => 2), array(0 => 102, 1 => 1),
+                                      array(0 => 103, 1 => 3), array(0 => 103, 1 => 3), array(0 => 103, 1 => 1),
+                                      array(0 => 103, 1 => 3), array(0 => 103, 1 => 3), array(0 => 103, 1 => 1),
+                                      array(0 => 103, 1 => 1),);
 
-    static public $yyReduceMap = array(
-        0 => 0,
-        1 => 1,
-        2 => 1,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-        19 => 16,
-        203 => 16,
-        17 => 17,
-        76 => 17,
-        18 => 18,
-        104 => 18,
-        106 => 18,
-        107 => 18,
-        130 => 18,
-        168 => 18,
-        20 => 20,
-        21 => 20,
-        47 => 20,
-        69 => 20,
-        70 => 20,
-        77 => 20,
-        78 => 20,
-        83 => 20,
-        103 => 20,
-        108 => 20,
-        109 => 20,
-        114 => 20,
-        116 => 20,
-        117 => 20,
-        124 => 20,
-        141 => 20,
-        167 => 20,
-        169 => 20,
-        185 => 20,
-        190 => 20,
-        202 => 20,
-        22 => 22,
-        23 => 22,
-        24 => 24,
-        25 => 25,
-        26 => 26,
-        27 => 27,
-        28 => 28,
-        29 => 29,
-        31 => 29,
-        30 => 30,
-        32 => 32,
-        33 => 32,
-        34 => 34,
-        35 => 35,
-        36 => 36,
-        37 => 37,
-        38 => 38,
-        39 => 39,
-        40 => 40,
-        41 => 41,
-        42 => 42,
-        44 => 42,
-        43 => 43,
-        45 => 45,
-        46 => 46,
-        48 => 48,
-        49 => 49,
-        50 => 50,
-        51 => 51,
-        52 => 52,
-        53 => 53,
-        54 => 54,
-        55 => 55,
-        56 => 56,
-        57 => 57,
-        58 => 58,
-        59 => 59,
-        60 => 60,
-        61 => 61,
-        62 => 62,
-        63 => 63,
-        72 => 63,
-        157 => 63,
-        161 => 63,
-        165 => 63,
-        166 => 63,
-        64 => 64,
-        158 => 64,
-        164 => 64,
-        65 => 65,
-        66 => 66,
-        67 => 66,
-        68 => 68,
-        71 => 71,
-        73 => 73,
-        74 => 74,
-        75 => 74,
-        79 => 79,
-        80 => 80,
-        81 => 80,
-        82 => 80,
-        84 => 84,
-        121 => 84,
-        85 => 85,
-        88 => 85,
-        99 => 85,
-        86 => 86,
-        87 => 87,
-        89 => 89,
-        90 => 90,
-        91 => 91,
-        96 => 91,
-        92 => 92,
-        95 => 92,
-        93 => 93,
-        98 => 93,
-        94 => 94,
-        97 => 94,
-        100 => 100,
-        101 => 101,
-        102 => 102,
-        105 => 105,
-        110 => 110,
-        111 => 111,
-        112 => 112,
-        113 => 113,
-        115 => 115,
-        118 => 118,
-        119 => 119,
-        120 => 120,
-        122 => 122,
-        123 => 123,
-        125 => 125,
-        126 => 126,
-        127 => 127,
-        128 => 128,
-        129 => 129,
-        131 => 131,
-        187 => 131,
-        132 => 132,
-        133 => 133,
-        134 => 134,
-        135 => 135,
-        136 => 136,
-        139 => 136,
-        137 => 137,
-        138 => 138,
-        140 => 140,
-        142 => 142,
-        143 => 143,
-        144 => 144,
-        145 => 145,
-        146 => 146,
-        147 => 147,
-        148 => 148,
-        149 => 149,
-        150 => 150,
-        151 => 151,
-        152 => 152,
-        153 => 153,
-        154 => 154,
-        155 => 155,
-        156 => 156,
-        159 => 159,
-        160 => 160,
-        162 => 162,
-        163 => 163,
-        170 => 170,
-        171 => 171,
-        172 => 172,
-        173 => 173,
-        174 => 174,
-        175 => 175,
-        176 => 176,
-        177 => 177,
-        178 => 178,
-        179 => 179,
-        180 => 180,
-        181 => 181,
-        182 => 182,
-        183 => 183,
-        184 => 184,
-        186 => 186,
-        188 => 188,
-        189 => 189,
-        191 => 191,
-        192 => 192,
-        193 => 193,
-        194 => 194,
-        195 => 195,
-        196 => 195,
-        198 => 195,
-        197 => 197,
-        199 => 199,
-        200 => 200,
-        201 => 201,
-    );
-#line 95 "smarty_internal_templateparser.y"
-    function yy_r0(){
-    $this->_retvalue = $this->root_buffer->to_smarty_php();
+    public static $yyReduceMap = array(0   => 0, 1 => 1, 2 => 2, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9,
+                                       17  => 9, 18 => 9, 43 => 9, 66 => 9, 67 => 9, 75 => 9, 76 => 9, 80 => 9, 90 => 9,
+                                       95  => 9, 96 => 9, 101 => 9, 103 => 9, 104 => 9, 108 => 9, 110 => 9, 115 => 9,
+                                       176 => 9, 181 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 16 => 13, 14 => 14,
+                                       74  => 14, 15 => 15, 91 => 15, 93 => 15, 94 => 15, 122 => 15, 19 => 19, 20 => 20,
+                                       21  => 21, 23 => 21, 25 => 21, 22 => 22, 24 => 22, 26 => 22, 27 => 27, 28 => 27,
+                                       29  => 29, 30 => 30, 31 => 31, 32 => 32, 33 => 33, 34 => 34, 35 => 35, 36 => 36,
+                                       37  => 37, 38 => 38, 40 => 38, 39 => 39, 41 => 41, 42 => 42, 44 => 44, 45 => 45,
+                                       46  => 46, 47 => 47, 49 => 47, 48 => 48, 50 => 48, 51 => 51, 52 => 52, 53 => 53,
+                                       54  => 54, 55 => 55, 56 => 56, 57 => 57, 58 => 58, 59 => 59, 60 => 60, 69 => 60,
+                                       157 => 60, 161 => 60, 165 => 60, 166 => 60, 61 => 61, 158 => 61, 164 => 61,
+                                       62  => 62, 63 => 63, 64 => 63, 65 => 65, 142 => 65, 68 => 68, 70 => 70, 71 => 71,
+                                       72  => 71, 73 => 73, 77 => 77, 78 => 78, 79 => 78, 81 => 81, 107 => 81, 82 => 82,
+                                       83  => 83, 84 => 84, 85 => 85, 86 => 86, 87 => 86, 88 => 88, 89 => 89, 92 => 92,
+                                       97  => 97, 98 => 98, 99 => 99, 100 => 100, 102 => 102, 105 => 105, 106 => 106,
+                                       109 => 109, 111 => 111, 112 => 112, 113 => 113, 114 => 114, 116 => 116,
+                                       117 => 117, 118 => 118, 119 => 119, 120 => 120, 121 => 121, 123 => 123,
+                                       178 => 123, 124 => 124, 125 => 125, 126 => 126, 127 => 127, 128 => 128,
+                                       129 => 129, 137 => 129, 130 => 130, 131 => 131, 132 => 132, 133 => 132,
+                                       135 => 132, 136 => 132, 134 => 134, 138 => 138, 139 => 139, 140 => 140,
+                                       182 => 140, 141 => 141, 143 => 143, 144 => 144, 145 => 145, 146 => 146,
+                                       147 => 147, 148 => 148, 149 => 149, 150 => 150, 151 => 151, 152 => 152,
+                                       153 => 153, 154 => 154, 155 => 155, 156 => 156, 159 => 159, 160 => 160,
+                                       162 => 162, 163 => 163, 167 => 167, 168 => 168, 169 => 169, 170 => 170,
+                                       171 => 171, 172 => 172, 173 => 173, 174 => 174, 175 => 175, 177 => 177,
+                                       179 => 179, 180 => 180, 183 => 183, 184 => 184, 185 => 185, 186 => 186,
+                                       187 => 186, 189 => 186, 188 => 188, 190 => 190, 191 => 191, 192 => 192,);
+
+    #line 225 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r0()
+    {
+        $this->root_buffer->prepend_array($this, $this->template_prefix);
+        $this->root_buffer->append_array($this, $this->template_postfix);
+        $this->_retvalue = $this->root_buffer->to_smarty_php($this);
     }
-#line 2160 "smarty_internal_templateparser.php"
-#line 103 "smarty_internal_templateparser.y"
-    function yy_r1(){
-    $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2165 "smarty_internal_templateparser.php"
-#line 119 "smarty_internal_templateparser.y"
-    function yy_r4(){
-    if ($this->compiler->has_code) {
-        $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
-        $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true));
-    } else {
-        $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    $this->compiler->has_variable_string = false;
-    $this->block_nesting_level = count($this->compiler->_tag_stack);
-    }
-#line 2177 "smarty_internal_templateparser.php"
-#line 131 "smarty_internal_templateparser.y"
-    function yy_r5(){
-    $this->_retvalue = new _smarty_tag($this, '');
-    }
-#line 2182 "smarty_internal_templateparser.php"
-#line 136 "smarty_internal_templateparser.y"
-    function yy_r6(){
-    $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2187 "smarty_internal_templateparser.php"
-#line 141 "smarty_internal_templateparser.y"
-    function yy_r7(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        if (!($this->smarty instanceof SmartyBC)) {
-            $this->compiler->trigger_template_error (self::Err3);
+
+    #line 235 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r1()
+    {
+        if ($this->yystack[ $this->yyidx + 0 ]->minor != null) {
+            $this->current_buffer->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor);
         }
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php', true));
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        $this->_retvalue = new _smarty_text($this, '');
     }
+
+    #line 242 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r2()
+    {
+        if ($this->yystack[ $this->yyidx + 0 ]->minor != null) {
+            // because of possible code injection
+            $this->current_buffer->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor);
+        }
     }
-#line 2203 "smarty_internal_templateparser.php"
-#line 157 "smarty_internal_templateparser.y"
-    function yy_r8(){
-    if ($this->is_xml) {
+
+    #line 256 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r4()
+    {
+        if ($this->compiler->has_code) {
+            $this->_retvalue = $this->mergePrefixCode($this->yystack[ $this->yyidx + 0 ]->minor);
+        } else {
+            $this->_retvalue = null;
+        }
+        $this->compiler->has_variable_string = false;
+        $this->block_nesting_level = count($this->compiler->_tag_stack);
+    }
+
+    #line 267 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r5()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Text($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    #line 271 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r6()
+    {
+        $code = $this->compiler->compileTag('private_php',
+                                            array(array('code' => $this->yystack[ $this->yyidx + 0 ]->minor),
+                                                  array('type' => $this->lex->phpType)), array());
+        if ($this->compiler->has_code && !empty($code)) {
+            $tmp = '';
+            foreach ($this->compiler->prefix_code as $code) {
+                $tmp .= $code;
+            }
+            $this->compiler->prefix_code = array();
+            $this->_retvalue =
+                new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true));
+        } else {
+            $this->_retvalue = null;
+        }
+    }
+
+    #line 282 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r7()
+    {
         $this->compiler->tag_nocache = true;
-        $this->is_xml = false;
-        $save = $this->template->has_nocache_code;
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '?>';?>\n", $this->compiler, true));
-        $this->template->has_nocache_code = $save;
-    } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, '?<?php ?>>');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        $this->_retvalue = new _smarty_text($this, '');
+        $save = $this->template->compiled->has_nocache_code;
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this,
+                                                             $this->compiler->processNocacheCode("<?php echo '{$this->yystack[$this->yyidx + 0]->minor}';?>\n",
+                                                                                                 $this->compiler,
+                                                                                                 true));
+        $this->template->compiled->has_nocache_code = $save;
     }
+
+    #line 289 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r8()
+    {
+        $this->_retvalue = $this->compiler->processText($this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 2222 "smarty_internal_templateparser.php"
-#line 176 "smarty_internal_templateparser.y"
-    function yy_r9(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        if ($this->asp_tags) {
-            if (!($this->smarty instanceof SmartyBC)) {
-                $this->compiler->trigger_template_error (self::Err3);
+
+    #line 293 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r9()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 297 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r10()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 302 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r11()
+    {
+        $this->strip = true;
+    }
+
+    #line 306 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r12()
+    {
+        $this->strip = false;
+    }
+
+    #line 311 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r13()
+    {
+        $this->_retvalue = '';
+    }
+
+    #line 315 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r14()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor;
+    }
+
+    #line 319 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r15()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 335 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r19()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor;
+    }
+
+    #line 341 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r20()
+    {
+        $var =
+            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->lex->ldel_length, - $this->lex->rdel_length),
+                 ' $');
+        if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array('nocache'),
+                                                           array('value' => $this->compiler->compileVariable('\'' .
+                                                                                                             $match[ 1 ] .
+                                                                                                             '\'')));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(),
+                                                           array('value' => $this->compiler->compileVariable('\'' .
+                                                                                                             $var .
+                                                                                                             '\'')));
+        }
+    }
+
+    #line 351 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r21()
+    {
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(),
+                                                       array('value' => $this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    #line 355 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r22()
+    {
+        $this->_retvalue =
+            $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
+                                        array('value' => $this->yystack[ $this->yyidx + - 1 ]->minor));
+    }
+
+    #line 378 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r27()
+    {
+        $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[ $this->yyidx +
+        0 ]->minor), array('var' => '\'' . substr($this->yystack[ $this->yyidx + - 2 ]->minor, 1) . '\'')));
+    }
+
+    #line 386 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r29()
+    {
+        $this->_retvalue = $this->compiler->compileTag('assign',
+                                                       array_merge(array(array('value' => $this->yystack[ $this->yyidx +
+                                                       - 1 ]->minor), array('var' => '\'' .
+                                                           substr($this->yystack[ $this->yyidx + - 3 ]->minor, 1) .
+                                                           '\'')), $this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    #line 390 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r30()
+    {
+        $this->_retvalue = $this->compiler->compileTag('assign',
+                                                       array_merge(array(array('value' => $this->yystack[ $this->yyidx +
+                                                       - 1 ]->minor), array('var' => $this->yystack[ $this->yyidx +
+                                                       - 3 ]->minor[ 'var' ])),
+                                                                   $this->yystack[ $this->yyidx + 0 ]->minor),
+                                                       array('smarty_internal_index' => $this->yystack[ $this->yyidx +
+                                                       - 3 ]->minor[ 'smarty_internal_index' ]));
+    }
+
+    #line 395 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r31()
+    {
+        $tag =
+            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->lex->ldel_length, - $this->lex->rdel_length));
+        if ($tag == 'strip') {
+            $this->strip = true;
+            $this->_retvalue = null;;
+        } else {
+            if (defined($tag)) {
+                if ($this->security) {
+                    $this->security->isTrustedConstant($tag, $this->compiler);
+                }
+                $this->_retvalue =
+                    $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
+            } else {
+                if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                    $this->_retvalue = $this->compiler->compileTag($match[ 1 ], array("'nocache'"));
+                } else {
+                    $this->_retvalue = $this->compiler->compileTag($tag, array());
+                }
             }
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true));
-        } else {
-            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-        }
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, '');
-        } else {
-            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
         }
     }
-    }
-#line 2246 "smarty_internal_templateparser.php"
-#line 200 "smarty_internal_templateparser.y"
-    function yy_r10(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true));
+
+    #line 417 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r32()
+    {
+        if (defined($this->yystack[ $this->yyidx + - 1 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + - 1 ]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
+                                            array('value' => $this->yystack[ $this->yyidx + - 1 ]->minor));
         } else {
-            $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-        }
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, '');
-        } else {
-            $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 1 ]->minor,
+                                                           $this->yystack[ $this->yyidx + 0 ]->minor);
         }
     }
-    }
-#line 2267 "smarty_internal_templateparser.php"
-#line 220 "smarty_internal_templateparser.y"
-    function yy_r11(){
-    if ($this->strip) {
-        $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', ' ', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)));
-    } else {
-        $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-    }
-    }
-#line 2276 "smarty_internal_templateparser.php"
-#line 229 "smarty_internal_templateparser.y"
-    function yy_r12(){
-    $this->compiler->tag_nocache = true;
-    $this->is_xml = true;
-    $save = $this->template->has_nocache_code;
-    $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
-    $this->template->has_nocache_code = $save;
-    }
-#line 2285 "smarty_internal_templateparser.php"
-#line 238 "smarty_internal_templateparser.y"
-    function yy_r13(){
-    if ($this->strip) {
-        $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', ' ', $this->yystack[$this->yyidx + 0]->minor));
-    } else {
-        $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    }
-#line 2294 "smarty_internal_templateparser.php"
-#line 247 "smarty_internal_templateparser.y"
-    function yy_r14(){
-    $this->strip = true;
-    $this->_retvalue = new _smarty_text($this, '');
-    }
-#line 2300 "smarty_internal_templateparser.php"
-#line 252 "smarty_internal_templateparser.y"
-    function yy_r15(){
-    $this->strip = false;
-    $this->_retvalue = new _smarty_text($this, '');
-    }
-#line 2306 "smarty_internal_templateparser.php"
-#line 258 "smarty_internal_templateparser.y"
-    function yy_r16(){
-    $this->_retvalue = '';
-    }
-#line 2311 "smarty_internal_templateparser.php"
-#line 262 "smarty_internal_templateparser.y"
-    function yy_r17(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-#line 2316 "smarty_internal_templateparser.php"
-#line 266 "smarty_internal_templateparser.y"
-    function yy_r18(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2321 "smarty_internal_templateparser.php"
-#line 274 "smarty_internal_templateparser.y"
-    function yy_r20(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2326 "smarty_internal_templateparser.php"
-#line 282 "smarty_internal_templateparser.y"
-    function yy_r22(){
-    $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2331 "smarty_internal_templateparser.php"
-#line 290 "smarty_internal_templateparser.y"
-    function yy_r24(){
-    $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2336 "smarty_internal_templateparser.php"
-#line 294 "smarty_internal_templateparser.y"
-    function yy_r25(){
-    $this->_retvalue = '<<?php ?>%';
-    }
-#line 2341 "smarty_internal_templateparser.php"
-#line 298 "smarty_internal_templateparser.y"
-    function yy_r26(){
-    $this->_retvalue = '%<?php ?>>';
-    }
-#line 2346 "smarty_internal_templateparser.php"
-#line 307 "smarty_internal_templateparser.y"
-    function yy_r27(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2351 "smarty_internal_templateparser.php"
-#line 311 "smarty_internal_templateparser.y"
-    function yy_r28(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2356 "smarty_internal_templateparser.php"
-#line 315 "smarty_internal_templateparser.y"
-    function yy_r29(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2361 "smarty_internal_templateparser.php"
-#line 319 "smarty_internal_templateparser.y"
-    function yy_r30(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2366 "smarty_internal_templateparser.php"
-#line 332 "smarty_internal_templateparser.y"
-    function yy_r32(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'")));
-    }
-#line 2371 "smarty_internal_templateparser.php"
-#line 340 "smarty_internal_templateparser.y"
-    function yy_r34(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2376 "smarty_internal_templateparser.php"
-#line 344 "smarty_internal_templateparser.y"
-    function yy_r35(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index']));
-    }
-#line 2381 "smarty_internal_templateparser.php"
-#line 349 "smarty_internal_templateparser.y"
-    function yy_r36(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 2386 "smarty_internal_templateparser.php"
-#line 353 "smarty_internal_templateparser.y"
-    function yy_r37(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array());
-    }
-#line 2391 "smarty_internal_templateparser.php"
-#line 358 "smarty_internal_templateparser.y"
-    function yy_r38(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2396 "smarty_internal_templateparser.php"
-#line 363 "smarty_internal_templateparser.y"
-    function yy_r39(){
-    $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
-    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
-    }
-#line 2402 "smarty_internal_templateparser.php"
-#line 369 "smarty_internal_templateparser.y"
-    function yy_r40(){
-    $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'<?php echo ';
-    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
-    }
-#line 2408 "smarty_internal_templateparser.php"
-#line 375 "smarty_internal_templateparser.y"
-    function yy_r41(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2414 "smarty_internal_templateparser.php"
-#line 380 "smarty_internal_templateparser.y"
-    function yy_r42(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2420 "smarty_internal_templateparser.php"
-#line 385 "smarty_internal_templateparser.y"
-    function yy_r43(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2426 "smarty_internal_templateparser.php"
-#line 396 "smarty_internal_templateparser.y"
-    function yy_r45(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1);
-    }
-#line 2431 "smarty_internal_templateparser.php"
-#line 400 "smarty_internal_templateparser.y"
-    function yy_r46(){
-    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2436 "smarty_internal_templateparser.php"
-#line 408 "smarty_internal_templateparser.y"
-    function yy_r48(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0);
-    }
-#line 2441 "smarty_internal_templateparser.php"
-#line 412 "smarty_internal_templateparser.y"
-    function yy_r49(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0);
-    }
-#line 2446 "smarty_internal_templateparser.php"
-#line 417 "smarty_internal_templateparser.y"
-    function yy_r50(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 2451 "smarty_internal_templateparser.php"
-#line 422 "smarty_internal_templateparser.y"
-    function yy_r51(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));
-    }
-#line 2456 "smarty_internal_templateparser.php"
-#line 426 "smarty_internal_templateparser.y"
-    function yy_r52(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));
-    }
-#line 2461 "smarty_internal_templateparser.php"
-#line 430 "smarty_internal_templateparser.y"
-    function yy_r53(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));
-    }
-#line 2466 "smarty_internal_templateparser.php"
-#line 434 "smarty_internal_templateparser.y"
-    function yy_r54(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));
-    }
-#line 2471 "smarty_internal_templateparser.php"
-#line 439 "smarty_internal_templateparser.y"
-    function yy_r55(){
-    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor))));
-    }
-#line 2476 "smarty_internal_templateparser.php"
-#line 443 "smarty_internal_templateparser.y"
-    function yy_r56(){
-    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -3]->minor),$this->yystack[$this->yyidx + -2]->minor)),$this->yystack[$this->yyidx + -1]->minor)));
-    }
-#line 2481 "smarty_internal_templateparser.php"
-#line 448 "smarty_internal_templateparser.y"
-    function yy_r57(){
-    $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
-    }
-#line 2486 "smarty_internal_templateparser.php"
-#line 454 "smarty_internal_templateparser.y"
-    function yy_r58(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array());
-    }
-#line 2491 "smarty_internal_templateparser.php"
-#line 458 "smarty_internal_templateparser.y"
-    function yy_r59(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2496 "smarty_internal_templateparser.php"
-#line 463 "smarty_internal_templateparser.y"
-    function yy_r60(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2501 "smarty_internal_templateparser.php"
-#line 467 "smarty_internal_templateparser.y"
-    function yy_r61(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2506 "smarty_internal_templateparser.php"
-#line 475 "smarty_internal_templateparser.y"
-    function yy_r62(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2512 "smarty_internal_templateparser.php"
-#line 481 "smarty_internal_templateparser.y"
-    function yy_r63(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2517 "smarty_internal_templateparser.php"
-#line 486 "smarty_internal_templateparser.y"
-    function yy_r64(){
-    $this->_retvalue = array();
-    }
-#line 2522 "smarty_internal_templateparser.php"
-#line 491 "smarty_internal_templateparser.y"
-    function yy_r65(){
-    if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true');
-    } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false');
-    } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null');
-    } else {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'");
-    }
-    }
-#line 2535 "smarty_internal_templateparser.php"
-#line 503 "smarty_internal_templateparser.y"
-    function yy_r66(){
-    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2540 "smarty_internal_templateparser.php"
-#line 511 "smarty_internal_templateparser.y"
-    function yy_r68(){
-    $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";
-    }
-#line 2545 "smarty_internal_templateparser.php"
-#line 523 "smarty_internal_templateparser.y"
-    function yy_r71(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2550 "smarty_internal_templateparser.php"
-#line 536 "smarty_internal_templateparser.y"
-    function yy_r73(){
-    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
-    }
-#line 2556 "smarty_internal_templateparser.php"
-#line 541 "smarty_internal_templateparser.y"
-    function yy_r74(){
-    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2561 "smarty_internal_templateparser.php"
-#line 569 "smarty_internal_templateparser.y"
-    function yy_r79(){
-    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';
-    }
-#line 2566 "smarty_internal_templateparser.php"
-#line 574 "smarty_internal_templateparser.y"
-    function yy_r80(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2571 "smarty_internal_templateparser.php"
-#line 593 "smarty_internal_templateparser.y"
-    function yy_r84(){
-    $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-#line 2576 "smarty_internal_templateparser.php"
-#line 599 "smarty_internal_templateparser.y"
-    function yy_r85(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2581 "smarty_internal_templateparser.php"
-#line 603 "smarty_internal_templateparser.y"
-    function yy_r86(){
-    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2586 "smarty_internal_templateparser.php"
-#line 607 "smarty_internal_templateparser.y"
-    function yy_r87(){
-    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2591 "smarty_internal_templateparser.php"
-#line 615 "smarty_internal_templateparser.y"
-    function yy_r89(){
-    $this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2596 "smarty_internal_templateparser.php"
-#line 619 "smarty_internal_templateparser.y"
-    function yy_r90(){
-    $this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2601 "smarty_internal_templateparser.php"
-#line 623 "smarty_internal_templateparser.y"
-    function yy_r91(){
-    $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 2606 "smarty_internal_templateparser.php"
-#line 627 "smarty_internal_templateparser.y"
-    function yy_r92(){
-    $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 2611 "smarty_internal_templateparser.php"
-#line 631 "smarty_internal_templateparser.y"
-    function yy_r93(){
-    $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2616 "smarty_internal_templateparser.php"
-#line 635 "smarty_internal_templateparser.y"
-    function yy_r94(){
-    $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2621 "smarty_internal_templateparser.php"
-#line 659 "smarty_internal_templateparser.y"
-    function yy_r100(){
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>';
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number;
-    }
-#line 2628 "smarty_internal_templateparser.php"
-#line 668 "smarty_internal_templateparser.y"
-    function yy_r101(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? '. $this->compileVariable("'".$this->yystack[$this->yyidx + -2]->minor."'") . ' : '.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2633 "smarty_internal_templateparser.php"
-#line 672 "smarty_internal_templateparser.y"
-    function yy_r102(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2638 "smarty_internal_templateparser.php"
-#line 687 "smarty_internal_templateparser.y"
-    function yy_r105(){
-    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2643 "smarty_internal_templateparser.php"
-#line 708 "smarty_internal_templateparser.y"
-    function yy_r110(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2648 "smarty_internal_templateparser.php"
-#line 712 "smarty_internal_templateparser.y"
-    function yy_r111(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
-    }
-#line 2653 "smarty_internal_templateparser.php"
-#line 716 "smarty_internal_templateparser.y"
-    function yy_r112(){
-    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2658 "smarty_internal_templateparser.php"
-#line 721 "smarty_internal_templateparser.y"
-    function yy_r113(){
-    if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'true';
-    } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'false';
-    } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'null';
-    } else {
-        $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";
-    }
-    }
-#line 2671 "smarty_internal_templateparser.php"
-#line 739 "smarty_internal_templateparser.y"
-    function yy_r115(){
-    $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";
-    }
-#line 2676 "smarty_internal_templateparser.php"
-#line 754 "smarty_internal_templateparser.y"
-    function yy_r118(){
-    if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) {
-        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
-            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 427 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r33()
+    {
+        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(),
+                                                           array('value' => $this->yystack[ $this->yyidx + 0 ]->minor));
         } else {
-            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor, array());
         }
-    } else {
-        $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting");
     }
+
+    #line 440 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r34()
+    {
+        if (defined($this->yystack[ $this->yyidx + - 2 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + - 2 ]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', $this->yystack[ $this->yyidx + 0 ]->minor,
+                                            array('value'        => $this->yystack[ $this->yyidx + - 2 ]->minor,
+                                                  'modifierlist' => $this->yystack[ $this->yyidx + - 1 ]->minor));
+        } else {
+            $this->_retvalue = '<?php ob_start();?>' .
+                $this->compiler->compileTag($this->yystack[ $this->yyidx + - 2 ]->minor,
+                                            $this->yystack[ $this->yyidx + 0 ]->minor) . '<?php echo ';
+            $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(),
+                                                            array('modifierlist'  => $this->yystack[ $this->yyidx +
+                                                            - 1 ]->minor, 'value' => 'ob_get_clean()')) . ';?>';
+        }
     }
-#line 2689 "smarty_internal_templateparser.php"
-#line 766 "smarty_internal_templateparser.y"
-    function yy_r119(){
-    if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') {
-        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;
-    } else {
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 453 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r35()
+    {
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 3 ]->minor,
+                                                       $this->yystack[ $this->yyidx + 0 ]->minor,
+                                                       array('object_method' => $this->yystack[ $this->yyidx +
+                                                       - 1 ]->minor));
     }
+
+    #line 458 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r36()
+    {
+        $this->_retvalue = '<?php ob_start();?>' .
+            $this->compiler->compileTag($this->yystack[ $this->yyidx + - 4 ]->minor,
+                                        $this->yystack[ $this->yyidx + 0 ]->minor,
+                                        array('object_method' => $this->yystack[ $this->yyidx + - 2 ]->minor)) .
+            '<?php echo ';
+        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(),
+                                                        array('modifierlist'  => $this->yystack[ $this->yyidx +
+                                                        - 1 ]->minor, 'value' => 'ob_get_clean()')) . ';?>';
     }
-#line 2698 "smarty_internal_templateparser.php"
-#line 775 "smarty_internal_templateparser.y"
-    function yy_r120(){
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + 0]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>';
-    $this->_retvalue = '$_tmp'.$this->prefix_number;
+
+    #line 464 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r37()
+    {
+        $tag = trim(substr($this->yystack[ $this->yyidx + - 1 ]->minor, $this->lex->ldel_length));
+        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(),
+                                                       array('if condition' => $this->yystack[ $this->yyidx +
+                                                       0 ]->minor));
     }
-#line 2705 "smarty_internal_templateparser.php"
-#line 790 "smarty_internal_templateparser.y"
-    function yy_r122(){
-    if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
-        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
-        $this->_retvalue = $smarty_var;
-    } else {
-        // used for array reset,next,prev,end,current
-        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
-        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+
+    #line 469 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r38()
+    {
+        $tag = trim(substr($this->yystack[ $this->yyidx + - 2 ]->minor, $this->lex->ldel_length));
+        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag,
+                                                       $this->yystack[ $this->yyidx + 0 ]->minor,
+                                                       array('if condition' => $this->yystack[ $this->yyidx +
+                                                       - 1 ]->minor));
     }
+
+    #line 474 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r39()
+    {
+        $tag = trim(substr($this->yystack[ $this->yyidx + - 1 ]->minor, $this->lex->ldel_length));
+        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(),
+                                                       array('if condition' => $this->yystack[ $this->yyidx +
+                                                       0 ]->minor));
     }
-#line 2718 "smarty_internal_templateparser.php"
-#line 803 "smarty_internal_templateparser.y"
-    function yy_r123(){
-    $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 485 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r41()
+    {
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor,
+                                                                          array(array('start' => $this->yystack[ $this->yyidx +
+                                                                          - 6 ]->minor),
+                                                                                array('ifexp' => $this->yystack[ $this->yyidx +
+                                                                                - 4 ]->minor),
+                                                                                array('var' => $this->yystack[ $this->yyidx +
+                                                                                - 2 ]->minor),
+                                                                                array('step' => $this->yystack[ $this->yyidx +
+                                                                                - 1 ]->minor))), 1);
     }
-#line 2723 "smarty_internal_templateparser.php"
-#line 813 "smarty_internal_templateparser.y"
-    function yy_r125(){
-    $this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';
+
+    #line 489 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r42()
+    {
+        $this->_retvalue = '=' . $this->yystack[ $this->yyidx + 0 ]->minor;
     }
-#line 2728 "smarty_internal_templateparser.php"
-#line 817 "smarty_internal_templateparser.y"
-    function yy_r126(){
-    $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'\')) ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
+
+    #line 497 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r44()
+    {
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor,
+                                                                          array(array('start' => $this->yystack[ $this->yyidx +
+                                                                          - 3 ]->minor),
+                                                                                array('to' => $this->yystack[ $this->yyidx +
+                                                                                - 1 ]->minor))), 0);
     }
-#line 2733 "smarty_internal_templateparser.php"
-#line 821 "smarty_internal_templateparser.y"
-    function yy_r127(){
-    $this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';
+
+    #line 501 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r45()
+    {
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[ $this->yyidx + 0 ]->minor,
+                                                                          array(array('start' => $this->yystack[ $this->yyidx +
+                                                                          - 5 ]->minor),
+                                                                                array('to' => $this->yystack[ $this->yyidx +
+                                                                                - 3 ]->minor),
+                                                                                array('step' => $this->yystack[ $this->yyidx +
+                                                                                - 1 ]->minor))), 0);
     }
-#line 2738 "smarty_internal_templateparser.php"
-#line 825 "smarty_internal_templateparser.y"
-    function yy_r128(){
-    $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -2]->minor .')) ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
+
+    #line 506 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r46()
+    {
+        $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 2743 "smarty_internal_templateparser.php"
-#line 829 "smarty_internal_templateparser.y"
-    function yy_r129(){
-    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+
+    #line 511 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r47()
+    {
+        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor,
+                                                                              array(array('from' => $this->yystack[ $this->yyidx +
+                                                                              - 3 ]->minor),
+                                                                                    array('item' => $this->yystack[ $this->yyidx +
+                                                                                    - 1 ]->minor))));
     }
-#line 2748 "smarty_internal_templateparser.php"
-#line 842 "smarty_internal_templateparser.y"
-    function yy_r131(){
-    return;
+
+    #line 515 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r48()
+    {
+        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[ $this->yyidx + 0 ]->minor,
+                                                                              array(array('from' => $this->yystack[ $this->yyidx +
+                                                                              - 5 ]->minor),
+                                                                                    array('item' => $this->yystack[ $this->yyidx +
+                                                                                    - 1 ]->minor),
+                                                                                    array('key' => $this->yystack[ $this->yyidx +
+                                                                                    - 3 ]->minor))));
     }
-#line 2753 "smarty_internal_templateparser.php"
-#line 848 "smarty_internal_templateparser.y"
-    function yy_r132(){
-    $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
+
+    #line 528 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r51()
+    {
+        $this->_retvalue = $this->compiler->compileTag('setfilter', array(),
+                                                       array('modifier_list' => array(array_merge(array($this->yystack[ $this->yyidx +
+                                                       - 1 ]->minor), $this->yystack[ $this->yyidx + 0 ]->minor))));
     }
-#line 2758 "smarty_internal_templateparser.php"
-#line 852 "smarty_internal_templateparser.y"
-    function yy_r133(){
-    $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
+
+    #line 532 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r52()
+    {
+        $this->_retvalue = $this->compiler->compileTag('setfilter', array(),
+                                                       array('modifier_list' => array_merge(array(array_merge(array($this->yystack[ $this->yyidx +
+                                                       - 2 ]->minor), $this->yystack[ $this->yyidx + - 1 ]->minor)),
+                                                                                            $this->yystack[ $this->yyidx +
+                                                                                            0 ]->minor)));
     }
-#line 2763 "smarty_internal_templateparser.php"
-#line 856 "smarty_internal_templateparser.y"
-    function yy_r134(){
-    $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";
+
+    #line 537 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r53()
+    {
+        $j = strrpos($this->yystack[ $this->yyidx + 0 ]->minor, '.');
+        if ($this->yystack[ $this->yyidx + 0 ]->minor[ $j + 1 ] == 'c') {
+            // {$smarty.block.child}
+            $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
+        } else {
+            // {$smarty.block.parent}
+            $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
+        }
     }
-#line 2768 "smarty_internal_templateparser.php"
-#line 860 "smarty_internal_templateparser.y"
-    function yy_r135(){
-    $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";
+
+    #line 550 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r54()
+    {
+        $tag =
+            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->lex->ldel_length, - $this->lex->rdel_length),
+                 ' /');
+        if ($tag == 'strip') {
+            $this->strip = false;
+            $this->_retvalue = null;
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
+        }
     }
-#line 2773 "smarty_internal_templateparser.php"
-#line 864 "smarty_internal_templateparser.y"
-    function yy_r136(){
-    $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";
+
+    #line 559 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r55()
+    {
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + 0 ]->minor . 'close', array());
     }
-#line 2778 "smarty_internal_templateparser.php"
-#line 869 "smarty_internal_templateparser.y"
-    function yy_r137(){
-    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
+
+    #line 563 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r56()
+    {
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 1 ]->minor . 'close', array(),
+                                                       array('modifier_list' => $this->yystack[ $this->yyidx +
+                                                       0 ]->minor));
     }
-#line 2783 "smarty_internal_templateparser.php"
-#line 873 "smarty_internal_templateparser.y"
-    function yy_r138(){
-    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
+
+    #line 568 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r57()
+    {
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 2 ]->minor . 'close', array(),
+                                                       array('object_method' => $this->yystack[ $this->yyidx +
+                                                       0 ]->minor));
     }
-#line 2788 "smarty_internal_templateparser.php"
-#line 883 "smarty_internal_templateparser.y"
-    function yy_r140(){
-    $this->_retvalue = '[]';
+
+    #line 572 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r58()
+    {
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[ $this->yyidx + - 3 ]->minor . 'close', array(),
+                                                       array('object_method'         => $this->yystack[ $this->yyidx +
+                                                       - 1 ]->minor, 'modifier_list' => $this->yystack[ $this->yyidx +
+                                                       0 ]->minor));
     }
-#line 2793 "smarty_internal_templateparser.php"
-#line 896 "smarty_internal_templateparser.y"
-    function yy_r142(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 580 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r59()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor;
+        $this->_retvalue[] = $this->yystack[ $this->yyidx + 0 ]->minor;
     }
-#line 2798 "smarty_internal_templateparser.php"
-#line 901 "smarty_internal_templateparser.y"
-    function yy_r143(){
-    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+
+    #line 586 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r60()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 2803 "smarty_internal_templateparser.php"
-#line 906 "smarty_internal_templateparser.y"
-    function yy_r144(){
-    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
+
+    #line 591 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r61()
+    {
+        $this->_retvalue = array();
     }
-#line 2808 "smarty_internal_templateparser.php"
-#line 913 "smarty_internal_templateparser.y"
-    function yy_r145(){
-    if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') {
-        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
-    } else {
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 596 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r62()
+    {
+        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                array($this->yystack[ $this->yyidx + - 2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
+        } else {
+            $this->_retvalue =
+                array($this->yystack[ $this->yyidx + - 2 ]->minor => '\'' . $this->yystack[ $this->yyidx + 0 ]->minor .
+                    '\'');
+        }
     }
+
+    #line 607 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r63()
+    {
+        $this->_retvalue =
+            array(trim($this->yystack[ $this->yyidx + - 1 ]->minor, " =\n\r\t") => $this->yystack[ $this->yyidx +
+            0 ]->minor);
     }
-#line 2817 "smarty_internal_templateparser.php"
-#line 922 "smarty_internal_templateparser.y"
-    function yy_r146(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
+
+    #line 615 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r65()
+    {
+        $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
     }
-#line 2822 "smarty_internal_templateparser.php"
-#line 927 "smarty_internal_templateparser.y"
-    function yy_r147(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 627 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r68()
+    {
+        $this->_retvalue =
+            array($this->yystack[ $this->yyidx + - 2 ]->minor => $this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 2827 "smarty_internal_templateparser.php"
-#line 932 "smarty_internal_templateparser.y"
-    function yy_r148(){
-    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') {
-        $this->compiler->trigger_template_error (self::Err1);
+
+    #line 640 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r70()
+    {
+        $this->yystack[ $this->yyidx + - 2 ]->minor[] = $this->yystack[ $this->yyidx + 0 ]->minor;
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 2 ]->minor;
     }
-    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 645 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r71()
+    {
+        $this->_retvalue = array('var'   => '\'' . substr($this->yystack[ $this->yyidx + - 2 ]->minor, 1) . '\'',
+                                 'value' => $this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 2835 "smarty_internal_templateparser.php"
-#line 939 "smarty_internal_templateparser.y"
-    function yy_r149(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
+
+    #line 652 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r73()
+    {
+        $this->_retvalue = array('var'   => $this->yystack[ $this->yyidx + - 2 ]->minor,
+                                 'value' => $this->yystack[ $this->yyidx + 0 ]->minor);
     }
-    $this->_retvalue = '->{'.$this->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
+
+    #line 676 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r77()
+    {
+        $this->_retvalue =
+            '$_smarty_tpl->getStreamVariable(\'' . substr($this->yystack[ $this->yyidx + - 2 ]->minor, 1) . '://' .
+            $this->yystack[ $this->yyidx + 0 ]->minor . '\')';
     }
-#line 2843 "smarty_internal_templateparser.php"
-#line 946 "smarty_internal_templateparser.y"
-    function yy_r150(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
+
+    #line 681 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r78()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + - 2 ]->minor . trim($this->yystack[ $this->yyidx + - 1 ]->minor) .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
     }
-    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+
+    #line 695 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r81()
+    {
+        $this->_retvalue = $this->compiler->compileTag('private_modifier', array(),
+                                                       array('value' => $this->yystack[ $this->yyidx + - 1 ]->minor,
+                                                             'modifierlist' => $this->yystack[ $this->yyidx +
+                                                             0 ]->minor));
     }
-#line 2851 "smarty_internal_templateparser.php"
-#line 953 "smarty_internal_templateparser.y"
-    function yy_r151(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
+
+    #line 701 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r82()
+    {
+        $this->_retvalue = (isset($this->yystack[ $this->yyidx + - 1 ]->minor[ 'pre' ]) ?
+                $this->yystack[ $this->yyidx + - 1 ]->minor[ 'pre' ] : '') .
+            $this->yystack[ $this->yyidx + - 2 ]->minor . $this->yystack[ $this->yyidx + - 1 ]->minor[ 'op' ] .
+            $this->yystack[ $this->yyidx + 0 ]->minor .
+            (isset($this->yystack[ $this->yyidx + - 1 ]->minor[ 'pre' ]) ? ')' : '');
     }
-    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+
+    #line 704 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r83()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + 0 ]->minor . $this->yystack[ $this->yyidx + - 1 ]->minor . ')';
     }
-#line 2859 "smarty_internal_templateparser.php"
-#line 961 "smarty_internal_templateparser.y"
-    function yy_r152(){
-    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 708 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r84()
+    {
+        $this->_retvalue = 'in_array(' . $this->yystack[ $this->yyidx + - 2 ]->minor . ',' .
+            $this->yystack[ $this->yyidx + 0 ]->minor . ')';
     }
-#line 2864 "smarty_internal_templateparser.php"
-#line 969 "smarty_internal_templateparser.y"
-    function yy_r153(){
-    if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
-        if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
-            $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor);
-            if ($func_name == 'isset') {
-                if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
-                    $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
-                }
-                $par = implode(',',$this->yystack[$this->yyidx + -1]->minor);
-                if (strncasecmp($par,'$_smarty_tpl->getConfigVariable',strlen('$_smarty_tpl->getConfigVariable')) === 0) {
-                    $this->prefix_number++;
-                    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.str_replace(')',', false)',$par).';?>';
-                    $isset_par = '$_tmp'.$this->prefix_number;
+
+    #line 712 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r85()
+    {
+        $this->_retvalue = 'in_array(' . $this->yystack[ $this->yyidx + - 2 ]->minor . ',(array)' .
+            $this->yystack[ $this->yyidx + 0 ]->minor . ')';
+    }
+
+    #line 716 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r86()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 2 ]->minor . $this->yystack[ $this->yyidx + - 1 ]->minor .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 728 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r88()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 5 ]->minor . ' ? ' .
+            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + - 2 ]->minor, 1) . '\'') .
+            ' : ' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 732 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r89()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + - 5 ]->minor . ' ? ' . $this->yystack[ $this->yyidx + - 2 ]->minor . ' : ' .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 747 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r92()
+    {
+        $this->_retvalue = '!' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 768 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r97()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + - 2 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 772 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r98()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor . '.';
+    }
+
+    #line 776 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r99()
+    {
+        $this->_retvalue = '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 781 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r100()
+    {
+        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+        } else {
+            $this->_retvalue = '\'' . $this->yystack[ $this->yyidx + 0 ]->minor . '\'';
+        }
+    }
+
+    #line 798 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r102()
+    {
+        $this->_retvalue = "(" . $this->yystack[ $this->yyidx + - 1 ]->minor . ")";
+    }
+
+    #line 813 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r105()
+    {
+        self::$prefix_number ++;
+        if ($this->yystack[ $this->yyidx + - 2 ]->minor[ 'var' ] == '\'smarty\'') {
+            $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . ' = ' .
+                $this->compiler->compileTag('private_special_variable', array(),
+                                            $this->yystack[ $this->yyidx + - 2 ]->minor[ 'smarty_internal_index' ]) .
+                ';?>';
+        } else {
+            $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . ' = ' .
+                $this->compiler->compileVariable($this->yystack[ $this->yyidx + - 2 ]->minor[ 'var' ]) .
+                $this->yystack[ $this->yyidx + - 2 ]->minor[ 'smarty_internal_index' ] . ';?>';
+        }
+        $this->_retvalue = '$_tmp' . self::$prefix_number . '::' . $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] .
+            $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
+    }
+
+    #line 824 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r106()
+    {
+        self::$prefix_number ++;
+        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->compiler->prefix_code[] =
+            $this->compiler->appendCode($tmp, '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>');
+        $this->_retvalue = '$_tmp' . self::$prefix_number;
+    }
+
+    #line 841 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r109()
+    {
+        if (!in_array(strtolower($this->yystack[ $this->yyidx + - 2 ]->minor), array('self', 'parent')) &&
+            (!$this->security ||
+                $this->security->isTrustedStaticClassAccess($this->yystack[ $this->yyidx + - 2 ]->minor,
+                                                            $this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler))
+        ) {
+            if (isset($this->smarty->registered_classes[ $this->yystack[ $this->yyidx + - 2 ]->minor ])) {
+                $this->_retvalue =
+                    $this->smarty->registered_classes[ $this->yystack[ $this->yyidx + - 2 ]->minor ] . '::' .
+                    $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] . $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
+            } else {
+                $this->_retvalue = $this->yystack[ $this->yyidx + - 2 ]->minor . '::' .
+                    $this->yystack[ $this->yyidx + 0 ]->minor[ 0 ] . $this->yystack[ $this->yyidx + 0 ]->minor[ 1 ];
+            }
+        } else {
+            $this->compiler->trigger_template_error("static class '" . $this->yystack[ $this->yyidx + - 2 ]->minor .
+                                                    "' is undefined or not allowed by security setting");
+        }
+    }
+
+    #line 860 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r111()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 871 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r112()
+    {
+        $this->_retvalue =
+            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'');
+    }
+
+    #line 874 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r113()
+    {
+        if ($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ] == '\'smarty\'') {
+            $smarty_var = $this->compiler->compileTag('private_special_variable', array(),
+                                                      $this->yystack[ $this->yyidx +
+                                                      0 ]->minor[ 'smarty_internal_index' ]);
+            $this->_retvalue = $smarty_var;
+        } else {
+            // used for array reset,next,prev,end,current
+            $this->last_variable = $this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ];
+            $this->last_index = $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
+            $this->_retvalue = $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor[ 'var' ]) .
+                $this->yystack[ $this->yyidx + 0 ]->minor[ 'smarty_internal_index' ];
+        }
+    }
+
+    #line 887 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r114()
+    {
+        $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[ $this->yyidx + - 2 ]->minor . ']->' .
+            $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 897 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r116()
+    {
+        $this->_retvalue =
+            $this->compiler->compileConfigVariable("'" . $this->yystack[ $this->yyidx + - 1 ]->minor . "'");
+    }
+
+    #line 901 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r117()
+    {
+        $this->_retvalue = '(is_array($tmp = ' .
+            $this->compiler->compileConfigVariable("'" . $this->yystack[ $this->yyidx + - 2 ]->minor . "'") .
+            ') ? $tmp' . $this->yystack[ $this->yyidx + 0 ]->minor . ' :null)';
+    }
+
+    #line 905 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r118()
+    {
+        $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + - 1 ]->minor);
+    }
+
+    #line 909 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r119()
+    {
+        $this->_retvalue =
+            '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[ $this->yyidx + - 2 ]->minor) .
+            ') ? $tmp' . $this->yystack[ $this->yyidx + 0 ]->minor . ' : null)';
+    }
+
+    #line 913 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r120()
+    {
+        $this->_retvalue = array('var' => '\'' . substr($this->yystack[ $this->yyidx + - 1 ]->minor, 1) . '\'',
+                                 'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    #line 916 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r121()
+    {
+        $this->_retvalue = array('var'                   => $this->yystack[ $this->yyidx + - 1 ]->minor,
+                                 'smarty_internal_index' => $this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    #line 929 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r123()
+    {
+        return;
+    }
+
+    #line 935 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r124()
+    {
+        $this->_retvalue =
+            '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'') .
+            ']';
+    }
+
+    #line 938 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r125()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + 0 ]->minor) . ']';
+    }
+
+    #line 942 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r126()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + - 2 ]->minor) . '->' .
+            $this->yystack[ $this->yyidx + 0 ]->minor . ']';
+    }
+
+    #line 946 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r127()
+    {
+        if (defined($this->yystack[ $this->yyidx + 0 ]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[ $this->yyidx + 0 ]->minor, $this->compiler);
+            }
+            $this->_retvalue = '[' . $this->yystack[ $this->yyidx + 0 ]->minor . ']';
+        } else {
+            $this->_retvalue = "['" . $this->yystack[ $this->yyidx + 0 ]->minor . "']";
+        }
+    }
+
+    #line 957 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r128()
+    {
+        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + 0 ]->minor . ']';
+    }
+
+    #line 962 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r129()
+    {
+        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + - 1 ]->minor . ']';
+    }
+
+    #line 967 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r130()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
+                                                                                       $this->yystack[ $this->yyidx +
+                                                                                       - 1 ]->minor .
+                                                                                       '\'][\'index\']') . ']';
+    }
+
+    #line 971 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r131()
+    {
+        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
+                                                                                       $this->yystack[ $this->yyidx +
+                                                                                       - 3 ]->minor . '\'][\'' .
+                                                                                       $this->yystack[ $this->yyidx +
+                                                                                       - 1 ]->minor . '\']') . ']';
+    }
+
+    #line 974 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r132()
+    {
+        $this->_retvalue = '[' . $this->yystack[ $this->yyidx + - 1 ]->minor . ']';
+    }
+
+    #line 980 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r134()
+    {
+        $this->_retvalue = '[' .
+            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + - 1 ]->minor, 1) . '\'') .
+            ']';;
+    }
+
+    #line 996 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r138()
+    {
+        $this->_retvalue = '[]';
+    }
+
+    #line 1006 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r139()
+    {
+        $this->_retvalue = '\'' . substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) . '\'';
+    }
+
+    #line 1010 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r140()
+    {
+        $this->_retvalue = "''";
+    }
+
+    #line 1015 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r141()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + - 1 ]->minor . '.' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 1023 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r143()
+    {
+        $var =
+            trim(substr($this->yystack[ $this->yyidx + 0 ]->minor, $this->lex->ldel_length, - $this->lex->rdel_length),
+                 ' $');
+        $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
+    }
+
+    #line 1029 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r144()
+    {
+        $this->_retvalue = '(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')';
+    }
+
+    #line 1036 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r145()
+    {
+        if ($this->yystack[ $this->yyidx + - 1 ]->minor[ 'var' ] == '\'smarty\'') {
+            $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(),
+                                                           $this->yystack[ $this->yyidx +
+                                                           - 1 ]->minor[ 'smarty_internal_index' ]) .
+                $this->yystack[ $this->yyidx + 0 ]->minor;
+        } else {
+            $this->_retvalue = $this->compiler->compileVariable($this->yystack[ $this->yyidx + - 1 ]->minor[ 'var' ]) .
+                $this->yystack[ $this->yyidx + - 1 ]->minor[ 'smarty_internal_index' ] .
+                $this->yystack[ $this->yyidx + 0 ]->minor;
+        }
+    }
+
+    #line 1045 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r146()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 1050 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r147()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 1055 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r148()
+    {
+        if ($this->security && substr($this->yystack[ $this->yyidx + - 1 ]->minor, 0, 1) == '_') {
+            $this->compiler->trigger_template_error(self::Err1);
+        }
+        $this->_retvalue =
+            '->' . $this->yystack[ $this->yyidx + - 1 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 1062 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r149()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::Err2);
+        }
+        $this->_retvalue = '->{' . $this->compiler->compileVariable($this->yystack[ $this->yyidx + - 1 ]->minor) .
+            $this->yystack[ $this->yyidx + 0 ]->minor . '}';
+    }
+
+    #line 1069 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r150()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::Err2);
+        }
+        $this->_retvalue =
+            '->{' . $this->yystack[ $this->yyidx + - 2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . '}';
+    }
+
+    #line 1076 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r151()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::Err2);
+        }
+        $this->_retvalue = '->{\'' . $this->yystack[ $this->yyidx + - 4 ]->minor . '\'.' .
+            $this->yystack[ $this->yyidx + - 2 ]->minor . $this->yystack[ $this->yyidx + 0 ]->minor . '}';
+    }
+
+    #line 1084 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r152()
+    {
+        $this->_retvalue = '->' . $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    #line 1092 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r153()
+    {
+        if (!$this->security ||
+            $this->security->isTrustedPhpFunction($this->yystack[ $this->yyidx + - 3 ]->minor, $this->compiler)
+        ) {
+            if (strcasecmp($this->yystack[ $this->yyidx + - 3 ]->minor, 'isset') === 0 ||
+                strcasecmp($this->yystack[ $this->yyidx + - 3 ]->minor, 'empty') === 0 ||
+                strcasecmp($this->yystack[ $this->yyidx + - 3 ]->minor, 'array') === 0 ||
+                is_callable($this->yystack[ $this->yyidx + - 3 ]->minor)
+            ) {
+                $func_name = strtolower($this->yystack[ $this->yyidx + - 3 ]->minor);
+                if ($func_name == 'isset') {
+                    if (count($this->yystack[ $this->yyidx + - 1 ]->minor) == 0) {
+                        $this->compiler->trigger_template_error('Illegal number of paramer in "isset()"');
+                    }
+                    $par = implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor);
+                    if (strncasecmp($par, '$_smarty_tpl->smarty->ext->_config->_getConfigVariable',
+                                    strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0
+                    ) {
+                        self::$prefix_number ++;
+                        $this->compiler->prefix_code[] =
+                            '<?php $_tmp' . self::$prefix_number . '=' . str_replace(')', ', false)', $par) . ';?>';
+                        $isset_par = '$_tmp' . self::$prefix_number;
+                    } else {
+                        $isset_par = str_replace("')->value", "',null,true,false)->value", $par);
+                    }
+                    $this->_retvalue = $this->yystack[ $this->yyidx + - 3 ]->minor . "(" . $isset_par . ")";
+                } elseif (in_array($func_name, array('empty', 'reset', 'current', 'end', 'prev', 'next'))) {
+                    if (count($this->yystack[ $this->yyidx + - 1 ]->minor) != 1) {
+                        $this->compiler->trigger_template_error('Illegal number of paramer in "empty()"');
+                    }
+                    if ($func_name == 'empty') {
+                        $this->_retvalue = $func_name . '(' . str_replace("')->value", "',null,true,false)->value",
+                                                                          $this->yystack[ $this->yyidx +
+                                                                          - 1 ]->minor[ 0 ]) . ')';
+                    } else {
+                        $this->_retvalue = $func_name . '(' . $this->yystack[ $this->yyidx + - 1 ]->minor[ 0 ] . ')';
+                    }
                 } else {
-                    $isset_par=str_replace("')->value","',null,true,false)->value",$par);
-                }
-                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")";
-            } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
-                if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
-                    $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
-                }
-                if ($func_name == 'empty') {
-                    $this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')';
-                } else {
-                    $this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')';
+                    $this->_retvalue = $this->yystack[ $this->yyidx + - 3 ]->minor . "(" .
+                        implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ")";
                 }
             } else {
-                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
+                $this->compiler->trigger_template_error("unknown function \"" .
+                                                        $this->yystack[ $this->yyidx + - 3 ]->minor . "\"");
             }
-        } else {
-            $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
         }
     }
+
+    #line 1131 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r154()
+    {
+        if ($this->security && substr($this->yystack[ $this->yyidx + - 3 ]->minor, 0, 1) == '_') {
+            $this->compiler->trigger_template_error(self::Err1);
+        }
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 3 ]->minor . "(" .
+            implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ")";
     }
-#line 2900 "smarty_internal_templateparser.php"
-#line 1007 "smarty_internal_templateparser.y"
-    function yy_r154(){
-    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') {
-        $this->compiler->trigger_template_error (self::Err1);
+
+    #line 1138 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r155()
+    {
+        if ($this->security) {
+            $this->compiler->trigger_template_error(self::Err2);
+        }
+        self::$prefix_number ++;
+        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' .
+            $this->compiler->compileVariable('\'' . substr($this->yystack[ $this->yyidx + - 3 ]->minor, 1) . '\'') .
+            ';?>';
+        $this->_retvalue =
+            '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[ $this->yyidx + - 1 ]->minor) . ')';
     }
-    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
+
+    #line 1149 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r156()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[ $this->yyidx + - 2 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
     }
-#line 2908 "smarty_internal_templateparser.php"
-#line 1014 "smarty_internal_templateparser.y"
-    function yy_r155(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
+
+    #line 1166 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r159()
+    {
+        $this->_retvalue = array_merge($this->yystack[ $this->yyidx + - 2 ]->minor,
+                                       array(array_merge($this->yystack[ $this->yyidx + - 1 ]->minor,
+                                                         $this->yystack[ $this->yyidx + 0 ]->minor)));
     }
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->compileVariable("'".$this->yystack[$this->yyidx + -3]->minor."'").';?>';
-    $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+
+    #line 1170 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r160()
+    {
+        $this->_retvalue =
+            array(array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor));
     }
-#line 2918 "smarty_internal_templateparser.php"
-#line 1025 "smarty_internal_templateparser.y"
-    function yy_r156(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
+
+    #line 1178 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r162()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 2923 "smarty_internal_templateparser.php"
-#line 1042 "smarty_internal_templateparser.y"
-    function yy_r159(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
+
+    #line 1186 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r163()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 2928 "smarty_internal_templateparser.php"
-#line 1046 "smarty_internal_templateparser.y"
-    function yy_r160(){
-    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
+
+    #line 1205 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r167()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '', 'method');
     }
-#line 2933 "smarty_internal_templateparser.php"
-#line 1054 "smarty_internal_templateparser.y"
-    function yy_r162(){
-    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
+
+    #line 1210 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r168()
+    {
+        $this->_retvalue =
+            array($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'method');
     }
-#line 2938 "smarty_internal_templateparser.php"
-#line 1062 "smarty_internal_templateparser.y"
-    function yy_r163(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+
+    #line 1215 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r169()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + 0 ]->minor, '');
     }
-#line 2943 "smarty_internal_templateparser.php"
-#line 1096 "smarty_internal_templateparser.y"
-    function yy_r170(){
-    $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 1220 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r170()
+    {
+        $this->_retvalue =
+            array($this->yystack[ $this->yyidx + - 1 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor, 'property');
     }
-#line 2948 "smarty_internal_templateparser.php"
-#line 1101 "smarty_internal_templateparser.y"
-    function yy_r171(){
-    $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 1225 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r171()
+    {
+        $this->_retvalue = array($this->yystack[ $this->yyidx + - 2 ]->minor,
+                                 $this->yystack[ $this->yyidx + - 1 ]->minor .
+                                 $this->yystack[ $this->yyidx + 0 ]->minor, 'property');
     }
-#line 2953 "smarty_internal_templateparser.php"
-#line 1107 "smarty_internal_templateparser.y"
-    function yy_r172(){
-    $this->_retvalue = '==';
+
+    #line 1231 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r172()
+    {
+        $this->_retvalue[ 'op' ] = ' ' . trim($this->yystack[ $this->yyidx + 0 ]->minor) . ' ';
     }
-#line 2958 "smarty_internal_templateparser.php"
-#line 1111 "smarty_internal_templateparser.y"
-    function yy_r173(){
-    $this->_retvalue = '!=';
+
+    #line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r173()
+    {
+        static $lops = array('eq'          => array('op' => ' == ', 'pre' => null),
+                             'ne'          => array('op' => ' != ', 'pre' => null),
+                             'neq'         => array('op' => ' != ', 'pre' => null),
+                             'gt'          => array('op' => ' > ', 'pre' => null),
+                             'ge'          => array('op' => ' >= ', 'pre' => null),
+                             'gte'         => array('op' => ' >= ', 'pre' => null),
+                             'lt'          => array('op' => ' < ', 'pre' => null),
+                             'le'          => array('op' => ' <= ', 'pre' => null),
+                             'lte'         => array('op' => ' <= ', 'pre' => null),
+                             'mod'         => array('op' => ' % ', 'pre' => null),
+                             'and'         => array('op' => ' && ', 'pre' => null),
+                             'or'          => array('op' => ' || ', 'pre' => null),
+                             'xor'         => array('op' => ' xor ', 'pre' => null),
+                             'isdivby'     => array('op' => ' % ', 'pre' => '!('),
+                             'isnotdivby'  => array('op' => ' % ', 'pre' => '('),
+                             'isevenby'    => array('op' => ' / ', 'pre' => '!(1 & '),
+                             'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+                             'isoddby'     => array('op' => ' / ', 'pre' => '(1 & '),
+                             'isnotoddby'  => array('op' => ' / ', 'pre' => '!(1 & '),);
+        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[ $this->yyidx + 0 ]->minor));
+        $this->_retvalue = $lops[ $op ];
     }
-#line 2963 "smarty_internal_templateparser.php"
-#line 1115 "smarty_internal_templateparser.y"
-    function yy_r174(){
-    $this->_retvalue = '>';
+
+    #line 1261 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r174()
+    {
+        static $scond =
+            array('iseven' => '!(1 & ', 'isnoteven' => '(1 & ', 'isodd' => '(1 & ', 'isnotodd' => '!(1 & ',);
+        $op = strtolower(str_replace(' ', '', $this->yystack[ $this->yyidx + 0 ]->minor));
+        $this->_retvalue = $scond[ $op ];
     }
-#line 2968 "smarty_internal_templateparser.php"
-#line 1119 "smarty_internal_templateparser.y"
-    function yy_r175(){
-    $this->_retvalue = '<';
+
+    #line 1275 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r175()
+    {
+        $this->_retvalue = 'array(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')';
     }
-#line 2973 "smarty_internal_templateparser.php"
-#line 1123 "smarty_internal_templateparser.y"
-    function yy_r176(){
-    $this->_retvalue = '>=';
+
+    #line 1283 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r177()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + - 2 ]->minor . ',' . $this->yystack[ $this->yyidx + 0 ]->minor;
     }
-#line 2978 "smarty_internal_templateparser.php"
-#line 1127 "smarty_internal_templateparser.y"
-    function yy_r177(){
-    $this->_retvalue = '<=';
+
+    #line 1291 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r179()
+    {
+        $this->_retvalue =
+            $this->yystack[ $this->yyidx + - 2 ]->minor . '=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
     }
-#line 2983 "smarty_internal_templateparser.php"
-#line 1131 "smarty_internal_templateparser.y"
-    function yy_r178(){
-    $this->_retvalue = '===';
+
+    #line 1295 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r180()
+    {
+        $this->_retvalue =
+            '\'' . $this->yystack[ $this->yyidx + - 2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor;
     }
-#line 2988 "smarty_internal_templateparser.php"
-#line 1135 "smarty_internal_templateparser.y"
-    function yy_r179(){
-    $this->_retvalue = '!==';
+
+    #line 1311 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r183()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor->to_smarty_php($this);
     }
-#line 2993 "smarty_internal_templateparser.php"
-#line 1139 "smarty_internal_templateparser.y"
-    function yy_r180(){
-    $this->_retvalue = '%';
+
+    #line 1316 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r184()
+    {
+        $this->yystack[ $this->yyidx + - 1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor;
     }
-#line 2998 "smarty_internal_templateparser.php"
-#line 1143 "smarty_internal_templateparser.y"
-    function yy_r181(){
-    $this->_retvalue = '&&';
+
+    #line 1321 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r185()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 3003 "smarty_internal_templateparser.php"
-#line 1147 "smarty_internal_templateparser.y"
-    function yy_r182(){
-    $this->_retvalue = '||';
+
+    #line 1325 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r186()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + - 1 ]->minor);
     }
-#line 3008 "smarty_internal_templateparser.php"
-#line 1151 "smarty_internal_templateparser.y"
-    function yy_r183(){
-    $this->_retvalue = ' XOR ';
+
+    #line 1333 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r188()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' .
+                                                              substr($this->yystack[ $this->yyidx + 0 ]->minor, 1) .
+                                                              '\']->value');
     }
-#line 3013 "smarty_internal_templateparser.php"
-#line 1158 "smarty_internal_templateparser.y"
-    function yy_r184(){
-    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
+
+    #line 1341 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r190()
+    {
+        $this->_retvalue =
+            new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + - 1 ]->minor . ')');
     }
-#line 3018 "smarty_internal_templateparser.php"
-#line 1166 "smarty_internal_templateparser.y"
-    function yy_r186(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 1345 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r191()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 3023 "smarty_internal_templateparser.php"
-#line 1174 "smarty_internal_templateparser.y"
-    function yy_r188(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
+
+    #line 1349 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r192()
+    {
+        $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[ $this->yyidx + 0 ]->minor);
     }
-#line 3028 "smarty_internal_templateparser.php"
-#line 1178 "smarty_internal_templateparser.y"
-    function yy_r189(){
-    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 3033 "smarty_internal_templateparser.php"
-#line 1190 "smarty_internal_templateparser.y"
-    function yy_r191(){
-    $this->_retvalue = "''";
-    }
-#line 3038 "smarty_internal_templateparser.php"
-#line 1194 "smarty_internal_templateparser.y"
-    function yy_r192(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();
-    }
-#line 3043 "smarty_internal_templateparser.php"
-#line 1199 "smarty_internal_templateparser.y"
-    function yy_r193(){
-    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-#line 3049 "smarty_internal_templateparser.php"
-#line 1204 "smarty_internal_templateparser.y"
-    function yy_r194(){
-    $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3054 "smarty_internal_templateparser.php"
-#line 1208 "smarty_internal_templateparser.y"
-    function yy_r195(){
-    $this->_retvalue = new _smarty_code($this, '(string)'.$this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 3059 "smarty_internal_templateparser.php"
-#line 1216 "smarty_internal_templateparser.y"
-    function yy_r197(){
-    $this->_retvalue = new _smarty_code($this, '(string)$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
-    }
-#line 3064 "smarty_internal_templateparser.php"
-#line 1224 "smarty_internal_templateparser.y"
-    function yy_r199(){
-    $this->_retvalue = new _smarty_code($this, '(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
-    }
-#line 3069 "smarty_internal_templateparser.php"
-#line 1228 "smarty_internal_templateparser.y"
-    function yy_r200(){
-    $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3074 "smarty_internal_templateparser.php"
-#line 1232 "smarty_internal_templateparser.y"
-    function yy_r201(){
-    $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3079 "smarty_internal_templateparser.php"
 
     private $_retvalue;
 
-    function yy_reduce($yyruleno)
+    public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$yyTracePrompt, $yyruleno,
-                self::$yyRuleName[$yyruleno]);
+        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno,
+                    self::$yyRuleName[ $yyruleno ]);
         }
 
         $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+        if (isset(self::$yyReduceMap[ $yyruleno ])) {
             // call the action
             $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
         $this->yyidx -= $yysize;
-        for($i = $yysize; $i; $i--) {
+        for ($i = $yysize; $i; $i --) {
             // pop all of the right-hand side parameters
             array_pop($this->yystack);
         }
-        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
         if ($yyact < self::YYNSTATE) {
-            if (!self::$yyTraceFILE && $yysize) {
-                $this->yyidx++;
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx ++;
                 $x = new TP_yyStackEntry;
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
                 $x->minor = $yy_lefthand_side;
-                $this->yystack[$this->yyidx] = $x;
+                $this->yystack[ $this->yyidx ] = $x;
             } else {
                 $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
             }
@@ -3125,73 +2711,68 @@ static public $yy_action = array(
         }
     }
 
-    function yy_parse_failed()
+    public function yy_parse_failed()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
 
-    function yy_syntax_error($yymajor, $TOKEN)
+    public function yy_syntax_error($yymajor, $TOKEN)
     {
-#line 77 "smarty_internal_templateparser.y"
+        #line 207 "../smarty/lexer/smarty_internal_templateparser.y"
 
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_template_error();
-#line 3142 "smarty_internal_templateparser.php"
+        $this->internalError = true;
+        $this->yymajor = $yymajor;
+        $this->compiler->trigger_template_error();
     }
 
-    function yy_accept()
+    public function yy_accept()
     {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+            $this->yy_pop_parser_stack();
         }
-#line 69 "smarty_internal_templateparser.y"
+        #line 200 "../smarty/lexer/smarty_internal_templateparser.y"
 
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    //echo $this->retvalue."\n\n";
-#line 3160 "smarty_internal_templateparser.php"
+        $this->successful = !$this->internalError;
+        $this->internalError = false;
+        $this->retvalue = $this->_retvalue;
     }
 
-    function doParse($yymajor, $yytokenvalue)
+    public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */
 
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
-            $this->yyerrcnt = -1;
+            $this->yyerrcnt = - 1;
             $x = new TP_yyStackEntry;
             $x->stateno = 0;
             $x->major = 0;
             $this->yystack = array();
-            array_push($this->yystack, $x);
+            $this->yystack[] = $x;
         }
-        $yyendofinput = ($yymajor==0);
+        $yyendofinput = ($yymajor == 0);
 
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sInput %s\n",
-                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
         }
 
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
+            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
             if ($yyact < self::YYNSTATE) {
                 $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt--;
+                $this->yyerrcnt --;
                 if ($yyendofinput && $this->yyidx >= 0) {
                     $yymajor = 0;
                 } else {
@@ -3200,30 +2781,27 @@ static public $yy_action = array(
             } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
                 $this->yy_reduce($yyact - self::YYNSTATE);
             } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if (self::$yyTraceFILE) {
-                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
-                        self::$yyTracePrompt);
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
-                    $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
-                        if (self::$yyTraceFILE) {
-                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
-                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                    $yymx = $this->yystack[ $this->yyidx ]->major;
+                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt,
+                                    $this->yyTokenName[ $yymajor ]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
-                        while ($this->yyidx >= 0 &&
-                                 $yymx != self::YYERRORSYMBOL &&
-        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                              ){
+                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL &&
+                            ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
                             $this->yy_pop_parser_stack();
                         }
-                        if ($this->yyidx < 0 || $yymajor==0) {
+                        if ($this->yyidx < 0 || $yymajor == 0) {
                             $this->yy_destructor($yymajor, $yytokenvalue);
                             $this->yy_parse_failed();
                             $yymajor = self::YYNOCODE;
@@ -3252,3 +2830,4 @@ static public $yy_action = array(
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
+
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_testinstall.php b/sources/include/smarty/libs/sysplugins/smarty_internal_testinstall.php
new file mode 100644
index 0000000..72d9a52
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_testinstall.php
@@ -0,0 +1,604 @@
+<?php
+/**
+ * Smarty Internal TestInstall
+ * Test Smarty installation
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ * @author     Uwe Tews
+ */
+
+/**
+ * TestInstall class
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ */
+class Smarty_Internal_TestInstall
+{
+    /**
+     * diagnose Smarty setup
+     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
+     *
+     * @param  array $errors array to push results into rather than outputting them
+     *
+     * @return bool   status, true if everything is fine, false else
+     */
+    public static function testInstall(Smarty $smarty, &$errors = null)
+    {
+        $status = true;
+
+        if ($errors === null) {
+            echo "<PRE>\n";
+            echo "Smarty Installation test...\n";
+            echo "Testing template directory...\n";
+        }
+
+        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
+
+        // test if all registered template_dir are accessible
+        foreach ($smarty->getTemplateDir() as $template_dir) {
+            $_template_dir = $template_dir;
+            $template_dir = realpath($template_dir);
+            // resolve include_path or fail existence
+            if (!$template_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $template_dir = stream_resolve_include_path($_template_dir);
+                    } else {
+                        $template_dir = $smarty->ext->_getIncludePath->getIncludePath($_template_dir, null, $smarty);
+                    }
+
+                    if ($template_dir !== false) {
+                        if ($errors === null) {
+                            echo "$template_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message =
+                            "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'template_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_template_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'template_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } elseif (!is_readable($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$template_dir is OK.\n";
+                }
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing compile directory...\n";
+        }
+
+        // test if registered compile_dir is accessible
+        $__compile_dir = $smarty->getCompileDir();
+        $_compile_dir = realpath($__compile_dir);
+        if (!$_compile_dir) {
+            $status = false;
+            $message = "FAILED: {$__compile_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_dir($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_readable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_writable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_compile_dir} is OK.\n";
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing plugins directory...\n";
+        }
+
+        // test if all registered plugins_dir are accessible
+        // and if core plugins directory is still registered
+        $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
+        $_core_plugins_available = false;
+        foreach ($smarty->getPluginsDir() as $plugin_dir) {
+            $_plugin_dir = $plugin_dir;
+            $plugin_dir = realpath($plugin_dir);
+            // resolve include_path or fail existence
+            if (!$plugin_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
+                    } else {
+                        $plugin_dir = $smarty->ext->_getIncludePath->getIncludePath($_plugin_dir, null, $smarty);
+                    }
+
+                    if ($plugin_dir !== false) {
+                        if ($errors === null) {
+                            echo "$plugin_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'plugins_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_plugin_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'plugins_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif (!is_readable($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
+                $_core_plugins_available = true;
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            }
+        }
+        if (!$_core_plugins_available) {
+            $status = false;
+            $message = "WARNING: Smarty's own libs/plugins is not available";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } elseif (!isset($errors[ 'plugins_dir' ])) {
+                $errors[ 'plugins_dir' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing cache directory...\n";
+        }
+
+        // test if all registered cache_dir is accessible
+        $__cache_dir = $smarty->getCacheDir();
+        $_cache_dir = realpath($__cache_dir);
+        if (!$_cache_dir) {
+            $status = false;
+            $message = "FAILED: {$__cache_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_dir($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_readable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_writable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_cache_dir} is OK.\n";
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing configs directory...\n";
+        }
+
+        // test if all registered config_dir are accessible
+        foreach ($smarty->getConfigDir() as $config_dir) {
+            $_config_dir = $config_dir;
+            // resolve include_path or fail existence
+            if (!$config_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $config_dir = stream_resolve_include_path($_config_dir);
+                    } else {
+                        $config_dir = $smarty->ext->_getIncludePath->getIncludePath($_config_dir, null, $smarty);
+                    }
+
+                    if ($config_dir !== false) {
+                        if ($errors === null) {
+                            echo "$config_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'config_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_config_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'config_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } elseif (!is_readable($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$config_dir is OK.\n";
+                }
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing sysplugin files...\n";
+        }
+        // test if sysplugins are available
+        $source = SMARTY_SYSPLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedSysplugins = array('smartycompilerexception.php'                               => true,
+                                        'smartyexception.php'                                       => true,
+                                        'smarty_cacheresource.php'                                  => true,
+                                        'smarty_cacheresource_custom.php'                           => true,
+                                        'smarty_cacheresource_keyvaluestore.php'                    => true,
+                                        'smarty_data.php'                                           => true,
+                                        'smarty_internal_cacheresource_file.php'                    => true,
+                                        'smarty_internal_compilebase.php'                           => true,
+                                        'smarty_internal_compile_append.php'                        => true,
+                                        'smarty_internal_compile_assign.php'                        => true,
+                                        'smarty_internal_compile_block.php'                         => true,
+                                        'smarty_internal_compile_break.php'                         => true,
+                                        'smarty_internal_compile_call.php'                          => true,
+                                        'smarty_internal_compile_capture.php'                       => true,
+                                        'smarty_internal_compile_config_load.php'                   => true,
+                                        'smarty_internal_compile_continue.php'                      => true,
+                                        'smarty_internal_compile_debug.php'                         => true,
+                                        'smarty_internal_compile_eval.php'                          => true,
+                                        'smarty_internal_compile_extends.php'                       => true,
+                                        'smarty_internal_compile_for.php'                           => true,
+                                        'smarty_internal_compile_foreach.php'                       => true,
+                                        'smarty_internal_compile_function.php'                      => true,
+                                        'smarty_internal_compile_if.php'                            => true,
+                                        'smarty_internal_compile_include.php'                       => true,
+                                        'smarty_internal_compile_include_php.php'                   => true,
+                                        'smarty_internal_compile_insert.php'                        => true,
+                                        'smarty_internal_compile_ldelim.php'                        => true,
+                                        'smarty_internal_compile_nocache.php'                       => true,
+                                        'smarty_internal_compile_private_block_plugin.php'          => true,
+                                        'smarty_internal_compile_private_foreachsection.php'        => true,
+                                        'smarty_internal_compile_private_function_plugin.php'       => true,
+                                        'smarty_internal_compile_private_modifier.php'              => true,
+                                        'smarty_internal_compile_private_object_block_function.php' => true,
+                                        'smarty_internal_compile_private_object_function.php'       => true,
+                                        'smarty_internal_compile_private_php.php'                   => true,
+                                        'smarty_internal_compile_private_print_expression.php'      => true,
+                                        'smarty_internal_compile_private_registered_block.php'      => true,
+                                        'smarty_internal_compile_private_registered_function.php'   => true,
+                                        'smarty_internal_compile_private_special_variable.php'      => true,
+                                        'smarty_internal_compile_rdelim.php'                        => true,
+                                        'smarty_internal_compile_section.php'                       => true,
+                                        'smarty_internal_compile_setfilter.php'                     => true,
+                                        'smarty_internal_compile_shared_inheritance.php'            => true,
+                                        'smarty_internal_compile_while.php'                         => true,
+                                        'smarty_internal_configfilelexer.php'                       => true,
+                                        'smarty_internal_configfileparser.php'                      => true,
+                                        'smarty_internal_config_file_compiler.php'                  => true,
+                                        'smarty_internal_data.php'                                  => true,
+                                        'smarty_internal_debug.php'                                 => true,
+                                        'smarty_internal_extension_clear.php'                       => true,
+                                        'smarty_internal_extension_handler.php'                     => true,
+                                        'smarty_internal_method_addautoloadfilters.php'             => true,
+                                        'smarty_internal_method_adddefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_append.php'                         => true,
+                                        'smarty_internal_method_appendbyref.php'                    => true,
+                                        'smarty_internal_method_assignbyref.php'                    => true,
+                                        'smarty_internal_method_assignglobal.php'                   => true,
+                                        'smarty_internal_method_clearallassign.php'                 => true,
+                                        'smarty_internal_method_clearallcache.php'                  => true,
+                                        'smarty_internal_method_clearassign.php'                    => true,
+                                        'smarty_internal_method_clearcache.php'                     => true,
+                                        'smarty_internal_method_clearcompiledtemplate.php'          => true,
+                                        'smarty_internal_method_clearconfig.php'                    => true,
+                                        'smarty_internal_method_compileallconfig.php'               => true,
+                                        'smarty_internal_method_compilealltemplates.php'            => true,
+                                        'smarty_internal_method_configload.php'                     => true,
+                                        'smarty_internal_method_createdata.php'                     => true,
+                                        'smarty_internal_method_getautoloadfilters.php'             => true,
+                                        'smarty_internal_method_getconfigvars.php'                  => true,
+                                        'smarty_internal_method_getdebugtemplate.php'               => true,
+                                        'smarty_internal_method_getdefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_getregisteredobject.php'            => true,
+                                        'smarty_internal_method_getstreamvariable.php'              => true,
+                                        'smarty_internal_method_gettags.php'                        => true,
+                                        'smarty_internal_method_gettemplatevars.php'                => true,
+                                        'smarty_internal_method_loadfilter.php'                     => true,
+                                        'smarty_internal_method_loadplugin.php'                     => true,
+                                        'smarty_internal_method_mustcompile.php'                    => true,
+                                        'smarty_internal_method_registercacheresource.php'          => true,
+                                        'smarty_internal_method_registerclass.php'                  => true,
+                                        'smarty_internal_method_registerdefaultconfighandler.php'   => true,
+                                        'smarty_internal_method_registerdefaultpluginhandler.php'   => true,
+                                        'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
+                                        'smarty_internal_method_registerfilter.php'                 => true,
+                                        'smarty_internal_method_registerobject.php'                 => true,
+                                        'smarty_internal_method_registerplugin.php'                 => true,
+                                        'smarty_internal_method_registerresource.php'               => true,
+                                        'smarty_internal_method_setautoloadfilters.php'             => true,
+                                        'smarty_internal_method_setdebugtemplate.php'               => true,
+                                        'smarty_internal_method_setdefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_unloadfilter.php'                   => true,
+                                        'smarty_internal_method_unregistercacheresource.php'        => true,
+                                        'smarty_internal_method_unregisterfilter.php'               => true,
+                                        'smarty_internal_method_unregisterobject.php'               => true,
+                                        'smarty_internal_method_unregisterplugin.php'               => true,
+                                        'smarty_internal_method_unregisterresource.php'             => true,
+                                        'smarty_internal_nocache_insert.php'                        => true,
+                                        'smarty_internal_parsetree.php'                             => true,
+                                        'smarty_internal_parsetree_code.php'                        => true,
+                                        'smarty_internal_parsetree_dq.php'                          => true,
+                                        'smarty_internal_parsetree_dqcontent.php'                   => true,
+                                        'smarty_internal_parsetree_tag.php'                         => true,
+                                        'smarty_internal_parsetree_template.php'                    => true,
+                                        'smarty_internal_parsetree_text.php'                        => true,
+                                        'smarty_internal_resource_eval.php'                         => true,
+                                        'smarty_internal_resource_extends.php'                      => true,
+                                        'smarty_internal_resource_file.php'                         => true,
+                                        'smarty_internal_resource_php.php'                          => true,
+                                        'smarty_internal_resource_registered.php'                   => true,
+                                        'smarty_internal_resource_stream.php'                       => true,
+                                        'smarty_internal_resource_string.php'                       => true,
+                                        'smarty_internal_runtime_cachemodify.php'                   => true,
+                                        'smarty_internal_runtime_codeframe.php'                     => true,
+                                        'smarty_internal_runtime_filterhandler.php'                 => true,
+                                        'smarty_internal_runtime_foreach.php'                       => true,
+                                        'smarty_internal_runtime_getincludepath.php'                => true,
+                                        'smarty_internal_runtime_hhvm.php'                          => true,
+                                        'smarty_internal_runtime_inheritance.php'                   => true,
+                                        'smarty_internal_runtime_subtemplate.php'                   => true,
+                                        'smarty_internal_runtime_tplfunction.php'                   => true,
+                                        'smarty_internal_runtime_updatecache.php'                   => true,
+                                        'smarty_internal_runtime_updatescope.php'                   => true,
+                                        'smarty_internal_runtime_validatecompiled.php'              => true,
+                                        'smarty_internal_runtime_var.php'                           => true,
+                                        'smarty_internal_runtime_writefile.php'                     => true,
+                                        'smarty_internal_smartytemplatecompiler.php'                => true,
+                                        'smarty_internal_template.php'                              => true,
+                                        'smarty_internal_templatebase.php'                          => true,
+                                        'smarty_internal_templatecompilerbase.php'                  => true,
+                                        'smarty_internal_templatelexer.php'                         => true,
+                                        'smarty_internal_templateparser.php'                        => true,
+                                        'smarty_internal_testinstall.php'                           => true,
+                                        'smarty_internal_undefined.php'                             => true,
+                                        'smarty_resource.php'                                       => true,
+                                        'smarty_resource_custom.php'                                => true,
+                                        'smarty_resource_recompiled.php'                            => true,
+                                        'smarty_resource_uncompiled.php'                            => true,
+                                        'smarty_security.php'                                       => true,
+                                        'smarty_template_cached.php'                                => true,
+                                        'smarty_template_compiled.php'                              => true,
+                                        'smarty_template_config.php'                                => true,
+                                        'smarty_template_resource_base.php'                         => true,
+                                        'smarty_template_source.php'                                => true,
+                                        'smarty_undefined_variable.php'                             => true,
+                                        'smarty_variable.php'                                       => true,);
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedSysplugins[ $filename ])) {
+                        unset($expectedSysplugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedSysplugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expectedSysplugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'sysplugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'sysplugins_dir_constant' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing plugin files...\n";
+        }
+        // test if core plugins are available
+        $source = SMARTY_PLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedPlugins =
+                array('block.textformat.php'                  => true, 'function.counter.php' => true,
+                      'function.cycle.php'                    => true, 'function.fetch.php' => true,
+                      'function.html_checkboxes.php'          => true, 'function.html_image.php' => true,
+                      'function.html_options.php'             => true, 'function.html_radios.php' => true,
+                      'function.html_select_date.php'         => true, 'function.html_select_time.php' => true,
+                      'function.html_table.php'               => true, 'function.mailto.php' => true,
+                      'function.math.php'                     => true, 'modifier.capitalize.php' => true,
+                      'modifier.date_format.php'              => true, 'modifier.debug_print_var.php' => true,
+                      'modifier.escape.php'                   => true, 'modifier.regex_replace.php' => true,
+                      'modifier.replace.php'                  => true, 'modifier.spacify.php' => true,
+                      'modifier.truncate.php'                 => true, 'modifiercompiler.cat.php' => true,
+                      'modifiercompiler.count_characters.php' => true, 'modifiercompiler.count_paragraphs.php' => true,
+                      'modifiercompiler.count_sentences.php'  => true, 'modifiercompiler.count_words.php' => true,
+                      'modifiercompiler.default.php'          => true, 'modifiercompiler.escape.php' => true,
+                      'modifiercompiler.from_charset.php'     => true, 'modifiercompiler.indent.php' => true,
+                      'modifiercompiler.lower.php'            => true, 'modifiercompiler.noprint.php' => true,
+                      'modifiercompiler.string_format.php'    => true, 'modifiercompiler.strip.php' => true,
+                      'modifiercompiler.strip_tags.php'       => true, 'modifiercompiler.to_charset.php' => true,
+                      'modifiercompiler.unescape.php'         => true, 'modifiercompiler.upper.php' => true,
+                      'modifiercompiler.wordwrap.php'         => true, 'outputfilter.trimwhitespace.php' => true,
+                      'shared.escape_special_chars.php'       => true, 'shared.literal_compiler_param.php' => true,
+                      'shared.make_timestamp.php'             => true, 'shared.mb_str_replace.php' => true,
+                      'shared.mb_unicode.php'                 => true, 'shared.mb_wordwrap.php' => true,
+                      'variablefilter.htmlspecialchars.php'   => true,);
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedPlugins[ $filename ])) {
+                        unset($expectedPlugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedPlugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expectedPlugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'plugins_dir_constant' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Tests complete.\n";
+            echo "</PRE>\n";
+        }
+
+        return $status;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_undefined.php b/sources/include/smarty/libs/sysplugins/smarty_internal_undefined.php
new file mode 100644
index 0000000..93fca8e
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_internal_undefined.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Smarty Method AppendByRef
+ *
+ * Smarty::appendByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Undefined
+{
+
+    /**
+     * This function is executed automatically when a compiled or cached template file is included
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param  array $properties special template properties
+     * @param  bool  $cache      flag if called from cache file
+     *
+     * @return bool  flag if compiled or cache file is valid
+     */
+    public function decodeProperties($tpl, $properties, $cache = false)
+    {
+        if ($cache) {
+            $tpl->cached->valid = false;
+        } else {
+            $tpl->mustCompile = true;
+        }
+        return false;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        throw new SmartyException(get_class($args[0]) . "->{$name}() undefined method");
+    }
+}
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_internal_utility.php b/sources/include/smarty/libs/sysplugins/smarty_internal_utility.php
deleted file mode 100644
index f19ca01..0000000
--- a/sources/include/smarty/libs/sysplugins/smarty_internal_utility.php
+++ /dev/null
@@ -1,830 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        smarty_internal_utility.php
- * SVN:         $Id: $
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @package Smarty
- * @subpackage PluginsInternal
- * @version 3-SVN$Rev: 3286 $
- */
-
-
-/**
- * Utility class
- *
- * @package Smarty
- * @subpackage Security
- */
-class Smarty_Internal_Utility {
-
-    /**
-     * private constructor to prevent calls creation of new instances
-     */
-    private final function __construct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param string $extension     template file name extension
-     * @param bool   $force_compile force all to recompile
-     * @param int    $time_limit    set maximum execution time
-     * @param int    $max_errors    set maximum allowed errors
-     * @param Smarty $smarty        Smarty instance
-     * @return integer number of template files compiled
-     */
-    public static function compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach($smarty->getTemplateDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
-                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
-                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-                   $_template_file = $_file;
-                } else {
-                   $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_template_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_tpl = $smarty->createTemplate($_template_file,null,null,null,false);
-                    if ($_tpl->mustCompile()) {
-                        $_tpl->compileTemplateSource();
-                        $_count++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count++;
-                }
-                // free memory
-                $smarty->template_objects = array();
-                $_tpl->smarty->template_objects = array();
-                $_tpl = null;
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-        return $_count;
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param string $extension     config file name extension
-     * @param bool   $force_compile force all to recompile
-     * @param int    $time_limit    set maximum execution time
-     * @param int    $max_errors    set maximum allowed errors
-     * @param Smarty $smarty        Smarty instance
-     * @return integer number of config files compiled
-     */
-    public static function compileAllConfig($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach($smarty->getConfigDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
-                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
-                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-                    $_config_file = $_file;
-                } else {
-                    $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_config_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_config = new Smarty_Internal_Config($_config_file, $smarty);
-                    if ($_config->mustCompile()) {
-                        $_config->compileConfigSource();
-                        $_count++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count++;
-                }
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-        return $_count;
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param string  $resource_name template name
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
-     * @param Smarty  $smarty        Smarty instance
-     * @return integer number of template files deleted
-     */
-    public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty)
-    {
-        $_compile_dir = $smarty->getCompileDir();
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = false;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                 $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath));
-                 $_resource_part_1_length = strlen($_resource_part_1);
-            } else {
-                return 0;
-            }
-
-            $_resource_part_2 = str_replace('.php','.cache.php',$_resource_part_1);
-            $_resource_part_2_length = strlen($_resource_part_2);
-        }
-        $_dir = $_compile_dir;
-        if ($smarty->use_sub_dirs && isset($_compile_id)) {
-            $_dir .= $_compile_id . $_dir_sep;
-        }
-        if (isset($_compile_id)) {
-            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
-            $_compile_id_part_length = strlen($_compile_id_part);
-        }
-        $_count = 0;
-        try {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-        // NOTE: UnexpectedValueException thrown for PHP >= 5.3
-        } catch (Exception $e) {
-            return 0;
-        }
-        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($_compile as $_file) {
-            if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false)
-                continue;
-
-            $_filepath = (string) $_file;
-
-            if ($_file->isDir()) {
-                if (!$_compile->isDot()) {
-                    // delete folder if empty
-                    @rmdir($_file->getPathname());
-                }
-            } else {
-                $unlink = false;
-                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
-                    && (!isset($resource_name)
-                        || (isset($_filepath[$_resource_part_1_length])
-                            && substr_compare($_filepath, $_resource_part_1, -$_resource_part_1_length, $_resource_part_1_length) == 0)
-                        || (isset($_filepath[$_resource_part_2_length])
-                            && substr_compare($_filepath, $_resource_part_2, -$_resource_part_2_length, $_resource_part_2_length) == 0))) {
-                    if (isset($exp_time)) {
-                        if (time() - @filemtime($_filepath) >= $exp_time) {
-                            $unlink = true;
-                        }
-                    } else {
-                        $unlink = true;
-                    }
-                }
-
-                if ($unlink && @unlink($_filepath)) {
-                    $_count++;
-                }
-            }
-        }
-        // clear compiled cache
-        Smarty_Resource::$sources = array();
-        Smarty_Resource::$compileds = array();
-        return $_count;
-    }
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param Smarty_Internal_Template $templae template object
-     * @return array of tag/attributes
-     */
-    public static function getTags(Smarty_Internal_Template $template)
-    {
-        $template->smarty->get_used_tags = true;
-        $template->compileTemplateSource();
-        return $template->used_tags;
-    }
-
-
-    /**
-     * diagnose Smarty setup
-     *
-     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
-     *
-     * @param Smarty $smarty  Smarty instance to test
-     * @param array  $errors array to push results into rather than outputting them
-     * @return bool status, true if everything is fine, false else
-     */
-    public static function testInstall(Smarty $smarty, &$errors=null)
-    {
-        $status = true;
-
-        if ($errors === null) {
-            echo "<PRE>\n";
-            echo "Smarty Installation test...\n";
-            echo "Testing template directory...\n";
-        }
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // test if all registered template_dir are accessible
-        foreach($smarty->getTemplateDir() as $template_dir) {
-            $_template_dir = $template_dir;
-            $template_dir = realpath($template_dir);
-            // resolve include_path or fail existance
-            if (!$template_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $template_dir = stream_resolve_include_path($_template_dir);
-                    } else {
-                        $template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir);
-                    }
-
-                    if ($template_dir !== false) {
-                        if ($errors === null) {
-                            echo "$template_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['template_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_template_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['template_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } elseif (!is_readable($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$template_dir is OK.\n";
-                }
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing compile directory...\n";
-        }
-
-        // test if registered compile_dir is accessible
-        $__compile_dir = $smarty->getCompileDir();
-        $_compile_dir = realpath($__compile_dir);
-        if (!$_compile_dir) {
-            $status = false;
-            $message = "FAILED: {$__compile_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_dir($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_readable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_writable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_compile_dir} is OK.\n";
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing plugins directory...\n";
-        }
-
-        // test if all registered plugins_dir are accessible
-        // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(dirname(__FILE__) .'/../plugins');
-        $_core_plugins_available = false;
-        foreach($smarty->getPluginsDir() as $plugin_dir) {
-            $_plugin_dir = $plugin_dir;
-            $plugin_dir = realpath($plugin_dir);
-            // resolve include_path or fail existance
-            if (!$plugin_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
-                    } else {
-                        $plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir);
-                    }
-
-                    if ($plugin_dir !== false) {
-                        if ($errors === null) {
-                            echo "$plugin_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['plugins_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_plugin_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['plugins_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif (!is_readable($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
-                $_core_plugins_available = true;
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            }
-        }
-        if (!$_core_plugins_available) {
-            $status = false;
-            $message = "WARNING: Smarty's own libs/plugins is not available";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } elseif (!isset($errors['plugins_dir'])) {
-                $errors['plugins_dir'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing cache directory...\n";
-        }
-
-
-        // test if all registered cache_dir is accessible
-        $__cache_dir = $smarty->getCacheDir();
-        $_cache_dir = realpath($__cache_dir);
-        if (!$_cache_dir) {
-            $status = false;
-            $message = "FAILED: {$__cache_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_dir($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_readable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_writable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_cache_dir} is OK.\n";
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing configs directory...\n";
-        }
-
-        // test if all registered config_dir are accessible
-        foreach($smarty->getConfigDir() as $config_dir) {
-            $_config_dir = $config_dir;
-            $config_dir = realpath($config_dir);
-            // resolve include_path or fail existance
-            if (!$config_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $config_dir = stream_resolve_include_path($_config_dir);
-                    } else {
-                        $config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir);
-                    }
-
-                    if ($config_dir !== false) {
-                        if ($errors === null) {
-                            echo "$config_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['config_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_config_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['config_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } elseif (!is_readable($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$config_dir is OK.\n";
-                }
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing sysplugin files...\n";
-        }
-        // test if sysplugins are available
-        $source = SMARTY_SYSPLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "smarty_cacheresource.php" => true,
-                "smarty_cacheresource_custom.php" => true,
-                "smarty_cacheresource_keyvaluestore.php" => true,
-                "smarty_config_source.php" => true,
-                "smarty_internal_cacheresource_file.php" => true,
-                "smarty_internal_compile_append.php" => true,
-                "smarty_internal_compile_assign.php" => true,
-                "smarty_internal_compile_block.php" => true,
-                "smarty_internal_compile_break.php" => true,
-                "smarty_internal_compile_call.php" => true,
-                "smarty_internal_compile_capture.php" => true,
-                "smarty_internal_compile_config_load.php" => true,
-                "smarty_internal_compile_continue.php" => true,
-                "smarty_internal_compile_debug.php" => true,
-                "smarty_internal_compile_eval.php" => true,
-                "smarty_internal_compile_extends.php" => true,
-                "smarty_internal_compile_for.php" => true,
-                "smarty_internal_compile_foreach.php" => true,
-                "smarty_internal_compile_function.php" => true,
-                "smarty_internal_compile_if.php" => true,
-                "smarty_internal_compile_include.php" => true,
-                "smarty_internal_compile_include_php.php" => true,
-                "smarty_internal_compile_insert.php" => true,
-                "smarty_internal_compile_ldelim.php" => true,
-                "smarty_internal_compile_nocache.php" => true,
-                "smarty_internal_compile_private_block_plugin.php" => true,
-                "smarty_internal_compile_private_function_plugin.php" => true,
-                "smarty_internal_compile_private_modifier.php" => true,
-                "smarty_internal_compile_private_object_block_function.php" => true,
-                "smarty_internal_compile_private_object_function.php" => true,
-                "smarty_internal_compile_private_print_expression.php" => true,
-                "smarty_internal_compile_private_registered_block.php" => true,
-                "smarty_internal_compile_private_registered_function.php" => true,
-                "smarty_internal_compile_private_special_variable.php" => true,
-                "smarty_internal_compile_rdelim.php" => true,
-                "smarty_internal_compile_section.php" => true,
-                "smarty_internal_compile_setfilter.php" => true,
-                "smarty_internal_compile_while.php" => true,
-                "smarty_internal_compilebase.php" => true,
-                "smarty_internal_config.php" => true,
-                "smarty_internal_config_file_compiler.php" => true,
-                "smarty_internal_configfilelexer.php" => true,
-                "smarty_internal_configfileparser.php" => true,
-                "smarty_internal_data.php" => true,
-                "smarty_internal_debug.php" => true,
-                "smarty_internal_filter_handler.php" => true,
-                "smarty_internal_function_call_handler.php" => true,
-                "smarty_internal_get_include_path.php" => true,
-                "smarty_internal_nocache_insert.php" => true,
-                "smarty_internal_parsetree.php" => true,
-                "smarty_internal_resource_eval.php" => true,
-                "smarty_internal_resource_extends.php" => true,
-                "smarty_internal_resource_file.php" => true,
-                "smarty_internal_resource_registered.php" => true,
-                "smarty_internal_resource_stream.php" => true,
-                "smarty_internal_resource_string.php" => true,
-                "smarty_internal_smartytemplatecompiler.php" => true,
-                "smarty_internal_template.php" => true,
-                "smarty_internal_templatebase.php" => true,
-                "smarty_internal_templatecompilerbase.php" => true,
-                "smarty_internal_templatelexer.php" => true,
-                "smarty_internal_templateparser.php" => true,
-                "smarty_internal_utility.php" => true,
-                "smarty_internal_write_file.php" => true,
-                "smarty_resource.php" => true,
-                "smarty_resource_custom.php" => true,
-                "smarty_resource_recompiled.php" => true,
-                "smarty_resource_uncompiled.php" => true,
-                "smarty_security.php" => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/sysplugins: ". join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['sysplugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: ". SMARTY_SYSPLUGINS_DIR .' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['sysplugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing plugin files...\n";
-        }
-        // test if core plugins are available
-        $source = SMARTY_PLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "block.textformat.php" => true,
-                "function.counter.php" => true,
-                "function.cycle.php" => true,
-                "function.fetch.php" => true,
-                "function.html_checkboxes.php" => true,
-                "function.html_image.php" => true,
-                "function.html_options.php" => true,
-                "function.html_radios.php" => true,
-                "function.html_select_date.php" => true,
-                "function.html_select_time.php" => true,
-                "function.html_table.php" => true,
-                "function.mailto.php" => true,
-                "function.math.php" => true,
-                "modifier.capitalize.php" => true,
-                "modifier.date_format.php" => true,
-                "modifier.debug_print_var.php" => true,
-                "modifier.escape.php" => true,
-                "modifier.regex_replace.php" => true,
-                "modifier.replace.php" => true,
-                "modifier.spacify.php" => true,
-                "modifier.truncate.php" => true,
-                "modifiercompiler.cat.php" => true,
-                "modifiercompiler.count_characters.php" => true,
-                "modifiercompiler.count_paragraphs.php" => true,
-                "modifiercompiler.count_sentences.php" => true,
-                "modifiercompiler.count_words.php" => true,
-                "modifiercompiler.default.php" => true,
-                "modifiercompiler.escape.php" => true,
-                "modifiercompiler.from_charset.php" => true,
-                "modifiercompiler.indent.php" => true,
-                "modifiercompiler.lower.php" => true,
-                "modifiercompiler.noprint.php" => true,
-                "modifiercompiler.string_format.php" => true,
-                "modifiercompiler.strip.php" => true,
-                "modifiercompiler.strip_tags.php" => true,
-                "modifiercompiler.to_charset.php" => true,
-                "modifiercompiler.unescape.php" => true,
-                "modifiercompiler.upper.php" => true,
-                "modifiercompiler.wordwrap.php" => true,
-                "outputfilter.trimwhitespace.php" => true,
-                "shared.escape_special_chars.php" => true,
-                "shared.literal_compiler_param.php" => true,
-                "shared.make_timestamp.php" => true,
-                "shared.mb_str_replace.php" => true,
-                "shared.mb_unicode.php" => true,
-                "shared.mb_wordwrap.php" => true,
-                "variablefilter.htmlspecialchars.php" => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/plugins: ". join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: ". SMARTY_PLUGINS_DIR .' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['plugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Tests complete.\n";
-            echo "</PRE>\n";
-        }
-
-        return $status;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_resource.php b/sources/include/smarty/libs/sysplugins/smarty_resource.php
index 55f1497..93d9fa7 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_resource.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_resource.php
@@ -2,62 +2,70 @@
 /**
  * Smarty Resource Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Resource Plugin
- *
  * Base implementation for resource plugins
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-abstract class Smarty_Resource {
+abstract class Smarty_Resource
+{
     /**
-     * cache for Smarty_Template_Source instances
-     * @var array
+     * Source is bypassing compiler
+     *
+     * @var boolean
      */
-    public static $sources = array();
+    public $uncompiled = false;
+
     /**
-     * cache for Smarty_Template_Compiled instances
-     * @var array
+     * Source must be recompiled on every occasion
+     *
+     * @var boolean
      */
-    public static $compileds = array();
-    /**
-     * cache for Smarty_Resource instances
-     * @var array
-     */
-    public static $resources = array();
+    public $recompiled = false;
+
     /**
      * resource types provided by the core
+     *
      * @var array
      */
-    protected static $sysplugins = array(
-        'file' => true,
-        'string' => true,
-        'extends' => true,
-        'stream' => true,
-        'eval' => true,
-        'php' => true
-    );
+    public static $sysplugins = array('file'    => 'smarty_internal_resource_file.php',
+                                      'string'  => 'smarty_internal_resource_string.php',
+                                      'extends' => 'smarty_internal_resource_extends.php',
+                                      'stream'  => 'smarty_internal_resource_stream.php',
+                                      'eval'    => 'smarty_internal_resource_eval.php',
+                                      'php'     => 'smarty_internal_resource_php.php');
+
+    /**
+     * Flag if resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = false;
 
     /**
      * Name of the Class to compile this resource's contents with
+     *
      * @var string
      */
     public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
 
     /**
      * Name of the Class to tokenize this resource's contents with
+     *
      * @var string
      */
     public $template_lexer_class = 'Smarty_Internal_Templatelexer';
 
     /**
      * Name of the Class to parse this resource's contents with
+     *
      * @var string
      */
     public $template_parser_class = 'Smarty_Internal_Templateparser';
@@ -65,21 +73,20 @@ abstract class Smarty_Resource {
     /**
      * Load template's source into current template object
      *
-     * {@internal The loaded source is assigned to $_template->source->content directly.}}
+     * @param  Smarty_Template_Source $source source object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
-    public abstract function getContent(Smarty_Template_Source $source);
+    abstract public function getContent(Smarty_Template_Source $source);
 
     /**
      * populate Source Object with meta data from Resource
      *
-     * @param Smarty_Template_Source   $source source object
-     * @param Smarty_Internal_Template $_template     template object
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
      */
-    public abstract function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null);
+    abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
 
     /**
      * populate Source Object with timestamp and exists from Resource
@@ -91,273 +98,38 @@ abstract class Smarty_Resource {
         // intentionally left blank
     }
 
-
     /**
      * modify resource_name according to resource handlers specifications
      *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
+     * @param  Smarty  $smarty        Smarty instance
+     * @param  string  $resource_name resource_name to make unique
+     * @param  boolean $isConfig      flag for config resource
+     *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
-        return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name;
-    }
-
-    /**
-     * populate Compiled Object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        $_filepath = $compiled->source->uid;
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        }
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        // caching token
-        if ($_template->caching) {
-            $_cache = '.cache';
+        if ($isConfig) {
+            if (!isset($smarty->_joined_config_dir)) {
+                $smarty->getTemplateDir(null, true);
+            }
+            return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
         } else {
-            $_cache = '';
-        }
-        $_compile_dir = $_template->smarty->getCompileDir();
-        // set basename if not specified
-        $_basename = $this->getBasename($compiled->source);
-        if ($_basename === null) {
-            $_basename = basename( preg_replace('![^\w\/]+!', '_', $compiled->source->name) );
-        }
-        // separate (optional) basename by dot
-        if ($_basename) {
-            $_basename = '.' . $_basename;
-        }
-
-        $compiled->filepath = $_compile_dir . $_filepath . '.' . $compiled->source->type . $_basename . $_cache . '.php';
-    }
-    
-    /**
-     * Normalize Paths "foo/../bar" to "bar" 
-     *
-     * @param string $_path path to normalize
-     * @param boolean $ds respect windows directory separator
-     * @return string normalized path
-     */
-    protected function normalizePath($_path, $ds=true)
-    {
-        if ($ds) {
-            // don't we all just love windows?
-            $_path = str_replace('\\', '/', $_path);
-        }
-        
-        $offset = 0;
-        
-        // resolve simples
-        $_path = preg_replace('#(/\./(\./)*)|/{2,}#', '/', $_path);
-        // resolve parents
-        while (true) {
-            $_parent = strpos($_path, '/../', $offset);
-            if (!$_parent) {
-                break;
-            } else if ($_path[$_parent - 1] === '.') {
-                $offset = $_parent + 3;
-                continue;
+            if (!isset($smarty->_joined_template_dir)) {
+                $smarty->getTemplateDir();
             }
-            
-            $_pos = strrpos($_path, '/', $_parent - strlen($_path) - 1);
-            if ($_pos === false) {
-                // don't we all just love windows?
-                $_pos = $_parent;
-            }
-            
-            $_path = substr_replace($_path, '', $_pos, $_parent + 3 - $_pos);
+            return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
         }
-        
-        if ($ds && DS != '/') {
-            // don't we all just love windows?
-            $_path = str_replace('/', '\\', $_path);
-        }
-        
-        return $_path;
-    }
-    
-    /**
-     * build template filepath by traversing the template_dir array
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return string fully qualified filepath
-     * @throws SmartyException if default template handler is registered but not callable
-     */
-    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $file = $source->name;
-        if ($source instanceof Smarty_Config_Source) {
-            $_directories = $source->smarty->getConfigDir();
-            $_default_handler = $source->smarty->default_config_handler_func;
-        } else {
-            $_directories = $source->smarty->getTemplateDir();
-            $_default_handler = $source->smarty->default_template_handler_func;
-        }
-
-        // go relative to a given template?
-        $_file_is_dotted = $file[0] == '.' && ($file[1] == '.' || $file[1] == '/' || $file[1] == "\\");
-        if ($_template && $_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted) {
-            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' && !$_template->parent->allow_relative_path) {
-                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
-            }
-            $file = dirname($_template->parent->source->filepath) . DS . $file;
-            $_file_exact_match = true;
-            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-                // the path gained from the parent template is relative to the current working directory
-                // as expansions (like include_path) have already been done
-                $file = getcwd() . DS . $file;
-            }
-        }
-
-        // resolve relative path
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-            // don't we all just love windows?
-            $_path = str_replace('\\', '/', $file);
-            $_path = DS . trim($file, '/');
-            $_was_relative = true;
-        } else {
-            // don't we all just love windows?
-            $_path = str_replace('\\', '/', $file);
-        }
-        $_path = $this->normalizePath($_path, false);
-        if (DS != '/') {
-            // don't we all just love windows?
-            $_path = str_replace('/', '\\', $_path);
-        }
-        // revert to relative
-        if (isset($_was_relative)) {
-            $_path = substr($_path, 1);
-        }
-
-        // this is only required for directories
-        $file = rtrim($_path, '/\\');
-
-        // files relative to a template only get one shot
-        if (isset($_file_exact_match)) {
-            return $this->fileExists($source, $file) ? $file : false;
-        }
-
-        // template_dir index?
-        if (preg_match('#^\[(?P<key>[^\]]+)\](?P<file>.+)$#', $file, $match)) {
-            $_directory = null;
-            // try string indexes
-            if (isset($_directories[$match['key']])) {
-                $_directory = $_directories[$match['key']];
-            } else if (is_numeric($match['key'])) {
-                // try numeric index
-                $match['key'] = (int) $match['key'];
-                if (isset($_directories[$match['key']])) {
-                    $_directory = $_directories[$match['key']];
-                } else {
-                    // try at location index
-                    $keys = array_keys($_directories);
-                    $_directory = $_directories[$keys[$match['key']]];
-                }
-            }
-
-            if ($_directory) {
-                $_file = substr($file, strpos($file, ']') + 1);
-                $_filepath = $_directory . $_file;
-                if ($this->fileExists($source, $_filepath)) {
-                    return $_filepath;
-                }
-            }
-        }
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // relative file name?
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-            foreach ($_directories as $_directory) {
-                $_filepath = $_directory . $file;
-                if ($this->fileExists($source, $_filepath)) {
-                    return $this->normalizePath($_filepath);
-                }
-                if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $_filepath = stream_resolve_include_path($_filepath);
-                    } else {
-                        $_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath);
-                    }
-
-                    if ($_filepath !== false) {
-                        if ($this->fileExists($source, $_filepath)) {
-                            return $this->normalizePath($_filepath);
-                        }
-                    }
-                }
-            }
-        }
-
-        // try absolute filepath
-        if ($this->fileExists($source, $file)) {
-            return $file;
-        }
-
-        // no tpl file found
-        if ($_default_handler) {
-            if (!is_callable($_default_handler)) {
-                if ($source instanceof Smarty_Config_Source) {
-                    throw new SmartyException("Default config handler not callable");
-                } else {
-                    throw new SmartyException("Default template handler not callable");
-                }
-            }
-            $_return = call_user_func_array($_default_handler,
-                array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty));
-            if (is_string($_return)) {
-                $source->timestamp = @filemtime($_return);
-                $source->exists = !!$source->timestamp;
-                return $_return;
-            } elseif ($_return === true) {
-                $source->content = $_content;
-                $source->timestamp = $_timestamp;
-                $source->exists = true;
-                return $_filepath;
-            }
-        }
-
-        // give up
-        return false;
-    }
-
-    /**
-     * test is file exists and save timestamp
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param string $file file name
-     * @return bool  true if file exists
-     */
-    protected function fileExists(Smarty_Template_Source $source, $file)
-    {
-        $source->timestamp = @filemtime($file);
-        return $source->exists = !!$source->timestamp;
-
     }
 
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return null;
     }
@@ -365,62 +137,41 @@ abstract class Smarty_Resource {
     /**
      * Load Resource Handler
      *
-     * @param Smarty $smarty    smarty object
-     * @param string $type      name of the resource
+     * @param  Smarty $smarty smarty object
+     * @param  string $type   name of the resource
+     *
+     * @throws SmartyException
      * @return Smarty_Resource Resource Handler
      */
     public static function load(Smarty $smarty, $type)
     {
         // try smarty's cache
-        if (isset($smarty->_resource_handlers[$type])) {
-            return $smarty->_resource_handlers[$type];
+        if (isset($smarty->_cache['resource_handlers'][$type])) {
+            return $smarty->_cache['resource_handlers'][$type];
         }
 
         // try registered resource
         if (isset($smarty->registered_resources[$type])) {
-            if ($smarty->registered_resources[$type] instanceof Smarty_Resource) {
-                $smarty->_resource_handlers[$type] = $smarty->registered_resources[$type];
-                // note registered to smarty is not kept unique!
-                return $smarty->_resource_handlers[$type];
-            }
-
-            if (!isset(self::$resources['registered'])) {
-                self::$resources['registered'] = new Smarty_Internal_Resource_Registered();
-            }
-            if (!isset($smarty->_resource_handlers[$type])) {
-                $smarty->_resource_handlers[$type] = self::$resources['registered'];
-            }
-
-            return $smarty->_resource_handlers[$type];
+            return $smarty->_cache['resource_handlers'][$type] =
+                $smarty->registered_resources[$type] instanceof Smarty_Resource ? $smarty->registered_resources[$type] :
+                    new Smarty_Internal_Resource_Registered();
         }
 
         // try sysplugins dir
         if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
-                self::$resources[$type] = new $_resource_class();
-            }
-            return $smarty->_resource_handlers[$type] = self::$resources[$type];
+            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+            return $smarty->_cache['resource_handlers'][$type] = new $_resource_class();
         }
 
         // try plugins dir
         $_resource_class = 'Smarty_Resource_' . ucfirst($type);
         if ($smarty->loadPlugin($_resource_class)) {
-            if (isset(self::$resources[$type])) {
-                return $smarty->_resource_handlers[$type] = self::$resources[$type];
-            }
-
             if (class_exists($_resource_class, false)) {
-                self::$resources[$type] = new $_resource_class();
-                return $smarty->_resource_handlers[$type] = self::$resources[$type];
+                return $smarty->_cache['resource_handlers'][$type] = new $_resource_class();
             } else {
-                $smarty->registerResource($type, array(
-                    "smarty_resource_{$type}_source",
-                    "smarty_resource_{$type}_timestamp",
-                    "smarty_resource_{$type}_secure",
-                    "smarty_resource_{$type}_trusted"
-                ));
-
+                $smarty->registerResource($type,
+                                          array("smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
+                                                "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"));
                 // give it another try, now that the resource is registered properly
                 return self::load($smarty, $type);
             }
@@ -433,425 +184,87 @@ abstract class Smarty_Resource {
             if (is_object($smarty->security_policy)) {
                 $smarty->security_policy->isTrustedStream($type);
             }
-            if (!isset(self::$resources['stream'])) {
-                self::$resources['stream'] = new Smarty_Internal_Resource_Stream();
-            }
-            return $smarty->_resource_handlers[$type] = self::$resources['stream'];
+            return $smarty->_cache['resource_handlers'][$type] = new Smarty_Internal_Resource_Stream();
         }
 
         // TODO: try default_(template|config)_handler
 
         // give up
-        throw new SmartyException("Unkown resource type '{$type}'");
+        throw new SmartyException("Unknown resource type '{$type}'");
     }
 
     /**
      * extract resource_type and resource_name from template_resource and config_resource
-     *
      * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
-     * @param string  $resource_name    template_resource or config_resource to parse
-     * @param string  $default_resource the default resource_type defined in $smarty
-     * @param string &$name             the parsed resource name
-     * @param string &$type             the parsed resource type
-     * @return void
+     *
+     * @param  string $resource_name    template_resource or config_resource to parse
+     * @param  string $default_resource the default resource_type defined in $smarty
+     *
+     * @return array with parsed resource name and type
      */
-    protected static function parseResourceName($resource_name, $default_resource, &$name, &$type)
+    public static function parseResourceName($resource_name, $default_resource)
     {
-        $parts = explode(':', $resource_name, 2);
-        if (!isset($parts[1]) || !isset($parts[0][1])) {
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
+            $type = $match[1];
+            $name = substr($resource_name, strlen($match[0]));
+        } else {
             // no resource given, use default
             // or single character before the colon is not a resource type, but part of the filepath
             $type = $default_resource;
             $name = $resource_name;
-        } else {
-            $type = $parts[0];
-            $name = $parts[1];
         }
+        return array($name, $type);
     }
 
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
-     * @return string unique resource name
-     */
-
     /**
      * modify template_resource according to resource handlers specifications
      *
-     * @param string $smarty            Smarty instance
-     * @param string $template_resource template_resource to extracate resource handler and name of
+     * @param  \Smarty_Internal_Template|\Smarty $obj               Smarty instance
+     * @param  string                            $template_resource template_resource to extract resource handler and name of
+     *
      * @return string unique resource name
      */
-    public static function getUniqueTemplateName($smarty, $template_resource)
+    public static function getUniqueTemplateName($obj, $template_resource)
     {
-        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
+        $smarty = $obj->_objType == 2 ? $obj->smarty : $obj;
+        list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
         // TODO: optimize for Smarty's internal resource types
         $resource = Smarty_Resource::load($smarty, $type);
+        // go relative to a given template?
+        $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/');
+        if ($obj->_objType == 2 && $_file_is_dotted &&
+            ($obj->source->type == 'file' || $obj->parent->source->type == 'extends')
+        ) {
+            $name = dirname($obj->source->filepath) . DS . $name;
+        }
         return $resource->buildUniqueResourceName($smarty, $name);
     }
 
+    /*
+     * Check if resource must check time stamps when when loading complied or cached templates.
+     * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+     *
+     * @return bool
+     */
+    public function checkTimestamps() {
+        return true;
+    }
+
     /**
      * initialize Source Object for given resource
-     *
+     * wrapper for backward compatibility to versions < 3.1.22
      * Either [$_template] or [$smarty, $template_resource] must be specified
      *
-     * @param Smarty_Internal_Template $_template         template object
-     * @param Smarty                   $smarty            smarty object
-     * @param string                   $template_resource resource identifier
-     * @return Smarty_Template_Source Source Object
-     */
-    public static function source(Smarty_Internal_Template $_template=null, Smarty $smarty=null, $template_resource=null)
-    {
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-
-        // parse resource_name, load resource handler, identify unique resource name
-        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
-        $resource = Smarty_Resource::load($smarty, $type);
-        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name);
-
-        // check runtime cache
-        $_cache_key = 'template|' . $unique_resource_name;
-        if ($smarty->compile_id) {
-            $_cache_key .= '|'.$smarty->compile_id;
-        }
-        if (isset(self::$sources[$_cache_key])) {
-            return self::$sources[$_cache_key];
-        }
-
-        // create source
-        $source = new Smarty_Template_Source($resource, $smarty, $template_resource, $type, $name, $unique_resource_name);
-        $resource->populate($source, $_template);
-
-        // runtime cache
-        self::$sources[$_cache_key] = $source;
-        return $source;
-    }
-
-    /**
-     * initialize Config Source Object for given resource
+     * @param  Smarty_Internal_Template $_template         template object
+     * @param  Smarty                   $smarty            smarty object
+     * @param  string                   $template_resource resource identifier
      *
-     * @param Smarty_Internal_Config $_config config object
-     * @return Smarty_Config_Source Source Object
+     * @return Smarty_Template_Source   Source Object
      */
-    public static function config(Smarty_Internal_Config $_config)
+    public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+                                  $template_resource = null)
     {
-        static $_incompatible_resources = array('eval' => true, 'string' => true, 'extends' => true, 'php' => true);
-        $config_resource = $_config->config_resource;
-        $smarty = $_config->smarty;
-
-        // parse resource_name
-        self::parseResourceName($config_resource, $smarty->default_config_type, $name, $type);
-
-        // make sure configs are not loaded via anything smarty can't handle
-        if (isset($_incompatible_resources[$type])) {
-            throw new SmartyException ("Unable to use resource '{$type}' for config");
-        }
-
-        // load resource handler, identify unique resource name
-        $resource = Smarty_Resource::load($smarty, $type);
-        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name);
-
-        // check runtime cache
-        $_cache_key = 'config|' . $unique_resource_name;
-        if (isset(self::$sources[$_cache_key])) {
-            return self::$sources[$_cache_key];
-        }
-
-        // create source
-        $source = new Smarty_Config_Source($resource, $smarty, $config_resource, $type, $name, $unique_resource_name);
-        $resource->populate($source, null);
-
-        // runtime cache
-        self::$sources[$_cache_key] = $source;
-        return $source;
+        return Smarty_Template_Source::load($_template, $smarty, $template_resource);
     }
-
 }
 
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Template Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property integer $timestamp Source Timestamp
- * @property boolean $exists    Source Existance
- * @property boolean $template  Extended Template reference
- * @property string  $content   Source Content
- */
-class Smarty_Template_Source {
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     * @var string
-     */
-    public $compiler_class = null;
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     * @var string
-     */
-    public $template_lexer_class = null;
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     * @var string
-     */
-    public $template_parser_class = null;
-
-    /**
-     * Unique Template ID
-     * @var string
-     */
-    public $uid = null;
-
-    /**
-     * Template Resource (Smarty_Internal_Template::$template_resource)
-     * @var string
-     */
-    public $resource = null;
-
-    /**
-     * Resource Type
-     * @var string
-     */
-    public $type = null;
-
-    /**
-     * Resource Name
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * Unique Resource Name
-     * @var string
-     */
-    public $unique_resource = null;
-
-    /**
-     * Source Filepath
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Source is bypassing compiler
-     * @var boolean
-     */
-    public $uncompiled = null;
-
-    /**
-     * Source must be recompiled on every occasion
-     * @var boolean
-     */
-    public $recompiled = null;
-
-    /**
-     * The Components an extended template is made of
-     * @var array
-     */
-    public $components = null;
-
-    /**
-     * Resource Handler
-     * @var Smarty_Resource
-     */
-    public $handler = null;
-
-    /**
-     * Smarty instance
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty_Resource $handler          Resource Handler this source object communicates with
-     * @param Smarty          $smarty           Smarty instance this source object belongs to
-     * @param string          $resource         full template_resource
-     * @param string          $type             type of resource
-     * @param string          $name             resource name
-     * @param string          $unique_resource  unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        $this->compiler_class = $handler->compiler_class;
-        $this->template_lexer_class = $handler->template_lexer_class;
-        $this->template_parser_class = $handler->template_parser_class;
-        $this->uncompiled = $this->handler instanceof Smarty_Resource_Uncompiled;
-        $this->recompiled = $this->handler instanceof Smarty_Resource_Recompiled;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * get a Compiled Object of this source
-     *
-     * @param Smarty_Internal_Template $_template template objet
-     * @return Smarty_Template_Compiled compiled object
-     */
-    public function getCompiled(Smarty_Internal_Template $_template)
-    {
-        // check runtime cache
-        $_cache_key = $this->unique_resource . '#' . $_template->compile_id;
-        if (isset(Smarty_Resource::$compileds[$_cache_key])) {
-            return Smarty_Resource::$compileds[$_cache_key];
-        }
-
-        $compiled = new Smarty_Template_Compiled($this);
-        $this->handler->populateCompiledFilepath($compiled, $_template);
-        $compiled->timestamp = @filemtime($compiled->filepath);
-        $compiled->exists = !!$compiled->timestamp;
-
-        // runtime cache
-        Smarty_Resource::$compileds[$_cache_key] = $compiled;
-
-        return $compiled;
-    }
-
-    /**
-     * render the uncompiled source
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function renderUncompiled(Smarty_Internal_Template $_template)
-    {
-        return $this->handler->renderUncompiled($this, $_template);
-    }
-
-    /**
-     * <<magic>> Generic Setter.
-     *
-     * @param string $property_name valid: timestamp, exists, content, template
-     * @param mixed  $value        new value (is not checked)
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            // regular attributes
-            case 'timestamp':
-            case 'exists':
-            case 'content':
-            // required for extends: only
-            case 'template':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid source property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param string $property_name valid: timestamp, exists, content
-     * @return mixed
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("source property '$property_name' does not exist.");
-        }
-    }
-
-}
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Template Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property string $content compiled content
- */
-class Smarty_Template_Compiled {
-
-    /**
-     * Compiled Filepath
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Compiled Timestamp
-     * @var integer
-     */
-    public $timestamp = null;
-
-    /**
-     * Compiled Existance
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Compiled Content Loaded
-     * @var boolean
-     */
-    public $loaded = false;
-
-    /**
-     * Template was compiled
-     * @var boolean
-     */
-    public $isCompiled = false;
-
-    /**
-     * Source Object
-     * @var Smarty_Template_Source
-     */
-    public $source = null;
-
-    /**
-     * Metadata properties
-     *
-     * populated by Smarty_Internal_Template::decodeProperties()
-     * @var array
-     */
-    public $_properties = null;
-
-    /**
-     * create Compiled Object container
-     *
-     * @param Smarty_Template_Source $source source object this compiled object belongs to
-     */
-    public function __construct(Smarty_Template_Source $source)
-    {
-        $this->source = $source;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_resource_custom.php b/sources/include/smarty/libs/sysplugins/smarty_resource_custom.php
index 9ec1f35..619f2d6 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_resource_custom.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_resource_custom.php
@@ -2,21 +2,20 @@
 /**
  * Smarty Resource Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Resource Plugin
- *
  * Wrapper Implementation for custom resource plugins
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-abstract class Smarty_Resource_Custom extends Smarty_Resource {
-
+abstract class Smarty_Resource_Custom extends Smarty_Resource
+{
     /**
      * fetch template and its modification time from data source
      *
@@ -24,15 +23,15 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
      * @param string  &$source template source
      * @param integer &$mtime  template modification timestamp (epoch)
      */
-    protected abstract function fetch($name, &$source, &$mtime);
+    abstract protected function fetch($name, &$source, &$mtime);
 
     /**
      * Fetch template's modification timestamp from data source
-     *
      * {@internal implementing this method is optional.
      *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
      *
-     * @param string $name template name
+     * @param  string $name template name
+     *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      */
     protected function fetchTimestamp($name)
@@ -46,9 +45,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
      * @param Smarty_Template_Source   $source    source object
      * @param Smarty_Internal_Template $_template template object
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
     {
-        $source->filepath = strtolower($source->type . ':' . $source->name);
+        $source->filepath = $source->type . ':' . $source->name;
         $source->uid = sha1($source->type . ':' . $source->name);
 
         $mtime = $this->fetchTimestamp($source->name);
@@ -57,8 +56,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
         } else {
             $this->fetch($source->name, $content, $timestamp);
             $source->timestamp = isset($timestamp) ? $timestamp : false;
-            if( isset($content) )
+            if (isset($content)) {
                 $source->content = $content;
+            }
         }
         $source->exists = !!$source->timestamp;
     }
@@ -66,9 +66,10 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
     /**
      * Load template's source into current template object
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
      */
     public function getContent(Smarty_Template_Source $source)
     {
@@ -83,14 +84,12 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
     /**
      * Determine basename for compiled filename
      *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
+     * @param  Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return basename($source->name);
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_resource_recompiled.php b/sources/include/smarty/libs/sysplugins/smarty_resource_recompiled.php
index ab55b93..cfd7340 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_resource_recompiled.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_resource_recompiled.php
@@ -2,26 +2,40 @@
 /**
  * Smarty Resource Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Resource Plugin
- *
  * Base implementation for resource plugins that don't compile cache
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-abstract class Smarty_Resource_Recompiled extends Smarty_Resource {
+abstract class Smarty_Resource_Recompiled extends Smarty_Resource
+{
+    /**
+     * Flag that it's an recompiled resource
+     *
+     * @var bool
+     */
+    public $recompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
 
     /**
      * populate Compiled Object with compiled filepath
      *
-     * @param Smarty_Template_Compiled $compiled compiled object
-     * @param Smarty_Internal_Template $_template template object
+     * @param  Smarty_Template_Compiled $compiled  compiled object
+     * @param  Smarty_Internal_Template $_template template object
+     *
      * @return void
      */
     public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
@@ -30,7 +44,4 @@ abstract class Smarty_Resource_Recompiled extends Smarty_Resource {
         $compiled->timestamp = false;
         $compiled->exists = false;
     }
-
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/sources/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php
index ea80235..88d2bba 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_resource_uncompiled.php
@@ -2,29 +2,43 @@
 /**
  * Smarty Resource Plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
- * @author Rodney Rehm
+ * @author     Rodney Rehm
  */
 
 /**
  * Smarty Resource Plugin
- *
  * Base implementation for resource plugins that don't use the compiler
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage TemplateResources
  */
-abstract class Smarty_Resource_Uncompiled extends Smarty_Resource {
+abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
+{
+    /**
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
+     */
+    public $uncompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
 
     /**
      * Render and output the template (without using the compiler)
      *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @throws SmartyException on failure
+     * @param  Smarty_Template_Source   $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @throws SmartyException          on failure
      */
-    public abstract function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template);
+    abstract public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template);
 
     /**
      * populate compiled object with compiled filepath
@@ -39,6 +53,27 @@ abstract class Smarty_Resource_Uncompiled extends Smarty_Resource {
         $compiled->exists = false;
     }
 
+    /**
+     * render compiled template code
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function render($_template)
+    {
+        $level = ob_get_level();
+        ob_start();
+        try {
+            $this->renderUncompiled($_template->source, $_template);
+            return ob_get_clean();
+        }
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            throw $e;
+        }
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_security.php b/sources/include/smarty/libs/sysplugins/smarty_security.php
index f8b31d9..9d48bcb 100644
--- a/sources/include/smarty/libs/sysplugins/smarty_security.php
+++ b/sources/include/smarty/libs/sysplugins/smarty_security.php
@@ -2,25 +2,25 @@
 /**
  * Smarty plugin
  *
- * @package Smarty
+ * @package    Smarty
  * @subpackage Security
- * @author Uwe Tews
+ * @author     Uwe Tews
  */
- 
+
 /*
  * FIXME: Smarty_Security API
  *      - getter and setter instead of public properties would allow cultivating an internal cache properly
  *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable
  *        the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing
- *        $template_dir or $config_dir should NOT share the same Smarty_Security instance, 
- *        as this would lead to (severe) performance penalty! how should this be handled? 
+ *        $template_dir or $config_dir should NOT share the same Smarty_Security instance,
+ *        as this would lead to (severe) performance penalty! how should this be handled?
  */
 
 /**
  * This class does contain the security settings
  */
-class Smarty_Security {
-
+class Smarty_Security
+{
     /**
      * This determines how Smarty handles "<?php ... ?>" tags in templates.
      * possible values:
@@ -34,6 +34,7 @@ class Smarty_Security {
      * @var integer
      */
     public $php_handling = Smarty::PHP_PASSTHRU;
+
     /**
      * This is the list of template directories that are considered secure.
      * $template_dir is in this list implicitly.
@@ -41,6 +42,7 @@ class Smarty_Security {
      * @var array
      */
     public $secure_dir = array();
+
     /**
      * This is an array of directories where trusted php scripts reside.
      * {@link $security} is disabled during their inclusion/execution.
@@ -48,124 +50,208 @@ class Smarty_Security {
      * @var array
      */
     public $trusted_dir = array();
+
     /**
      * List of regular expressions (PCRE) that include trusted URIs
      *
      * @var array
      */
     public $trusted_uri = array();
+
+    /**
+     * List of trusted constants names
+     *
+     * @var array
+     */
+    public $trusted_constants = array();
+
     /**
      * This is an array of trusted static classes.
-     *
      * If empty access to all static classes is allowed.
      * If set to 'none' none is allowed.
+     *
      * @var array
      */
     public $static_classes = array();
+
+    /**
+     * This is an nested array of trusted classes and static methods.
+     * If empty access to all static classes and methods is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+     *         'class_2' => array(),                       // all methods of class allowed
+     *       )
+     * If set to null none is allowed.
+     *
+     * @var array
+     */
+    public $trusted_static_methods = array();
+
+    /**
+     * This is an array of trusted static properties.
+     * If empty access to all static classes and properties is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+     *         'class_2' => array(),                   // all properties of class allowed
+     *       )
+     * If set to null none is allowed.
+     *
+     * @var array
+     */
+    public $trusted_static_properties = array();
+
     /**
      * This is an array of trusted PHP functions.
-     *
      * If empty all functions are allowed.
      * To disable all PHP functions set $php_functions = null.
-     * @var array
-     */
-    public $php_functions = array(
-        'isset', 'empty',
-        'count', 'sizeof',
-        'in_array', 'is_array',
-        'time',
-        'nl2br',
-    );
-    /**
-     * This is an array of trusted PHP modifers.
      *
-     * If empty all modifiers are allowed.
-     * To disable all modifier set $modifiers = null.
      * @var array
      */
-    public $php_modifiers = array(
-        'escape',
-        'count'
-    );
+    public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
+
+    /**
+     * This is an array of trusted PHP modifiers.
+     * If empty all modifiers are allowed.
+     * To disable all modifier set $php_modifiers = null.
+     *
+     * @var array
+     */
+    public $php_modifiers = array('escape', 'count', 'nl2br',);
+
     /**
      * This is an array of allowed tags.
-     *
      * If empty no restriction by allowed_tags.
+     *
      * @var array
      */
     public $allowed_tags = array();
+
     /**
      * This is an array of disabled tags.
-     *
      * If empty no restriction by disabled_tags.
+     *
      * @var array
      */
     public $disabled_tags = array();
+
     /**
      * This is an array of allowed modifier plugins.
-     *
      * If empty no restriction by allowed_modifiers.
+     *
      * @var array
      */
     public $allowed_modifiers = array();
+
     /**
      * This is an array of disabled modifier plugins.
-     *
      * If empty no restriction by disabled_modifiers.
+     *
      * @var array
      */
     public $disabled_modifiers = array();
+
+    /**
+     * This is an array of disabled special $smarty variables.
+     *
+     * @var array
+     */
+    public $disabled_special_smarty_vars = array();
+
     /**
      * This is an array of trusted streams.
-     *
      * If empty all streams are allowed.
      * To disable all streams set $streams = null.
+     *
      * @var array
      */
     public $streams = array('file');
+
     /**
      * + flag if constants can be accessed from template
+     *
      * @var boolean
      */
     public $allow_constants = true;
+
     /**
      * + flag if super globals can be accessed from template
+     *
      * @var boolean
      */
     public $allow_super_globals = true;
 
     /**
-     * Cache for $resource_dir lookups
+     * max template nesting level
+     *
+     * @var int
+     */
+    public $max_template_nesting = 0;
+
+    /**
+     * current template nesting level
+     *
+     * @var int
+     */
+    private $_current_template_nesting = 0;
+
+    /**
+     * Cache for $resource_dir lookup
+     *
      * @var array
      */
-    protected $_resource_dir = null;
+    protected $_resource_dir = array();
+
     /**
-     * Cache for $template_dir lookups
+     * Cache for $template_dir lookup
+     *
      * @var array
      */
-    protected $_template_dir = null;
+    protected $_template_dir = array();
+
     /**
-     * Cache for $config_dir lookups
+     * Cache for $config_dir lookup
+     *
      * @var array
      */
-    protected $_config_dir = null;
+    protected $_config_dir = array();
+
     /**
-     * Cache for $secure_dir lookups
+     * Cache for $secure_dir lookup
+     *
      * @var array
      */
-    protected $_secure_dir = null;
+    protected $_secure_dir = array();
+
     /**
-     * Cache for $php_resource_dir lookups
+     * Cache for $php_resource_dir lookup
+     *
      * @var array
      */
     protected $_php_resource_dir = null;
+
     /**
-     * Cache for $trusted_dir lookups
+     * Cache for $trusted_dir lookup
+     *
      * @var array
      */
     protected $_trusted_dir = null;
-    
-    
+
+    /**
+     * Cache for include path status
+     *
+     * @var bool
+     */
+    protected $_include_path_status = false;
+
+    /**
+     * Cache for $_include_array lookup
+     *
+     * @var array
+     */
+    protected $_include_dir = array();
+
     /**
      * @param Smarty $smarty
      */
@@ -173,74 +259,129 @@ class Smarty_Security {
     {
         $this->smarty = $smarty;
     }
-    
+
     /**
      * Check if PHP function is trusted.
      *
-     * @param string $function_name
-     * @param object $compiler compiler object
-     * @return boolean true if function is trusted
+     * @param  string $function_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if function is trusted
      * @throws SmartyCompilerException if php function is not trusted
      */
     public function isTrustedPhpFunction($function_name, $compiler)
     {
-        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
+        if (isset($this->php_functions) &&
+            (empty($this->php_functions) || in_array($function_name, $this->php_functions))
+        ) {
             return true;
         }
 
         $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
+
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
      * Check if static class is trusted.
      *
-     * @param string $class_name
-     * @param object $compiler compiler object
-     * @return boolean true if class is trusted
+     * @param  string $class_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if class is trusted
      * @throws SmartyCompilerException if static class is not trusted
      */
     public function isTrustedStaticClass($class_name, $compiler)
     {
-        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
+        if (isset($this->static_classes) &&
+            (empty($this->static_classes) || in_array($class_name, $this->static_classes))
+        ) {
             return true;
         }
 
         $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if static class method/property is trusted.
+     *
+     * @param  string $class_name
+     * @param  string $params
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if class method is trusted
+     * @throws SmartyCompilerException if static class method is not trusted
+     */
+    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
+    {
+        if (!isset($params[2])) {
+            // fall back
+            return $this->isTrustedStaticClass($class_name, $compiler);
+        }
+        if ($params[2] == 'method') {
+            $allowed = $this->trusted_static_methods;
+            $name = substr($params[0], 0, strpos($params[0], '('));
+        } else {
+            $allowed = $this->trusted_static_properties;
+            // strip '$'
+            $name = substr($params[0], 1);
+        }
+        if (isset($allowed)) {
+            if (empty($allowed)) {
+                // fall back
+                return $this->isTrustedStaticClass($class_name, $compiler);
+            }
+            if (isset($allowed[$class_name]) &&
+                (empty($allowed[$class_name]) || in_array($name, $allowed[$class_name]))
+            ) {
+                return true;
+            }
+        }
+        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
      * Check if PHP modifier is trusted.
      *
-     * @param string $modifier_name
-     * @param object $compiler compiler object
-     * @return boolean true if modifier is trusted
+     * @param  string $modifier_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if modifier is trusted
      * @throws SmartyCompilerException if modifier is not trusted
      */
     public function isTrustedPhpModifier($modifier_name, $compiler)
     {
-        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
+        if (isset($this->php_modifiers) &&
+            (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
+        ) {
             return true;
         }
 
         $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
+
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
      * Check if tag is trusted.
      *
-     * @param string $tag_name
-     * @param object $compiler compiler object
-     * @return boolean true if tag is trusted
+     * @param  string $tag_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
      */
     public function isTrustedTag($tag_name, $compiler)
     {
         // check for internal always required tags
-        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function',
-                    'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))) {
+        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin',
+                                      'private_function_plugin', 'private_object_block_function',
+                                      'private_object_function', 'private_registered_function',
+                                      'private_registered_block', 'private_special_variable',
+                                      'private_print_expression', 'private_modifier'))) {
             return true;
         }
         // check security settings
@@ -248,22 +389,44 @@ class Smarty_Security {
             if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
                 return true;
             } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
             }
-        } else if (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
             return true;
         } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
         }
+
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if special $smarty variable is trusted.
+     *
+     * @param  string $var_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
+     * @throws SmartyCompilerException if modifier is not trusted
+     */
+    public function isTrustedSpecialSmartyVar($var_name, $compiler)
+    {
+        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
+            return true;
+        } else {
+            $compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting", null, true);
+        }
+
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
      * Check if modifier plugin is trusted.
      *
-     * @param string $modifier_name
-     * @param object $compiler compiler object
-     * @return boolean true if tag is trusted
+     * @param  string $modifier_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
      * @throws SmartyCompilerException if modifier is not trusted
      */
     public function isTrustedModifier($modifier_name, $compiler)
@@ -277,21 +440,52 @@ class Smarty_Security {
             if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
                 return true;
             } else {
-                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", null, true);
             }
-        } else if (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) {
+        } elseif (in_array($modifier_name, $this->allowed_modifiers) &&
+            !in_array($modifier_name, $this->disabled_modifiers)
+        ) {
             return true;
         } else {
-            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", null, true);
         }
+
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
+    /**
+     * Check if constants are enabled or trusted
+     *
+     * @param  string $const    constant name
+     * @param  object $compiler compiler object
+     *
+     * @return bool
+     */
+    public function isTrustedConstant($const, $compiler)
+    {
+        if (in_array($const, array('true', 'false', 'null'))) {
+            return true;
+        }
+        if (!empty($this->trusted_constants)) {
+            if (!in_array($const, $this->trusted_constants)) {
+                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+                return false;
+            }
+            return true;
+        }
+        if ($this->allow_constants) {
+            return true;
+        }
+        $compiler->trigger_template_error("Security: access to constants not permitted");
+        return false;
+    }
+
     /**
      * Check if stream is trusted.
      *
-     * @param string $stream_name
-     * @return boolean true if stream is trusted
+     * @param  string $stream_name
+     *
+     * @return boolean         true if stream is trusted
      * @throws SmartyException if stream is not trusted
      */
     public function isTrustedStream($stream_name)
@@ -306,89 +500,81 @@ class Smarty_Security {
     /**
      * Check if directory of file resource is trusted.
      *
-     * @param string $filepath
-     * @return boolean true if directory is trusted
-     * @throws SmartyException if directory is not trusted
+     * @param  string   $filepath
+     * @param null|bool $isConfig
+     *
+     * @return bool true if directory is trusted
+     * @throws \SmartyException if directory is not trusted
      */
-    public function isTrustedResourceDir($filepath)
+    public function isTrustedResourceDir($filepath, $isConfig = null)
     {
-        $_template = false;
-        $_config = false;
-        $_secure = false;
-
-        $_template_dir = $this->smarty->getTemplateDir();
-        $_config_dir = $this->smarty->getConfigDir();
-
-        // check if index is outdated
-        if ((!$this->_template_dir || $this->_template_dir !== $_template_dir)
-                || (!$this->_config_dir || $this->_config_dir !== $_config_dir)
-                || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir))
+        if ($this->_include_path_status !== $this->smarty->use_include_path) {
+            foreach ($this->_include_dir as $directory) {
+                unset($this->_resource_dir[$directory]);
+            }
+            if ($this->smarty->use_include_path) {
+                $this->_include_dir = array();
+                $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
+                foreach ($_dirs as $directory) {
+                    $this->_include_dir[] = $directory;
+                    $this->_resource_dir[$directory] = true;
+                }
+            }
+            $this->_include_path_status = $this->smarty->use_include_path;
+        }
+        if ($isConfig !== true &&
+            (!isset($this->smarty->_cache['template_dir_new']) || $this->smarty->_cache['template_dir_new'])
         ) {
-            $this->_resource_dir = array();
-            $_template = true;
-            $_config = true;
-            $_secure = !empty($this->secure_dir);
-        }
-
-        // rebuild template dir index
-        if ($_template) {
-            $this->_template_dir = $_template_dir;
-            foreach ($_template_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
+            $_dir = $this->smarty->getTemplateDir();
+            if ($this->_template_dir !== $_dir) {
+                foreach ($this->_template_dir as $directory) {
+                    unset($this->_resource_dir[$directory]);
+                }
+                foreach ($_dir as $directory) {
+                    $this->_resource_dir[$directory] = true;
+                }
+                $this->_template_dir = $_dir;
             }
+            $this->smarty->_cache['template_dir_new'] = false;
         }
-
-        // rebuild config dir index
-        if ($_config) {
-            $this->_config_dir = $_config_dir;
-            foreach ($_config_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
+        if ($isConfig !== false &&
+            (!isset($this->smarty->_cache['config_dir_new']) || $this->smarty->_cache['config_dir_new'])
+        ) {
+            $_dir = $this->smarty->getConfigDir();
+            if ($this->_config_dir !== $_dir) {
+                foreach ($this->_config_dir as $directory) {
+                    unset($this->_resource_dir[$directory]);
+                }
+                foreach ($_dir as $directory) {
+                    $this->_resource_dir[$directory] = true;
+                }
+                $this->_config_dir = $_dir;
             }
+            $this->smarty->_cache['config_dir_new'] = false;
         }
-
-        // rebuild secure dir index
-        if ($_secure) {
-            $this->_secure_dir = $this->secure_dir;
+        if ($this->_secure_dir !== (array) $this->secure_dir) {
+            foreach ($this->_secure_dir as $directory) {
+                unset($this->_resource_dir[$directory]);
+            }
             foreach ((array) $this->secure_dir as $directory) {
-                $directory = realpath($directory);
+                $directory = $this->smarty->_realpath($directory . DS, true);
                 $this->_resource_dir[$directory] = true;
             }
+            $this->_secure_dir = (array) $this->secure_dir;
         }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[$directory] = true;
-            // test if the directory is trusted
-            if (isset($this->_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups
-                $this->_resource_dir = array_merge($this->_resource_dir, $_directory);
-                return true;
-            }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[1])) {
-                break;
-            }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
-        }
-
-        // give up
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
+        $this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir);
+        return true;
     }
-    
+
     /**
      * Check if URI (e.g. {fetch} or {html_image}) is trusted
-     *
      * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
      * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
      * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     * @param string $uri 
-     * @return boolean true if URI is trusted
+     *
+     * @param  string $uri
+     *
+     * @return boolean         true if URI is trusted
      * @throws SmartyException if URI is not trusted
      * @uses $trusted_uri for list of patterns to match against $uri
      */
@@ -403,15 +589,16 @@ class Smarty_Security {
                 }
             }
         }
-        
+
         throw new SmartyException("URI '{$uri}' not allowed by security setting");
     }
-    
+
     /**
      * Check if directory of file resource is trusted.
      *
-     * @param string $filepath
-     * @return boolean true if directory is trusted
+     * @param  string $filepath
+     *
+     * @return boolean         true if directory is trusted
      * @throws SmartyException if PHP directory is not trusted
      */
     public function isTrustedPHPDir($filepath)
@@ -426,34 +613,103 @@ class Smarty_Security {
 
             $this->_trusted_dir = $this->trusted_dir;
             foreach ((array) $this->trusted_dir as $directory) {
-                $directory = realpath($directory);
+                $directory = $this->smarty->_realpath($directory . DS, true);
                 $this->_php_resource_dir[$directory] = true;
             }
         }
 
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
+        $this->_php_resource_dir = $this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir);
+        return true;
+    }
+
+    /**
+     * Start template processing
+     *
+     * @param $template
+     *
+     * @throws SmartyException
+     */
+    public function startTemplate($template)
+    {
+        if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
+            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+        }
+    }
+
+    /**
+     * Exit template processing
+     *
+     * @internal param $template
+     */
+    public function exitTemplate()
+    {
+        if ($this->max_template_nesting > 0) {
+            $this->_current_template_nesting --;
+        }
+    }
+
+    /**
+     * Check if file is inside a valid directory
+     *
+     * @param string $filepath
+     * @param array  $dirs valid directories
+     *
+     * @return array
+     * @throws \SmartyException
+     */
+    private function _checkDir($filepath, $dirs)
+    {
+        $directory = dirname($filepath) . DS;
         $_directory = array();
         while (true) {
             // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[] = $directory;
+            $_directory[$directory] = true;
             // test if the directory is trusted
-            if (isset($this->_php_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups
-                $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory);
-                return true;
+            if (isset($dirs[$directory])) {
+                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
+                $dirs = array_merge($dirs, $_directory);
+
+                return $dirs;
             }
             // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[2])) {
+            if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) {
                 break;
             }
             // bubble up one level
-            $directory = substr($directory, 0, $pos);
+            $directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DS, $directory);
         }
 
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
+        // give up
+        throw new SmartyException("directory '{$filepath}' not allowed by security setting");
     }
 
+    /**
+     * Loads security class and enables security
+     *
+     * @param \Smarty                 $smarty
+     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return \Smarty current Smarty instance for chaining
+     * @throws \SmartyException when an invalid class name is provided
+     */
+    public static function enableSecurity(Smarty $smarty, $security_class)
+    {
+        if ($security_class instanceof Smarty_Security) {
+            $smarty->security_policy = $security_class;
+            return;
+        } elseif (is_object($security_class)) {
+            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
+        }
+        if ($security_class == null) {
+            $security_class = $smarty->security_class;
+        }
+        if (!class_exists($security_class)) {
+            throw new SmartyException("Security class '$security_class' is not defined");
+        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
+            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
+        } else {
+            $smarty->security_policy = new $security_class($smarty);
+        }
+        return;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/sources/include/smarty/libs/sysplugins/smarty_template_cached.php b/sources/include/smarty/libs/sysplugins/smarty_template_cached.php
new file mode 100644
index 0000000..cecf429
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_template_cached.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Uwe Tews
+ * Date: 04.12.2014
+ * Time: 06:08
+ */
+
+/**
+ * Smarty Resource Data Object
+ * Cache Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+class Smarty_Template_Cached extends Smarty_Template_Resource_Base
+{
+    /**
+     * Cache Is Valid
+     *
+     * @var boolean
+     */
+    public $valid = null;
+
+    /**
+     * CacheResource Handler
+     *
+     * @var Smarty_CacheResource
+     */
+    public $handler = null;
+
+    /**
+     * Template Cache Id (Smarty_Internal_Template::$cache_id)
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * saved cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 0;
+
+    /**
+     * Id for cache locking
+     *
+     * @var string
+     */
+    public $lock_id = null;
+
+    /**
+     * flag that cache is locked by this instance
+     *
+     * @var bool
+     */
+    public $is_locked = false;
+
+    /**
+     * Source Object
+     *
+     * @var Smarty_Template_Source
+     */
+    public $source = null;
+
+    /**
+     * Nocache hash codes of processed compiled templates
+     *
+     * @var array
+     */
+    public $hashes = array();
+
+    /**
+     * create Cached Object container
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function __construct(Smarty_Internal_Template $_template)
+    {
+        $this->compile_id = $_template->compile_id;
+        $this->cache_id = $_template->cache_id;
+        $this->source = $_template->source;
+        if (!class_exists('Smarty_CacheResource', false)) {
+            require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
+        }
+        $this->handler = Smarty_CacheResource::load($_template->smarty);
+    }
+
+    /**
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return Smarty_Template_Cached
+     */
+    static function load(Smarty_Internal_Template $_template)
+    {
+        $_template->cached = new Smarty_Template_Cached($_template);
+        $_template->cached->handler->populate($_template->cached, $_template);
+        // caching enabled ?
+        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
+                $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->handler->recompiled
+        ) {
+            $_template->cached->valid = false;
+        }
+        return $_template->cached;
+    }
+
+    /**
+     * Render cache template
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param  bool                     $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function render(Smarty_Internal_Template $_template, $no_output_filter = true)
+    {
+        if ($this->isCached($_template)) {
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->start_cache($_template);
+            }
+            if (!$this->processed) {
+                $this->process($_template);
+            }
+            $this->getRenderedTemplateCode($_template);
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->end_cache($_template);
+            }
+            return;
+        } else {
+            $_template->smarty->ext->_updateCache->updateCache($this, $_template, $no_output_filter);
+        }
+    }
+
+    /**
+     * Check if cache is valid, lock cache if required
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool flag true if cache is valid
+     */
+    public function isCached(Smarty_Internal_Template $_template)
+    {
+        if ($this->valid !== null) {
+            return $this->valid;
+        }
+        while (true) {
+            while (true) {
+                if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
+                    $this->valid = false;
+                } else {
+                    $this->valid = true;
+                }
+                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT &&
+                    $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
+                ) {
+                    // lifetime expired
+                    $this->valid = false;
+                }
+                if ($this->valid && $_template->smarty->compile_check == 1 &&
+                    $_template->source->getTimeStamp() > $this->timestamp
+                ) {
+                    $this->valid = false;
+                }
+                if ($this->valid || !$_template->smarty->cache_locking) {
+                    break;
+                }
+                if (!$this->handler->locked($_template->smarty, $this)) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                    break 2;
+                }
+                $this->handler->populate($this, $_template);
+            }
+            if ($this->valid) {
+                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
+                    // load cache file for the following checks
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->start_cache($_template);
+                    }
+                    if ($this->handler->process($_template, $this) === false) {
+                        $this->valid = false;
+                    } else {
+                        $this->processed = true;
+                    }
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->end_cache($_template);
+                    }
+                } else {
+                    $this->is_locked = true;
+                    continue;
+                }
+            } else {
+                return $this->valid;
+            }
+            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED &&
+                $_template->cached->cache_lifetime >= 0 &&
+                (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
+            ) {
+                $this->valid = false;
+            }
+            if ($_template->smarty->cache_locking) {
+                if (!$this->valid) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                } elseif ($this->is_locked) {
+                    $this->handler->releaseLock($_template->smarty, $this);
+                }
+            }
+            return $this->valid;
+        }
+        return $this->valid;
+    }
+
+    /**
+     * Process cached template
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param bool                     $update    flag if called because cache update
+     */
+    public function process(Smarty_Internal_Template $_template, $update = false)
+    {
+        if ($this->handler->process($_template, $this, $update) === false) {
+            $this->valid = false;
+        }
+        if ($this->valid) {
+            $this->processed = true;
+        } else {
+            $this->processed = false;
+        }
+    }
+
+    /**
+     * Read cache content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return $this->handler->readCachedContent($_template);
+        }
+        return false;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_template_compiled.php b/sources/include/smarty/libs/sysplugins/smarty_template_compiled.php
new file mode 100644
index 0000000..e7710f8
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_template_compiled.php
@@ -0,0 +1,297 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ * @property string $content compiled content
+ */
+class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
+{
+
+    /**
+     * nocache hash
+     *
+     * @var string|null
+     */
+    public $nocache_hash = null;
+
+    /**
+     * get a Compiled Object of this source
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return Smarty_Template_Compiled compiled object
+     */
+    static function load($_template)
+    {
+        // check runtime cache
+        if (!$_template->source->handler->recompiled &&
+            ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+        ) {
+            $_cache_key = $_template->source->unique_resource . '#';
+            if ($_template->caching) {
+                $_cache_key .= 'caching#';
+            }
+            $_cache_key .= $_template->compile_id;
+            if (isset($_template->source->compileds[$_cache_key])) {
+                return $_template->source->compileds[$_cache_key];
+            }
+        }
+        $compiled = new Smarty_Template_Compiled();
+        if ($_template->source->handler->hasCompiledHandler) {
+            $_template->source->handler->populateCompiledFilepath($compiled, $_template);
+        } else {
+            $compiled->populateCompiledFilepath($_template);
+        }
+        // runtime cache
+        if (!$_template->source->handler->recompiled &&
+            ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+        ) {
+            $_template->source->compileds[$_cache_key] = $compiled;
+        }
+        return $compiled;
+    }
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Internal_Template $_template template object
+     **/
+    public function populateCompiledFilepath(Smarty_Internal_Template $_template)
+    {
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w]+!', '_', $_template->compile_id) : null;
+        if ($_template->source->isConfig) {
+            $_flag = '_' .
+                ((int) $_template->smarty->config_read_hidden + (int) $_template->smarty->config_booleanize * 2 +
+                    (int) $_template->smarty->config_overwrite * 4);
+        } else {
+            $_flag =
+                '_' . ((int) $_template->smarty->merge_compiled_includes + (int) $_template->smarty->escape_html * 2);
+        }
+        $_filepath = $_template->source->uid . $_flag;
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS . substr($_filepath, 2, 2) . DS . substr($_filepath, 4, 2) . DS .
+                $_filepath;
+        }
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        }
+        // caching token
+        if ($_template->caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        }
+        $_compile_dir = $_template->smarty->getCompileDir();
+        // set basename if not specified
+        $_basename = $_template->source->handler->getBasename($_template->source);
+        if ($_basename === null) {
+            $_basename = basename(preg_replace('![^\w]+!', '_', $_template->source->name));
+        }
+        // separate (optional) basename by dot
+        if ($_basename) {
+            $_basename = '.' . $_basename;
+        }
+
+        $this->filepath = $_compile_dir . $_filepath . '.' . $_template->source->type . $_basename . $_cache . '.php';
+        $this->exists = is_file($this->filepath);
+        if (!$this->exists) {
+            $this->timestamp = false;
+        }
+    }
+
+    /**
+     * load compiled template or compile from source
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @throws Exception
+     */
+    public function process(Smarty_Internal_Template $_template)
+    {
+        $_smarty_tpl = $_template;
+        if ($_template->source->handler->recompiled || !$_template->compiled->exists ||
+            $_template->smarty->force_compile || ($_template->smarty->compile_check &&
+                $_template->source->getTimeStamp() > $_template->compiled->getTimeStamp())
+        ) {
+            $this->compileTemplateSource($_template);
+            $compileCheck = $_template->smarty->compile_check;
+            $_template->smarty->compile_check = false;
+            if ($_template->source->handler->recompiled) {
+                $level = ob_get_level();
+                ob_start();
+                try {
+                    eval("?>" . $this->content);
+                }
+                catch (Exception $e) {
+                    while (ob_get_level() > $level) {
+                        ob_end_clean();
+                    }
+                    throw $e;
+                }
+                ob_get_clean();
+                $this->content = null;
+            } else {
+                $this->loadCompiledTemplate($_template);
+            }
+            $_template->smarty->compile_check = $compileCheck;
+        } else {
+            $_template->mustCompile = true;
+            @include($_template->compiled->filepath);
+            if ($_template->mustCompile) {
+                $this->compileTemplateSource($_template);
+                $compileCheck = $_template->smarty->compile_check;
+                $_template->smarty->compile_check = false;
+                $this->loadCompiledTemplate($_template);
+                $_template->smarty->compile_check = $compileCheck;
+            }
+        }
+        $_template->smarty->ext->_subTemplate->registerSubTemplates($_template);
+
+        $this->processed = true;
+    }
+
+    /**
+     * Load fresh compiled template by including the PHP file
+     * HHVM requires a work around because of a PHP incompatibility
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    private function loadCompiledTemplate(Smarty_Internal_Template $_template)
+    {
+        if (function_exists('opcache_invalidate')) {
+            opcache_invalidate($_template->compiled->filepath);
+        }
+        $_smarty_tpl = $_template;
+        if (defined('HHVM_VERSION')) {
+            $_template->smarty->ext->_hhvm->includeHhvm($_template, $_template->compiled->filepath);
+        } else {
+            include($_template->compiled->filepath);
+        }
+    }
+
+    /**
+     * render compiled template code
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function render(Smarty_Internal_Template $_template)
+    {
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->start_render($_template);
+        }
+        if (!$this->processed) {
+            $this->process($_template);
+        }
+        if (isset($_template->cached)) {
+            $_template->cached->file_dependency =
+                array_merge($_template->cached->file_dependency, $this->file_dependency);
+        }
+        $this->getRenderedTemplateCode($_template);
+        if ($_template->caching && $this->has_nocache_code) {
+            $_template->cached->hashes[$this->nocache_hash] = true;
+        }
+        if (isset($_template->parent) && $_template->parent->_objType == 2 && !empty($_template->tpl_function)) {
+            $_template->parent->tpl_function = array_merge($_template->parent->tpl_function, $_template->tpl_function);
+        }
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_render($_template);
+        }
+    }
+
+    /**
+     * compile template from source
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function compileTemplateSource(Smarty_Internal_Template $_template)
+    {
+        $_template->source->compileds = array();
+        $this->file_dependency = array();
+        $this->tpl_function = array();
+        $this->includes = array();
+        $this->nocache_hash = null;
+        $this->unifunc = null;
+        // compile locking
+        if (!$_template->source->handler->recompiled) {
+            if ($saved_timestamp = $_template->compiled->getTimeStamp()) {
+                touch($_template->compiled->filepath);
+            }
+        }
+        // call compiler
+        try {
+            $_template->loadCompiler();
+            $code = $_template->compiler->compileTemplate($_template);
+        }
+        catch (Exception $e) {
+            // restore old timestamp in case of error
+            if (!$_template->source->handler->recompiled && $saved_timestamp) {
+                touch($_template->compiled->filepath, $saved_timestamp);
+            }
+            throw $e;
+        }
+        // compiling succeeded
+        if ($_template->compiler->write_compiled_code) {
+            // write compiled template
+            $this->write($_template, $code);
+            $code = '';
+        }
+        // release compiler object to free memory
+        unset($_template->compiler);
+        return $code;
+    }
+
+    /**
+     * Write compiled code by handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $code      compiled code
+     *
+     * @return boolean success
+     */
+    public function write(Smarty_Internal_Template $_template, $code)
+    {
+        if (!$_template->source->handler->recompiled) {
+            if ($_template->smarty->ext->_writeFile->writeFile($this->filepath, $code, $_template->smarty) === true) {
+                $this->timestamp = $this->exists = is_file($this->filepath);
+                if ($this->exists) {
+                    $this->timestamp = filemtime($this->filepath);
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            $this->content = $code;
+        }
+        $this->timestamp = time();
+        $this->exists = true;
+        return true;
+    }
+
+    /**
+     * Read compiled content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return file_get_contents($this->filepath);
+        }
+        return isset($this->content) ? $this->content : false;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_template_config.php b/sources/include/smarty/libs/sysplugins/smarty_template_config.php
new file mode 100644
index 0000000..f0fff50
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_template_config.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Smarty Config Source Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Connfig Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ *
+ */
+class Smarty_Template_Config extends Smarty_Template_Source
+{
+    /**
+     * array of section names, single section or null
+     *
+     * @var null|string|array
+     */
+    public $config_sections = null;
+
+    /**
+     * scope into which the config variables shall be loaded
+     *
+     * @var string
+     */
+    public $scope = 'local';
+
+    /**
+     * Flag that source is a config file
+     *
+     * @var bool
+     */
+    public $isConfig = true;
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
+     * @param Smarty          $smarty   Smarty instance this source object belongs to
+     * @param string          $resource full template_resource
+     * @param string          $type     type of resource
+     * @param string          $name     resource name
+     */
+    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name)
+    {
+        // must clone handler as we change class names
+        $this->handler = clone $handler; // Note: prone to circular references
+        $this->handler->compiler_class = 'Smarty_Internal_Config_File_Compiler';
+        $this->handler->template_lexer_class = 'Smarty_Internal_Configfilelexer';
+        $this->handler->template_parser_class = 'Smarty_Internal_Configfileparser';
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+        $this->smarty = $smarty;
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param  Smarty_Internal_Template $_template         template object
+     * @param  Smarty                   $smarty            smarty object
+     * @param  string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Config Source Object
+     * @throws SmartyException
+     */
+    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null)
+    {
+        static $_incompatible_resources = array('extends' => true, 'php' => true);
+        $template_resource = $_template->template_resource;
+        if (empty($template_resource)) {
+            throw new SmartyException('Missing config name');
+        }
+        // parse resource_name, load resource handler
+        list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $_template->smarty->default_config_type);
+        // make sure configs are not loaded via anything smarty can't handle
+        if (isset($_incompatible_resources[$type])) {
+            throw new SmartyException ("Unable to use resource '{$type}' for config");
+        }
+        $resource = Smarty_Resource::load($_template->smarty, $type);
+        $source = new Smarty_Template_Config($resource, $_template->smarty, $template_resource, $type, $name);
+        $resource->populate($source, $_template);
+        if (!$source->exists && isset($_template->smarty->default_config_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+        }
+        $source->unique_resource = $resource->buildUniqueResourceName($_template->smarty, $name, true);
+        return $source;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_template_resource_base.php b/sources/include/smarty/libs/sysplugins/smarty_template_resource_base.php
new file mode 100644
index 0000000..0911feb
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_template_resource_base.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Smarty Template Resource Base Object
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_Template_Resource_Base
+{
+    /**
+     * Compiled Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Compiled Timestamp
+     *
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Compiled Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Template Compile Id (Smarty_Internal_Template::$compile_id)
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * Compiled Content Loaded
+     *
+     * @var boolean
+     */
+    public $processed = false;
+
+    /**
+     * unique function name for compiled template code
+     *
+     * @var string
+     */
+    public $unifunc = '';
+
+    /**
+     * flag if template does contain nocache code sections
+     *
+     * @var bool
+     */
+    public $has_nocache_code = false;
+
+    /**
+     * resource file dependency
+     *
+     * @var array
+     */
+    public $file_dependency = array();
+
+    /**
+     * Content buffer
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * required plugins
+     *
+     * @var array
+     */
+    public $required_plugins = array();
+
+    /**
+     * Included subtemplates
+     *
+     * @var array
+     */
+    public $includes = array();
+
+    /**
+     * Process resource
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    abstract public function process(Smarty_Internal_Template $_template);
+
+     /**
+     * get rendered template content by calling compiled or cached template code
+     *
+     * @param string $unifunc function with template code
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function getRenderedTemplateCode(Smarty_Internal_Template $_template, $unifunc = null)
+    {
+        $unifunc = isset($unifunc) ? $unifunc : $this->unifunc;
+        $level = ob_get_level();
+        try {
+            if (empty($unifunc) || !is_callable($unifunc)) {
+                throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
+            }
+            if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->startTemplate($_template);
+            }
+            //
+            // render compiled or saved template code
+            //
+            if (!isset($_template->_cache['capture_stack'])) {
+                $_template->_cache['capture_stack'] = array();
+            }
+            $_saved_capture_level = count($_template->_cache['capture_stack']);
+            $unifunc($_template);
+            // any unclosed {capture} tags ?
+            if ($_saved_capture_level != count($_template->_cache['capture_stack'])) {
+                $_template->capture_error();
+            }
+            if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->exitTemplate();
+            }
+            return null;
+        }
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+             if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->exitTemplate();
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Get compiled time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if ($this->exists && !isset($this->timestamp)) {
+            $this->timestamp = @filemtime($this->filepath);
+        }
+        return $this->timestamp;
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_template_source.php b/sources/include/smarty/libs/sysplugins/smarty_template_source.php
new file mode 100644
index 0000000..be5b628
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_template_source.php
@@ -0,0 +1,267 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ *
+ */
+class Smarty_Template_Source
+{
+    /**
+     * Unique Template ID
+     *
+     * @var string
+     */
+    public $uid = null;
+
+    /**
+     * Template Resource (Smarty_Internal_Template::$template_resource)
+     *
+     * @var string
+     */
+    public $resource = null;
+
+    /**
+     * Resource Type
+     *
+     * @var string
+     */
+    public $type = null;
+
+    /**
+     * Resource Name
+     *
+     * @var string
+     */
+    public $name = null;
+
+    /**
+     * Unique Resource Name
+     *
+     * @var string
+     */
+    public $unique_resource = null;
+
+    /**
+     * Source Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Source Timestamp
+     *
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Source Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Source File Base name
+     *
+     * @var string
+     */
+    public $basename = null;
+
+    /**
+     * The Components an extended template is made of
+     *
+     * @var \Smarty_Template_Source[]
+     */
+    public $components = null;
+
+    /**
+     * Resource Handler
+     *
+     * @var \Smarty_Resource
+     */
+    public $handler = null;
+
+    /**
+     * Smarty instance
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Resource is source
+     *
+     * @var bool
+     */
+    public $isConfig = false;
+
+    /**
+     * cache for Smarty_Template_Compiled instances
+     *
+     * @var Smarty_Template_Compiled[]
+     */
+    public $compileds = array();
+
+    /**
+     * Template source content eventually set by default handler
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
+     * @param Smarty          $smarty   Smarty instance this source object belongs to
+     * @param string          $resource full template_resource
+     * @param string          $type     type of resource
+     * @param string          $name     resource name
+     *
+     */
+    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name)
+    {
+        $this->handler = $handler; // Note: prone to circular references
+        $this->smarty = $smarty;
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param  Smarty_Internal_Template $_template         template object
+     * @param  Smarty                   $smarty            smarty object
+     * @param  string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Source Source Object
+     * @throws SmartyException
+     */
+    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+                                $template_resource = null)
+    {
+        if ($_template) {
+            $smarty = $_template->smarty;
+            $template_resource = $_template->template_resource;
+        }
+        if (empty($template_resource)) {
+            throw new SmartyException('Missing template name');
+        }
+        // parse resource_name, load resource handler, identify unique resource name
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
+            $type = $match[1];
+            $name = $match[2];
+        } else {
+            // no resource given, use default
+            // or single character before the colon is not a resource type, but part of the filepath
+            $type = $smarty->default_resource_type;
+            $name = $template_resource;
+        }
+
+        $handler = isset($smarty->_cache['resource_handlers'][$type]) ?
+            $smarty->_cache['resource_handlers'][$type] :
+            Smarty_Resource::load($smarty, $type);
+        // if resource is not recompiling and resource name is not dotted we can check the source cache
+        if (($smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) && !$handler->recompiled &&
+            !(isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/'))
+        ) {
+            $unique_resource = $handler->buildUniqueResourceName($smarty, $name);
+            if (isset($smarty->_cache['source_objects'][$unique_resource])) {
+                return $smarty->_cache['source_objects'][$unique_resource];
+            }
+        } else {
+            $unique_resource = null;
+        }
+        // create new source  object
+        $source = new Smarty_Template_Source($handler, $smarty, $template_resource, $type, $name);
+        $handler->populate($source, $_template);
+        if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+        }
+        // on recompiling resources we are done
+        if (($smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) && !$handler->recompiled) {
+            // may by we have already $unique_resource
+            $is_relative = false;
+            if (!isset($unique_resource)) {
+                $is_relative = isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/') &&
+                    ($type == 'file' ||
+                        (isset($_template->parent->source) && $_template->parent->source->type == 'extends'));
+                $unique_resource =
+                    $handler->buildUniqueResourceName($smarty, $is_relative ? $source->filepath . $name : $name);
+            }
+            $source->unique_resource = $unique_resource;
+            // save in runtime cache if not relative
+            if (!$is_relative) {
+                $smarty->_cache['source_objects'][$unique_resource] = $source;
+            }
+        }
+        return $source;
+    }
+
+    /**
+     * render the uncompiled source
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function renderUncompiled(Smarty_Internal_Template $_template)
+    {
+        $this->handler->renderUncompiled($_template->source, $_template);
+    }
+
+    /**
+     * Render uncompiled source
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    public function render(Smarty_Internal_Template $_template)
+    {
+        if ($_template->source->handler->uncompiled) {
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->start_render($_template);
+            }
+            $this->handler->renderUncompiled($_template->source, $_template);
+            if (isset($_template->parent) && $_template->parent->_objType == 2 && !empty($_template->tpl_function)) {
+                $_template->parent->tpl_function =
+                    array_merge($_template->parent->tpl_function, $_template->tpl_function);
+            }
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->end_render($_template);
+            }
+        }
+    }
+
+    /**
+     * Get source time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if (!isset($this->timestamp)) {
+            $this->handler->populateTimestamp($this);
+        }
+        return $this->timestamp;
+    }
+
+    /**
+     * Get source content
+     *
+     * @return string
+     */
+    public function getContent()
+    {
+        return isset($this->content) ? $this->content : $this->handler->getContent($this);
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_undefined_variable.php b/sources/include/smarty/libs/sysplugins/smarty_undefined_variable.php
new file mode 100644
index 0000000..88bc6f6
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_undefined_variable.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * class for undefined variable object
+ * This class defines an object for undefined variable handling
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Undefined_Variable
+{
+    /**
+     * Returns FALSE for 'nocache' and NULL otherwise.
+     *
+     * @param  string $name
+     *
+     * @return bool
+     */
+    public function __get($name)
+    {
+        if ($name == 'nocache') {
+            return false;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Always returns an empty string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return "";
+    }
+}
diff --git a/sources/include/smarty/libs/sysplugins/smarty_variable.php b/sources/include/smarty/libs/sysplugins/smarty_variable.php
new file mode 100644
index 0000000..a6504b1
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smarty_variable.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * class for the Smarty variable object
+ * This class defines the Smarty variable object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Variable
+{
+    /**
+     * template variable
+     *
+     * @var mixed
+     */
+    public $value = null;
+    /**
+     * if true any output of this variable will be not cached
+     *
+     * @var boolean
+     */
+    public $nocache = false;
+
+    /**
+     * create Smarty variable object
+     *
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function __construct($value = null, $nocache = false)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+    }
+
+    /**
+     * <<magic>> String conversion
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->value;
+    }
+}
+
diff --git a/sources/include/smarty/libs/sysplugins/smartycompilerexception.php b/sources/include/smarty/libs/sysplugins/smartycompilerexception.php
new file mode 100644
index 0000000..4d5d778
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smartycompilerexception.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Smarty compiler exception class
+ *
+ * @package Smarty
+ */
+class SmartyCompilerException extends SmartyException
+{
+    public function __toString()
+    {
+        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+    }
+
+    /**
+     * The line number of the template error
+     *
+     * @type int|null
+     */
+    public $line = null;
+    /**
+     * The template source snippet relating to the error
+     *
+     * @type string|null
+     */
+    public $source = null;
+    /**
+     * The raw text of the error message
+     *
+     * @type string|null
+     */
+    public $desc = null;
+    /**
+     * The resource identifier or template name
+     *
+     * @type string|null
+     */
+    public $template = null;
+}
diff --git a/sources/include/smarty/libs/sysplugins/smartyexception.php b/sources/include/smarty/libs/sysplugins/smartyexception.php
new file mode 100644
index 0000000..3da16c2
--- /dev/null
+++ b/sources/include/smarty/libs/sysplugins/smartyexception.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Smarty exception class
+ *
+ * @package Smarty
+ */
+class SmartyException extends Exception
+{
+    public static $escape = false;
+
+    public function __toString()
+    {
+        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
+    }
+}
diff --git a/sources/include/srand.php b/sources/include/srand.php
new file mode 100644
index 0000000..b0d34ba
--- /dev/null
+++ b/sources/include/srand.php
@@ -0,0 +1,149 @@
+<?php
+
+/*
+ * Author:
+ * George Argyros <argyros.george@gmail.com>
+ *
+ * Copyright (c) 2012, George Argyros
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL GEORGE ARGYROS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *
+ * The function is providing, at least at the systems tested :), 
+ * $len bytes of entropy under any PHP installation or operating system.
+ * The execution time should be at most 10-20 ms in any system.
+ */
+function secure_random_bytes($len = 10)
+{  
+ 
+   /*
+    * Our primary choice for a cryptographic strong randomness function is
+    * openssl_random_pseudo_bytes. 
+    */
+   $SSLstr = '4'; // http://xkcd.com/221/
+   if (function_exists('openssl_random_pseudo_bytes') && 
+       (version_compare(PHP_VERSION, '5.3.4') >= 0 || 
+	substr(PHP_OS, 0, 3) !== 'WIN'))
+   {
+      $SSLstr = openssl_random_pseudo_bytes($len, $strong);
+      if ($strong) {
+         return $SSLstr;
+      }
+   }
+
+   /*
+    * If mcrypt extension is available then we use it to gather entropy from 
+    * the operating system's PRNG. This is better than reading /dev/urandom 
+    * directly since it avoids reading larger blocks of data than needed. 
+    * Older versions of mcrypt_create_iv may be broken or take too much time 
+    * to finish so we only use this function with PHP 5.3.7 and above.
+    * @see https://bugs.php.net/bug.php?id=55169
+    */
+   if (function_exists('mcrypt_create_iv') && 
+      (version_compare(PHP_VERSION, '5.3.7') >= 0 || 
+       substr(PHP_OS, 0, 3) !== 'WIN')) {
+      $str = mcrypt_create_iv($len, MCRYPT_DEV_URANDOM);
+      if ($str !== false) {
+         return $str;	
+      }
+   }
+
+
+   /*
+    * No build-in crypto randomness function found. We collect any entropy 
+    * available in the PHP core PRNGs along with some filesystem info and memory
+    * stats. To make this data cryptographically strong we add data either from 
+    * /dev/urandom or if its unavailable, we gather entropy by measuring the 
+    * time needed to compute a number of SHA-1 hashes. 
+    */
+   $str = '';
+   $bits_per_round = 2; // bits of entropy collected in each clock drift round
+   $msec_per_round = 400; // expected running time of each round in microseconds
+   $hash_len = 20; // SHA-1 Hash length
+   $total = $len; // total bytes of entropy to collect
+
+   $handle = @fopen('/dev/urandom', 'rb');   
+   if ($handle && function_exists('stream_set_read_buffer')) {
+      @stream_set_read_buffer($handle, 0);
+   }
+   
+   do
+   {
+      $bytes = ($total > $hash_len)? $hash_len : $total;
+      $total -= $bytes;
+
+      //collect any entropy available from the PHP system and filesystem
+      $entropy = rand() . uniqid(mt_rand(), true) . $SSLstr;
+      $entropy .= implode('', @fstat(@fopen( __FILE__, 'r')));
+      $entropy .= memory_get_usage() . getmypid();
+      $entropy .= serialize($_ENV) . serialize($_SERVER);
+      if (function_exists('posix_times')) {
+        $entropy .= serialize(posix_times());
+      }
+      if (function_exists('zend_thread_id')) {
+        $entropy .= zend_thread_id();
+      }
+      if ($handle) {
+         $entropy .= @fread($handle, $bytes);
+      } else  {	           	
+         // Measure the time that the operations will take on average
+         for ($i = 0; $i < 3; $i++) 
+         {
+            $c1 = microtime(true);
+            $var = sha1(mt_rand());
+            for ($j = 0; $j < 50; $j++) {
+               $var = sha1($var);
+            }
+            $c2 = microtime(true);
+    	    $entropy .= $c1 . $c2;
+         }
+
+         // Based on the above measurement determine the total rounds
+         // in order to bound the total running time.	
+         $rounds = (int) ($msec_per_round * 50 / (int) (($c2 - $c1) * 1000000));
+
+         // Take the additional measurements. On average we can expect
+         // at least $bits_per_round bits of entropy from each measurement.
+         $iter = $bytes * (int) (ceil(8 / $bits_per_round));
+         for ($i = 0; $i < $iter; $i++) {
+            $c1 = microtime();
+            $var = sha1(mt_rand());
+            for ($j = 0; $j < $rounds; $j++) {
+               $var = sha1($var);
+            }
+            $c2 = microtime();
+            $entropy .= $c1 . $c2;
+         }
+            
+      } 
+      // We assume sha1 is a deterministic extractor for the $entropy variable.
+      $str .= sha1($entropy, true);
+   } while ($len > strlen($str));
+   
+   if ($handle) {
+      @fclose($handle);
+   }
+   return substr($str, 0, $len);
+}
diff --git a/sources/include/template.class.php b/sources/include/template.class.php
index 54b1771..b8846a5 100644
--- a/sources/include/template.class.php
+++ b/sources/include/template.class.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2013 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -2096,4 +2096,4 @@ final class FileCombiner
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/sources/include/user.inc.php b/sources/include/user.inc.php
index d1bf87c..f3387d8 100644
--- a/sources/include/user.inc.php
+++ b/sources/include/user.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -65,12 +65,18 @@ if ($conf['apache_authentication'])
   }
 }
 
+// automatic login by authentication key
+if (isset($_GET['auth']))
+{
+  auth_key_login($_GET['auth']);
+}
+
 $user = build_user( $user['id'],
           ( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
          );
-if ($conf['browser_language'] and (is_a_guest() or is_generic()) )
+if ($conf['browser_language'] and (is_a_guest() or is_generic()) and $language = get_browser_language())
 {
-  get_browser_language($user['language']);
+  $user['language'] = $language;
 }
 trigger_notify('user_init', $user);
 ?>
diff --git a/sources/include/ws_core.inc.php b/sources/include/ws_core.inc.php
index e469532..d06fc67 100644
--- a/sources/include/ws_core.inc.php
+++ b/sources/include/ws_core.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -56,7 +56,7 @@ class PwgError
   private $_code;
   private $_codeText;
 
-  function PwgError($code, $codeText)
+  function __construct($code, $codeText)
   {
     if ($code>=400 and $code<600)
     {
@@ -89,7 +89,7 @@ class PwgNamedArray
    * @param xmlAttributes array of sub-item attributes that will be encoded as
    *      xml attributes instead of xml child elements
    */
-  function PwgNamedArray($arr, $itemName, $xmlAttributes=array() )
+  function __construct($arr, $itemName, $xmlAttributes=array() )
   {
     $this->_content = $arr;
     $this->_itemName = $itemName;
@@ -115,7 +115,7 @@ class PwgNamedStruct
    *    encoded as xml attributes (if null - automatically prefer xml attributes
    *    whenever possible)
    */
-  function PwgNamedStruct($content, $xmlAttributes=null, $xmlElements=null )
+  function __construct($content, $xmlAttributes=null, $xmlElements=null )
   {
     $this->_content = $content;
     if ( isset($xmlAttributes) )
@@ -236,7 +236,7 @@ class PwgServer
 
   var $_methods = array();
 
-  function PwgServer()
+  function __construct()
   {
   }
 
@@ -688,4 +688,4 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
     return $res;
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/sources/include/ws_functions.inc.php b/sources/include/ws_functions.inc.php
index 17d1531..8834ac8 100644
--- a/sources/include/ws_functions.inc.php
+++ b/sources/include/ws_functions.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -193,7 +193,7 @@ function ws_std_get_image_xml_attributes()
 function ws_std_get_category_xml_attributes()
 {
   return array(
-    'id', 'url', 'nb_images', 'total_nb_images', 'nb_categories', 'date_last', 'max_date_last',
+    'id', 'url', 'nb_images', 'total_nb_images', 'nb_categories', 'date_last', 'max_date_last', 'status',
     );
 }
 
@@ -204,25 +204,6 @@ function ws_std_get_tag_xml_attributes()
     );
 }
 
-/**
- * Writes info to the log file
- */
-function ws_logfile($string)
-{
-  global $conf;
-
-  if (!$conf['ws_enable_log'])
-  {
-    return true;
-  }
-
-  file_put_contents(
-    $conf['ws_log_filepath'],
-    '['.date('c').'] '.$string."\n",
-    FILE_APPEND
-    );
-}
-
 /**
  * create a tree from a flat list of categories, no recursivity for high speed
  */
@@ -254,4 +235,4 @@ function categories_flatlist_to_tree($categories)
   return $tree;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/sources/include/ws_functions/index.php b/sources/include/ws_functions/index.php
index c8de97f..0b96c3e 100644
--- a/sources/include/ws_functions/index.php
+++ b/sources/include/ws_functions/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/ws_functions/pwg.categories.php b/sources/include/ws_functions/pwg.categories.php
index b2cfc2d..79b27d7 100644
--- a/sources/include/ws_functions/pwg.categories.php
+++ b/sources/include/ws_functions/pwg.categories.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -181,6 +181,11 @@ function ws_categories_getList($params, &$service)
 {
   global $user, $conf;
 
+  if (!in_array($params['thumbnail_size'], array_keys(ImageStdParams::get_defined_type_map())))
+  {
+    return new PwgError(WS_ERR_INVALID_PARAM, "Invalid thumbnail_size");
+  }
+
   $where = array('1=1');
   $join_type = 'INNER';
   $join_user = $user['id'];
@@ -226,7 +231,7 @@ function ws_categories_getList($params, &$service)
 
   $query = '
 SELECT
-    id, name, comment, permalink,
+    id, name, comment, permalink, status,
     uppercats, global_rank, id_uppercat,
     nb_images, count_images AS total_nb_images,
     representative_picture_id, user_representative_picture_id, count_images, count_categories,
@@ -366,7 +371,7 @@ SELECT id, path, representative_ext, level
     {
       if ($row['level'] <= $user['level'])
       {
-        $thumbnail_src_of[$row['id']] = DerivativeImage::thumb_url($row);
+        $thumbnail_src_of[$row['id']] = DerivativeImage::url($params['thumbnail_size'], $row);
       }
       else
       {
@@ -411,7 +416,7 @@ SELECT id, path, representative_ext
 
       while ($row = pwg_db_fetch_assoc($result))
       {
-        $thumbnail_src_of[ $row['id'] ] = DerivativeImage::thumb_url($row);
+        $thumbnail_src_of[ $row['id'] ] = DerivativeImage::url($params['thumbnail_size'], $row);
       }
     }
   }
@@ -489,7 +494,7 @@ SELECT category_id, COUNT(*) AS counter
   $nb_images_of = query2array($query, 'category_id', 'counter');
 
   $query = '
-SELECT id, name, comment, uppercats, global_rank, dir
+SELECT id, name, comment, uppercats, global_rank, dir, status
   FROM '. CATEGORIES_TABLE .'
 ;';
   $result = pwg_query($query);
@@ -529,7 +534,7 @@ SELECT id, name, comment, uppercats, global_rank, dir
     'categories' => new PwgNamedArray(
       $cats,
       'category',
-      array('id', 'nb_images', 'name', 'uppercats', 'global_rank')
+      array('id', 'nb_images', 'name', 'uppercats', 'global_rank', 'status')
       )
     );
 }
@@ -586,6 +591,34 @@ function ws_categories_add($params, &$service)
  */
 function ws_categories_setInfo($params, &$service)
 {
+  // does the category really exist?
+  $query = '
+SELECT *
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id = '.$params['category_id'].'
+;';
+  $categories = query2array($query);
+  if (count($categories) == 0)
+  {
+    return new PwgError(404, 'category_id not found');
+  }
+
+  $category = $categories[0];
+
+  if (!empty($params['status']))
+  {
+    if (!in_array($params['status'], array('private','public')))
+    {
+      return new PwgError(WS_ERR_INVALID_PARAM, "Invalid status, only public/private");
+    }
+
+    if ($params['status'] != $category['status'])
+    {
+      include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+      set_cat_status(array($params['category_id']), $params['status']);
+    }
+  }
+
   $update = array(
     'id' => $params['category_id'],
     );
@@ -661,6 +694,98 @@ UPDATE '. USER_CACHE_CATEGORIES_TABLE .'
   pwg_query($query);
 }
 
+/**
+ * API method
+ *
+ * Deletes the album thumbnail. Only possible if
+ * $conf['allow_random_representative']
+ *
+ * @param mixed[] $params
+ *    @option int category_id
+ */
+function ws_categories_deleteRepresentative($params, &$service)
+{
+  global $conf;
+  
+  // does the category really exist?
+  $query = '
+SELECT id
+  FROM '. CATEGORIES_TABLE .'
+  WHERE id = '. $params['category_id'] .'
+;';
+  $result = pwg_query($query);
+  if (pwg_db_num_rows($result) == 0)
+  {
+    return new PwgError(404, 'category_id not found');
+  }
+
+  if (!$conf['allow_random_representative'])
+  {
+    return new PwgError(401, 'not permitted');
+  }
+
+  $query = '
+UPDATE '.CATEGORIES_TABLE.'
+  SET representative_picture_id = NULL
+  WHERE id = '.$params['category_id'].'
+;';
+  pwg_query($query);
+}
+
+/**
+ * API method
+ *
+ * Find a new album thumbnail.
+ *
+ * @param mixed[] $params
+ *    @option int category_id
+ */
+function ws_categories_refreshRepresentative($params, &$service)
+{
+  global $conf;
+  
+  // does the category really exist?
+  $query = '
+SELECT id
+  FROM '. CATEGORIES_TABLE .'
+  WHERE id = '. $params['category_id'] .'
+;';
+  $result = pwg_query($query);
+  if (pwg_db_num_rows($result) == 0)
+  {
+    return new PwgError(404, 'category_id not found');
+  }
+
+  $query = '
+SELECT
+    DISTINCT category_id
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE category_id = '.$params['category_id'].'
+  LIMIT 1
+;';
+  $result = pwg_query($query);
+  $has_images = pwg_db_num_rows($result) > 0 ? true : false;
+
+  if (!$has_images)
+  {
+    return new PwgError(401, 'not permitted');
+  }
+
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+  
+  set_random_representant(array($params['category_id']));
+
+  // return url of the new representative
+  $query = '
+SELECT *
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id = '.$params['category_id'].'
+;';
+  $category = pwg_db_fetch_assoc(pwg_query($query));
+
+  return get_category_representant_properties($category['representative_picture_id']);
+}
+
 /**
  * API method
  * Deletes a category
diff --git a/sources/include/ws_functions/pwg.extensions.php b/sources/include/ws_functions/pwg.extensions.php
index 6ed2803..23685b4 100644
--- a/sources/include/ws_functions/pwg.extensions.php
+++ b/sources/include/ws_functions/pwg.extensions.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/ws_functions/pwg.groups.php b/sources/include/ws_functions/pwg.groups.php
index 67d5c84..42a495a 100644
--- a/sources/include/ws_functions/pwg.groups.php
+++ b/sources/include/ws_functions/pwg.groups.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/ws_functions/pwg.images.php b/sources/include/ws_functions/pwg.images.php
index 04ab65f..1d9d0cb 100644
--- a/sources/include/ws_functions/pwg.images.php
+++ b/sources/include/ws_functions/pwg.images.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -82,7 +82,7 @@ SELECT id
   FROM '.CATEGORIES_TABLE.'
   WHERE id IN ('.implode(',', $cat_ids).')
 ;';
-  $db_cat_ids = array_from_query($query, 'id');
+  $db_cat_ids = query2array($query, null, 'id');
 
   $unknown_cat_ids = array_diff($cat_ids, $db_cat_ids);
   if (count($unknown_cat_ids) != 0)
@@ -100,7 +100,7 @@ SELECT category_id
   FROM '.IMAGE_CATEGORY_TABLE.'
   WHERE image_id = '.$image_id.'
 ;';
-  $existing_cat_ids = array_from_query($query, 'category_id');
+  $existing_cat_ids = query2array($query, null, 'category_id');
 
   if ($replace_mode)
   {
@@ -133,7 +133,7 @@ SELECT category_id, MAX(rank) AS max_rank
     AND category_id IN ('.implode(',', $new_cat_ids).')
   GROUP BY category_id
 ;';
-    $current_rank_of = simple_hash_from_query(
+    $current_rank_of = query2array(
       $query,
       'category_id',
       'max_rank'
@@ -182,9 +182,9 @@ SELECT category_id, MAX(rank) AS max_rank
  */
 function merge_chunks($output_filepath, $original_sum, $type)
 {
-  global $conf;
+  global $conf, $logger;
 
-  ws_logfile('[merge_chunks] input parameter $output_filepath : '.$output_filepath);
+  $logger->debug('[merge_chunks] input parameter $output_filepath : '.$output_filepath, 'WS');
 
   if (is_file($output_filepath))
   {
@@ -206,7 +206,7 @@ function merge_chunks($output_filepath, $original_sum, $type)
     {
       if (preg_match($pattern, $file))
       {
-        ws_logfile($file);
+        $logger->debug($file, 'WS');
         $chunks[] = $upload_dir.'/'.$file;
       }
     }
@@ -216,7 +216,7 @@ function merge_chunks($output_filepath, $original_sum, $type)
   sort($chunks);
 
   if (function_exists('memory_get_usage')) {
-    ws_logfile('[merge_chunks] memory_get_usage before loading chunks: '.memory_get_usage());
+    $logger->debug('[merge_chunks] memory_get_usage before loading chunks: '.memory_get_usage(), 'WS');
   }
 
   $i = 0;
@@ -226,7 +226,7 @@ function merge_chunks($output_filepath, $original_sum, $type)
     $string = file_get_contents($chunk);
 
     if (function_exists('memory_get_usage')) {
-      ws_logfile('[merge_chunks] memory_get_usage on chunk '.++$i.': '.memory_get_usage());
+      $logger->debug('[merge_chunks] memory_get_usage on chunk '.++$i.': '.memory_get_usage(), 'WS');
     }
 
     if (!file_put_contents($output_filepath, $string, FILE_APPEND))
@@ -238,7 +238,7 @@ function merge_chunks($output_filepath, $original_sum, $type)
   }
 
   if (function_exists('memory_get_usage')) {
-    ws_logfile('[merge_chunks] memory_get_usage after loading chunks: '.memory_get_usage());
+    $logger->debug('[merge_chunks] memory_get_usage after loading chunks: '.memory_get_usage(), 'WS');
   }
 }
 
@@ -481,7 +481,7 @@ SELECT COUNT(id) AS nb_comments
   FROM '. COMMENTS_TABLE .'
   WHERE '. $where_comments .'
 ;';
-  list($nb_comments) = array_from_query($query, 'nb_comments');
+  list($nb_comments) = query2array($query, null, 'nb_comments');
   $nb_comments = (int)$nb_comments;
 
   if ($nb_comments>0 and $params['comments_per_page']>0)
@@ -740,7 +740,40 @@ UPDATE '. IMAGES_TABLE .'
  *    @option int rank
  */
 function ws_images_setRank($params, $service)
-{
+{  
+  if (count($params['image_id']) > 1)
+  {
+    include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+
+    save_images_order(
+      $params['category_id'],
+      $params['image_id']
+      );
+
+    $query = '
+SELECT
+    image_id
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE category_id = '.$params['category_id'].'
+  ORDER BY rank ASC
+;';
+    $image_ids = query2array($query, null, 'image_id');
+
+    // return data for client
+    return array(
+      'image_id' => $image_ids,
+      'category_id' => $params['category_id'],
+      );
+  }
+
+  // turns image_id into a simple int instead of array
+  $params['image_id'] = array_shift($params['image_id']);
+
+  if (empty($params['rank']))
+  {
+    return new PwgError(WS_ERR_MISSING_PARAM, 'rank is missing');
+  }
+  
   // does the image really exist?
   $query = '
 SELECT COUNT(*)
@@ -824,7 +857,7 @@ UPDATE '. IMAGE_CATEGORY_TABLE .'
  */
 function ws_images_add_chunk($params, $service)
 {
-  global $conf;
+  global $conf, $logger;
 
   foreach ($params as $param_key => $param_value)
   {
@@ -832,13 +865,12 @@ function ws_images_add_chunk($params, $service)
     {
       continue;
     }
-    ws_logfile(
-      sprintf(
-        '[ws_images_add_chunk] input param "%s" : "%s"',
-        $param_key,
-        is_null($param_value) ? 'NULL' : $param_value
-        )
-      );
+
+    $logger->debug(sprintf(
+      '[ws_images_add_chunk] input param "%s" : "%s"',
+      $param_key,
+      is_null($param_value) ? 'NULL' : $param_value
+      ), 'WS');
   }
 
   $upload_dir = $conf['upload_dir'].'/buffer';
@@ -856,7 +888,7 @@ function ws_images_add_chunk($params, $service)
     $params['position']
     );
 
-  ws_logfile('[ws_images_add_chunk] data length : '.strlen($params['data']));
+  $logger->debug('[ws_images_add_chunk] data length : '.strlen($params['data']), 'WS');
 
   $bytes_written = file_put_contents(
     $upload_dir.'/'.$filename,
@@ -881,9 +913,9 @@ function ws_images_add_chunk($params, $service)
  */
 function ws_images_addFile($params, $service)
 {
-  ws_logfile(__FUNCTION__.', input :  '.var_export($params, true));
+  global $conf, $logger;
 
-  global $conf;
+  $logger->debug(__FUNCTION__, 'WS', $params);
 
   // what is the path and other infos about the photo?
   $query = '
@@ -974,17 +1006,15 @@ SELECT
  */
 function ws_images_add($params, $service)
 {
-  global $conf, $user;
+  global $conf, $user, $logger;
 
   foreach ($params as $param_key => $param_value)
   {
-    ws_logfile(
-      sprintf(
-        '[pwg.images.add] input param "%s" : "%s"',
-        $param_key,
-        is_null($param_value) ? 'NULL' : $param_value
-        )
-      );
+    $logger->debug(sprintf(
+      '[pwg.images.add] input param "%s" : "%s"',
+      $param_key,
+      is_null($param_value) ? 'NULL' : $param_value
+      ), 'WS');
   }
 
   if ($params['image_id'] > 0)
@@ -1269,7 +1299,7 @@ function ws_images_upload($params, $service)
   // {
   //   return new PwgError(405, 'The image (file) is missing');
   // }
-  
+
   // file_put_contents('/tmp/plupload.log', "[".date('c')."] ".__FUNCTION__."\n\n", FILE_APPEND);
   // file_put_contents('/tmp/plupload.log', '$_FILES = '.var_export($_FILES, true)."\n", FILE_APPEND);
   // file_put_contents('/tmp/plupload.log', '$_POST = '.var_export($_POST, true)."\n", FILE_APPEND);
@@ -1342,11 +1372,11 @@ function ws_images_upload($params, $service)
   // Check if file has been uploaded
   if (!$chunks || $chunk == $chunks - 1)
   {
-    // Strip the temp .part suffix off 
+    // Strip the temp .part suffix off
     rename("{$filePath}.part", $filePath);
-  
+
     include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
-    
+
     $image_id = add_uploaded_file(
       $filePath,
       stripslashes($params['name']), // function add_uploaded_file will secure before insert
@@ -1354,7 +1384,7 @@ function ws_images_upload($params, $service)
       $params['level'],
       null // image_id = not provided, this is a new photo
       );
-    
+
     $query = '
 SELECT
     id,
@@ -1375,7 +1405,7 @@ SELECT
     $category_infos = pwg_db_fetch_assoc(pwg_query($query));
 
     $category_name = get_cat_display_name_from_id($params['category'][0], null);
-    
+
     return array(
       'image_id' => $image_id,
       'src' => DerivativeImage::thumb_url($image_infos),
@@ -1398,9 +1428,9 @@ SELECT
  */
 function ws_images_exist($params, $service)
 {
-  ws_logfile(__FUNCTION__.' '.var_export($params, true));
+  global $conf, $logger;
 
-  global $conf;
+  $logger->debug(__FUNCTION__, 'WS', $params);
 
   $split_pattern = '/[\s,;\|]/';
   $result = array();
@@ -1420,7 +1450,7 @@ SELECT id, md5sum
   FROM '. IMAGES_TABLE .'
   WHERE md5sum IN (\''. implode("','", $md5sums) .'\')
 ;';
-    $id_of_md5 = simple_hash_from_query($query, 'md5sum', 'id');
+    $id_of_md5 = query2array($query, 'md5sum', 'id');
 
     foreach ($md5sums as $md5sum)
     {
@@ -1431,7 +1461,7 @@ SELECT id, md5sum
       }
     }
   }
-  else if ('filename' == $conf['uniqueness_mode'])
+  elseif ('filename' == $conf['uniqueness_mode'])
   {
     // search among photos the list of photos already added, based on
     // filename list
@@ -1447,7 +1477,7 @@ SELECT id, file
   FROM '.IMAGES_TABLE.'
   WHERE file IN (\''. implode("','", $filenames) .'\')
 ;';
-    $id_of_filename = simple_hash_from_query($query, 'file', 'id');
+    $id_of_filename = query2array($query, 'file', 'id');
 
     foreach ($filenames as $filename)
     {
@@ -1471,7 +1501,9 @@ SELECT id, file
  */
 function ws_images_checkFiles($params, $service)
 {
-  ws_logfile(__FUNCTION__.', input :  '.var_export($params, true));
+  global $logger;
+
+  $logger->debug(__FUNCTION__, 'WS', $params);
 
   $query = '
 SELECT path
@@ -1502,14 +1534,14 @@ SELECT path
     $ret['file'] = 'equals';
     $compare_type = 'high';
   }
-  else if (isset($params['file_sum']))
+  elseif (isset($params['file_sum']))
   {
     $compare_type = 'file';
   }
 
   if (isset($compare_type))
   {
-    ws_logfile(__FUNCTION__.', md5_file($path) = '.md5_file($path));
+    $logger->debug(__FUNCTION__.', md5_file($path) = '.md5_file($path), 'WS');
     if (md5_file($path) != $params[$compare_type.'_sum'])
     {
       $ret[$compare_type] = 'differs';
@@ -1520,7 +1552,7 @@ SELECT path
     }
   }
 
-  ws_logfile(__FUNCTION__.', output :  '.var_export($ret, true));
+  $logger->debug(__FUNCTION__, 'WS', $ret);
 
   return $ret;
 }
diff --git a/sources/include/ws_functions/pwg.permissions.php b/sources/include/ws_functions/pwg.permissions.php
index 990404d..292ecc6 100644
--- a/sources/include/ws_functions/pwg.permissions.php
+++ b/sources/include/ws_functions/pwg.permissions.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/ws_functions/pwg.php b/sources/include/ws_functions/pwg.php
index b96338e..bd9df72 100644
--- a/sources/include/ws_functions/pwg.php
+++ b/sources/include/ws_functions/pwg.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -339,6 +339,8 @@ function ws_session_getStatus($params, &$service)
           )
         )
       );
+
+    $res['upload_form_chunk_size'] = $conf['upload_form_chunk_size'];
   }
   
   return $res;
diff --git a/sources/include/ws_functions/pwg.tags.php b/sources/include/ws_functions/pwg.tags.php
index 09ce21b..abbdaa6 100644
--- a/sources/include/ws_functions/pwg.tags.php
+++ b/sources/include/ws_functions/pwg.tags.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -110,11 +110,16 @@ function ws_tags_getImages($params, &$service)
     $where_clauses = implode(' AND ', $where_clauses);
   }
 
+  $order_by = ws_std_image_sql_order($params, 'i.');
+  if (!empty($order_by))
+  {
+    $order_by = 'ORDER BY '.$order_by;
+  }
   $image_ids = get_image_ids_for_tags(
     $tag_ids,
     $params['tag_mode_and'] ? 'AND' : 'OR',
     $where_clauses,
-    ws_std_image_sql_order($params)
+    $order_by
     );
 
   $count_set = count($image_ids);
@@ -136,7 +141,6 @@ SELECT image_id, GROUP_CONCAT(tag_id) AS tag_ids
     while ($row = pwg_db_fetch_assoc($result))
     {
       $row['image_id'] = (int)$row['image_id'];
-      $image_ids[] = $row['image_id'];
       $image_tag_map[ $row['image_id'] ] = explode(',', $row['tag_ids']);
     }
   }
diff --git a/sources/include/ws_functions/pwg.users.php b/sources/include/ws_functions/pwg.users.php
index d0436ac..eaa96c9 100644
--- a/sources/include/ws_functions/pwg.users.php
+++ b/sources/include/ws_functions/pwg.users.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -426,6 +426,27 @@ function ws_users_setInfo($params, &$service)
 
     if (!empty($params['password']))
     {
+      if (!is_webmaster())
+      {
+        $password_protected_users = array($conf['guest_id']);
+
+        $query = '
+SELECT
+    user_id
+  FROM '.USER_INFOS_TABLE.'
+  WHERE status IN (\'webmaster\', \'admin\')
+;';
+        $admin_ids = query2array($query, null, 'user_id');
+
+        // we add all admin+webmaster users BUT the user herself
+        $password_protected_users = array_merge($password_protected_users, array_diff($admin_ids, array($user['id'])));
+
+        if (in_array($params['user_id'][0], $password_protected_users))
+        {
+          return new PwgError(403, 'Only webmasters can change password of other "webmaster/admin" users');
+        }
+      }
+
       $updates[ $conf['user_fields']['password'] ] = $conf['password_hash']($params['password']);
     }
   }
@@ -531,6 +552,11 @@ SELECT
     array($conf['user_fields']['id'] => $params['user_id'][0])
     );
 
+  if (isset($updates[ $conf['user_fields']['password'] ]))
+  {
+    deactivate_user_auth_keys($params['user_id'][0]);
+  }
+
   if (isset($update_status) and count($params['user_id_for_status']) > 0)
   {
     $query = '
diff --git a/sources/include/ws_protocols/index.php b/sources/include/ws_protocols/index.php
index c8de97f..0b96c3e 100644
--- a/sources/include/ws_protocols/index.php
+++ b/sources/include/ws_protocols/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/ws_protocols/json_encoder.php b/sources/include/ws_protocols/json_encoder.php
index 695498b..0f33b42 100644
--- a/sources/include/ws_protocols/json_encoder.php
+++ b/sources/include/ws_protocols/json_encoder.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/ws_protocols/php_encoder.php b/sources/include/ws_protocols/php_encoder.php
index 485ad89..3a37143 100644
--- a/sources/include/ws_protocols/php_encoder.php
+++ b/sources/include/ws_protocols/php_encoder.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/ws_protocols/rest_encoder.php b/sources/include/ws_protocols/rest_encoder.php
index 2c8dbd6..ea2177c 100644
--- a/sources/include/ws_protocols/rest_encoder.php
+++ b/sources/include/ws_protocols/rest_encoder.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -33,7 +33,7 @@ class PwgXmlWriter
 
   var $_encodedXml;
 
-  function PwgXmlWriter()
+  function __construct()
   {
     $this->_elementStack = array();
     $this->_lastTagOpen = false;
diff --git a/sources/include/ws_protocols/rest_handler.php b/sources/include/ws_protocols/rest_handler.php
index e706ef7..b8e332d 100644
--- a/sources/include/ws_protocols/rest_handler.php
+++ b/sources/include/ws_protocols/rest_handler.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/include/ws_protocols/xmlrpc_encoder.php b/sources/include/ws_protocols/xmlrpc_encoder.php
index d081f6d..a8217f5 100644
--- a/sources/include/ws_protocols/xmlrpc_encoder.php
+++ b/sources/include/ws_protocols/xmlrpc_encoder.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/index.php b/sources/index.php
index 0e4f34e..6335ea1 100644
--- a/sources/index.php
+++ b/sources/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install.php b/sources/install.php
index a78dbe7..475cf70 100644
--- a/sources/install.php
+++ b/sources/install.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -24,7 +24,7 @@
 //----------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./');
 
-@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+// @set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 //
 // addslashes to vars if magic_quotes_gpc is off this is a security
 // precaution to prevent someone trying to break out of a SQL statement.
@@ -110,6 +110,7 @@ include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
 defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/');
 
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
+include(PHPWG_ROOT_PATH . 'include/template.class.php');
 
 // download database config file if exists
 check_input_parameter('dl', $_GET, false, '/^[a-f0-9]{32}$/');
@@ -347,8 +348,12 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
     pwg_query($query);
 
     conf_update_param('piwigo_db_version', get_branch_from_version(PHPWG_VERSION));
-    conf_update_param('gallery_title', l10n('Just another Piwigo gallery'));
-    conf_update_param('page_banner', '<h1>%gallery_title%</h1>'."\n\n<p>".l10n('Welcome to my photo gallery').'</p>');
+    conf_update_param('gallery_title', pwg_db_real_escape_string(l10n('Just another Piwigo gallery')));
+
+    conf_update_param(
+      'page_banner',
+      '<h1>%gallery_title%</h1>'."\n\n<p>".pwg_db_real_escape_string(l10n('Welcome to my photo gallery')).'</p>'
+      );
 
     // fill languages table
     foreach ($languages->fs_languages as $language_code => $fs_language)
@@ -528,4 +533,4 @@ if (count($infos) != 0 )
 
 //----------------------------------------------------------- html code display
 $template->pparse('install');
-?>
\ No newline at end of file
+?>
diff --git a/sources/install/db/100-database.php b/sources/install/db/100-database.php
index 2c19454..93d891d 100644
--- a/sources/install/db/100-database.php
+++ b/sources/install/db/100-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/101-database.php b/sources/install/db/101-database.php
index f1fdbe3..e48cce1 100644
--- a/sources/install/db/101-database.php
+++ b/sources/install/db/101-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/102-database.php b/sources/install/db/102-database.php
index 99bf97f..499343d 100644
--- a/sources/install/db/102-database.php
+++ b/sources/install/db/102-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/103-database.php b/sources/install/db/103-database.php
index ed1c24d..6461f0b 100644
--- a/sources/install/db/103-database.php
+++ b/sources/install/db/103-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/104-database.php b/sources/install/db/104-database.php
index a3c17b1..0a8d960 100644
--- a/sources/install/db/104-database.php
+++ b/sources/install/db/104-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/105-database.php b/sources/install/db/105-database.php
index 793eb07..5c1f6ed 100644
--- a/sources/install/db/105-database.php
+++ b/sources/install/db/105-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/106-database.php b/sources/install/db/106-database.php
index dcd3a9b..cf8c43f 100644
--- a/sources/install/db/106-database.php
+++ b/sources/install/db/106-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/107-database.php b/sources/install/db/107-database.php
index 15bdda5..ac5e451 100644
--- a/sources/install/db/107-database.php
+++ b/sources/install/db/107-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/108-database.php b/sources/install/db/108-database.php
index e31aeb1..fe0fb57 100644
--- a/sources/install/db/108-database.php
+++ b/sources/install/db/108-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/109-database.php b/sources/install/db/109-database.php
index b994c32..d14f7d4 100644
--- a/sources/install/db/109-database.php
+++ b/sources/install/db/109-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/110-database.php b/sources/install/db/110-database.php
index 62608a2..a73ba7b 100644
--- a/sources/install/db/110-database.php
+++ b/sources/install/db/110-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/111-database.php b/sources/install/db/111-database.php
index abc09c7..2340983 100644
--- a/sources/install/db/111-database.php
+++ b/sources/install/db/111-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/112-database.php b/sources/install/db/112-database.php
index 7ff37fb..e27024c 100644
--- a/sources/install/db/112-database.php
+++ b/sources/install/db/112-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/113-database.php b/sources/install/db/113-database.php
index cb6c779..352cf55 100644
--- a/sources/install/db/113-database.php
+++ b/sources/install/db/113-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/114-database.php b/sources/install/db/114-database.php
index 96f52e3..c35f6b0 100644
--- a/sources/install/db/114-database.php
+++ b/sources/install/db/114-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/115-database.php b/sources/install/db/115-database.php
index 5d7b5e0..d124448 100644
--- a/sources/install/db/115-database.php
+++ b/sources/install/db/115-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/116-database.php b/sources/install/db/116-database.php
index 79ebeb7..816f3fe 100644
--- a/sources/install/db/116-database.php
+++ b/sources/install/db/116-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/117-database.php b/sources/install/db/117-database.php
index 68ef15d..b160188 100644
--- a/sources/install/db/117-database.php
+++ b/sources/install/db/117-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/118-database.php b/sources/install/db/118-database.php
index 5925a32..08c7cff 100644
--- a/sources/install/db/118-database.php
+++ b/sources/install/db/118-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/119-database.php b/sources/install/db/119-database.php
index 7da1b68..fd00c5a 100644
--- a/sources/install/db/119-database.php
+++ b/sources/install/db/119-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/120-database.php b/sources/install/db/120-database.php
index b156c13..b1bb0a3 100644
--- a/sources/install/db/120-database.php
+++ b/sources/install/db/120-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/121-database.php b/sources/install/db/121-database.php
index 66a3e53..7b22bc5 100644
--- a/sources/install/db/121-database.php
+++ b/sources/install/db/121-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/122-database.php b/sources/install/db/122-database.php
index f8dc107..4736332 100644
--- a/sources/install/db/122-database.php
+++ b/sources/install/db/122-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/123-database.php b/sources/install/db/123-database.php
index 8717a7a..fa3621b 100644
--- a/sources/install/db/123-database.php
+++ b/sources/install/db/123-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/124-database.php b/sources/install/db/124-database.php
index d7671fc..347b8f2 100644
--- a/sources/install/db/124-database.php
+++ b/sources/install/db/124-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/125-database.php b/sources/install/db/125-database.php
index b5034cc..31862a0 100644
--- a/sources/install/db/125-database.php
+++ b/sources/install/db/125-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/126-database.php b/sources/install/db/126-database.php
index 1c21ac9..46de04c 100644
--- a/sources/install/db/126-database.php
+++ b/sources/install/db/126-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/127-database.php b/sources/install/db/127-database.php
index e8c8939..ea55c77 100644
--- a/sources/install/db/127-database.php
+++ b/sources/install/db/127-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/128-database.php b/sources/install/db/128-database.php
index fd1bb06..65027bf 100644
--- a/sources/install/db/128-database.php
+++ b/sources/install/db/128-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/129-database.php b/sources/install/db/129-database.php
index bb0bec5..aaae54e 100644
--- a/sources/install/db/129-database.php
+++ b/sources/install/db/129-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/130-database.php b/sources/install/db/130-database.php
index 14250e1..758b041 100644
--- a/sources/install/db/130-database.php
+++ b/sources/install/db/130-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/131-database.php b/sources/install/db/131-database.php
index 6045104..cbc08d4 100644
--- a/sources/install/db/131-database.php
+++ b/sources/install/db/131-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/132-database.php b/sources/install/db/132-database.php
index 63400dc..71cca6e 100644
--- a/sources/install/db/132-database.php
+++ b/sources/install/db/132-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/133-database.php b/sources/install/db/133-database.php
index 7123381..d28237f 100644
--- a/sources/install/db/133-database.php
+++ b/sources/install/db/133-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/134-database.php b/sources/install/db/134-database.php
index bb33370..a624c38 100644
--- a/sources/install/db/134-database.php
+++ b/sources/install/db/134-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/135-database.php b/sources/install/db/135-database.php
index 9792081..e4acb1d 100644
--- a/sources/install/db/135-database.php
+++ b/sources/install/db/135-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/136-database.php b/sources/install/db/136-database.php
index 27062ec..1eb7f5a 100644
--- a/sources/install/db/136-database.php
+++ b/sources/install/db/136-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/137-database.php b/sources/install/db/137-database.php
index f96fba7..863fbd0 100644
--- a/sources/install/db/137-database.php
+++ b/sources/install/db/137-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/138-database.php b/sources/install/db/138-database.php
index 59606d0..421cc70 100644
--- a/sources/install/db/138-database.php
+++ b/sources/install/db/138-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/139-database.php b/sources/install/db/139-database.php
index e1c994f..747b685 100644
--- a/sources/install/db/139-database.php
+++ b/sources/install/db/139-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/140-database.php b/sources/install/db/140-database.php
index aae350a..6d8e5e5 100644
--- a/sources/install/db/140-database.php
+++ b/sources/install/db/140-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/141-database.php b/sources/install/db/141-database.php
index f6a1571..73b3098 100644
--- a/sources/install/db/141-database.php
+++ b/sources/install/db/141-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/142-database.php b/sources/install/db/142-database.php
index 869f03f..7c40e1a 100644
--- a/sources/install/db/142-database.php
+++ b/sources/install/db/142-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/143-database.php b/sources/install/db/143-database.php
index 84d9a94..4aec0bd 100644
--- a/sources/install/db/143-database.php
+++ b/sources/install/db/143-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/144-database.php b/sources/install/db/144-database.php
index 6f1e7b9..1664c90 100644
--- a/sources/install/db/144-database.php
+++ b/sources/install/db/144-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/145-database.php b/sources/install/db/145-database.php
new file mode 100644
index 0000000..012ca7a
--- /dev/null
+++ b/sources/install/db/145-database.php
@@ -0,0 +1,44 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'add image formats table';
+
+// we use PREFIX_TABLE, in case Piwigo uses an external user table
+pwg_query('
+CREATE TABLE `'.PREFIX_TABLE.'image_format` (
+  `format_id` int(11) unsigned NOT NULL auto_increment,
+  `image_id` mediumint(8) unsigned NOT NULL DEFAULT \'0\',
+  `ext` varchar(255) NOT NULL,
+  `filesize` mediumint(9) unsigned DEFAULT NULL,
+  PRIMARY KEY  (`format_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+;');
+
+echo "\n".$upgrade_description."\n";
+
+?>
diff --git a/sources/install/db/146-database.php b/sources/install/db/146-database.php
new file mode 100644
index 0000000..0c136ea
--- /dev/null
+++ b/sources/install/db/146-database.php
@@ -0,0 +1,39 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'add format_id in history table';
+
+// we use PREFIX_TABLE, in case Piwigo uses an external user table
+pwg_query('
+ALTER TABLE `'.PREFIX_TABLE.'history`
+  ADD COLUMN `format_id` int(11) unsigned DEFAULT NULL
+;');
+
+echo "\n".$upgrade_description."\n";
+
+?>
diff --git a/sources/install/db/147-database.php b/sources/install/db/147-database.php
new file mode 100644
index 0000000..60541e4
--- /dev/null
+++ b/sources/install/db/147-database.php
@@ -0,0 +1,46 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'add user authentication keys table';
+
+// we use PREFIX_TABLE, in case Piwigo uses an external user table
+pwg_query('
+CREATE TABLE `'.PREFIX_TABLE.'user_auth_keys` (
+  `auth_key_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `auth_key` varchar(255) NOT NULL,
+  `user_id` mediumint(8) unsigned NOT NULL,
+  `created_on` datetime NOT NULL,
+  `duration` int(11) unsigned DEFAULT NULL,
+  `expired_on` datetime NOT NULL,
+  PRIMARY KEY (`auth_key_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+;');
+
+echo "\n".$upgrade_description."\n";
+
+?>
diff --git a/sources/install/db/148-database.php b/sources/install/db/148-database.php
new file mode 100644
index 0000000..9afb92a
--- /dev/null
+++ b/sources/install/db/148-database.php
@@ -0,0 +1,39 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'add auth_key_id in history table';
+
+// we use PREFIX_TABLE, in case Piwigo uses an external user table
+pwg_query('
+ALTER TABLE `'.PREFIX_TABLE.'history`
+  ADD COLUMN `auth_key_id` int(11) unsigned DEFAULT NULL
+;');
+
+echo "\n".$upgrade_description."\n";
+
+?>
diff --git a/sources/install/db/61-database.php b/sources/install/db/61-database.php
index e6ac8b0..92b8e5c 100644
--- a/sources/install/db/61-database.php
+++ b/sources/install/db/61-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/62-database.php b/sources/install/db/62-database.php
index f384aa9..4370cb8 100644
--- a/sources/install/db/62-database.php
+++ b/sources/install/db/62-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/63-database.php b/sources/install/db/63-database.php
index eb5235b..10c15c9 100644
--- a/sources/install/db/63-database.php
+++ b/sources/install/db/63-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/64-database.php b/sources/install/db/64-database.php
index 2b8b103..283dee1 100644
--- a/sources/install/db/64-database.php
+++ b/sources/install/db/64-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/65-database.php b/sources/install/db/65-database.php
index 64482d6..e210713 100644
--- a/sources/install/db/65-database.php
+++ b/sources/install/db/65-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/66-database.php b/sources/install/db/66-database.php
index 99cc18e..c3f6524 100644
--- a/sources/install/db/66-database.php
+++ b/sources/install/db/66-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/67-database.php b/sources/install/db/67-database.php
index 77b071a..b61b69d 100644
--- a/sources/install/db/67-database.php
+++ b/sources/install/db/67-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/68-database.php b/sources/install/db/68-database.php
index a1b69f6..071662d 100644
--- a/sources/install/db/68-database.php
+++ b/sources/install/db/68-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/69-database.php b/sources/install/db/69-database.php
index d4d826c..be2c49b 100644
--- a/sources/install/db/69-database.php
+++ b/sources/install/db/69-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/70-database.php b/sources/install/db/70-database.php
index ed6b37c..a0d04f6 100644
--- a/sources/install/db/70-database.php
+++ b/sources/install/db/70-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/71-database.php b/sources/install/db/71-database.php
index 0e37955..0bd90d0 100644
--- a/sources/install/db/71-database.php
+++ b/sources/install/db/71-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/72-database.php b/sources/install/db/72-database.php
index 85af1da..bb5864d 100644
--- a/sources/install/db/72-database.php
+++ b/sources/install/db/72-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/73-database.php b/sources/install/db/73-database.php
index b8377ac..9ff554a 100644
--- a/sources/install/db/73-database.php
+++ b/sources/install/db/73-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/74-database.php b/sources/install/db/74-database.php
index 76182af..dd91a6c 100644
--- a/sources/install/db/74-database.php
+++ b/sources/install/db/74-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/75-database.php b/sources/install/db/75-database.php
index 34eae6e..75aee25 100644
--- a/sources/install/db/75-database.php
+++ b/sources/install/db/75-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/76-database.php b/sources/install/db/76-database.php
index 9691363..660439e 100644
--- a/sources/install/db/76-database.php
+++ b/sources/install/db/76-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/77-database.php b/sources/install/db/77-database.php
index 6d7352d..b9f0915 100644
--- a/sources/install/db/77-database.php
+++ b/sources/install/db/77-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/78-database.php b/sources/install/db/78-database.php
index 7073cf5..707c136 100644
--- a/sources/install/db/78-database.php
+++ b/sources/install/db/78-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/79-database.php b/sources/install/db/79-database.php
index f03c932..4e56c5b 100644
--- a/sources/install/db/79-database.php
+++ b/sources/install/db/79-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/80-database.php b/sources/install/db/80-database.php
index 7a30de7..48ecce8 100644
--- a/sources/install/db/80-database.php
+++ b/sources/install/db/80-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/81-database.php b/sources/install/db/81-database.php
index afaa372..d8ffa62 100644
--- a/sources/install/db/81-database.php
+++ b/sources/install/db/81-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/82-database.php b/sources/install/db/82-database.php
index 3be2021..49eda80 100644
--- a/sources/install/db/82-database.php
+++ b/sources/install/db/82-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/83-database.php b/sources/install/db/83-database.php
index 88b2a77..7e30bfa 100644
--- a/sources/install/db/83-database.php
+++ b/sources/install/db/83-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/84-database.php b/sources/install/db/84-database.php
index 7990173..2efea87 100644
--- a/sources/install/db/84-database.php
+++ b/sources/install/db/84-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/85-database.php b/sources/install/db/85-database.php
index 583d104..6a1d480 100644
--- a/sources/install/db/85-database.php
+++ b/sources/install/db/85-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/86-database.php b/sources/install/db/86-database.php
index 66b6ee5..01c0061 100644
--- a/sources/install/db/86-database.php
+++ b/sources/install/db/86-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/87-database.php b/sources/install/db/87-database.php
index 232468b..270dacf 100644
--- a/sources/install/db/87-database.php
+++ b/sources/install/db/87-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/88-database.php b/sources/install/db/88-database.php
index 9bcc5a3..eaa5540 100644
--- a/sources/install/db/88-database.php
+++ b/sources/install/db/88-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/89-database.php b/sources/install/db/89-database.php
index aba1b70..0cf50b4 100644
--- a/sources/install/db/89-database.php
+++ b/sources/install/db/89-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/90-database.php b/sources/install/db/90-database.php
index 2e31514..d4bc742 100644
--- a/sources/install/db/90-database.php
+++ b/sources/install/db/90-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/91-database.php b/sources/install/db/91-database.php
index a3a466c..fa5e751 100644
--- a/sources/install/db/91-database.php
+++ b/sources/install/db/91-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/92-database.php b/sources/install/db/92-database.php
index 972d84d..3a9cfe9 100644
--- a/sources/install/db/92-database.php
+++ b/sources/install/db/92-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/93-database.php b/sources/install/db/93-database.php
index 579151a..8bcc1af 100644
--- a/sources/install/db/93-database.php
+++ b/sources/install/db/93-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/94-database.php b/sources/install/db/94-database.php
index 27ca62d..35d2bac 100644
--- a/sources/install/db/94-database.php
+++ b/sources/install/db/94-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/95-database.php b/sources/install/db/95-database.php
index f79e838..e2a9094 100644
--- a/sources/install/db/95-database.php
+++ b/sources/install/db/95-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/96-database.php b/sources/install/db/96-database.php
index dad166e..03d64f7 100644
--- a/sources/install/db/96-database.php
+++ b/sources/install/db/96-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/97-database.php b/sources/install/db/97-database.php
index 535005a..182d8d4 100644
--- a/sources/install/db/97-database.php
+++ b/sources/install/db/97-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/98-database.php b/sources/install/db/98-database.php
index 69c11d3..2d6dfd6 100644
--- a/sources/install/db/98-database.php
+++ b/sources/install/db/98-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/99-database.php b/sources/install/db/99-database.php
index c853362..e6649d2 100644
--- a/sources/install/db/99-database.php
+++ b/sources/install/db/99-database.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/db/index.php b/sources/install/db/index.php
index c8de97f..0b96c3e 100644
--- a/sources/install/db/index.php
+++ b/sources/install/db/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/hosting.php b/sources/install/hosting.php
index 9b77044..5c6c35c 100644
--- a/sources/install/hosting.php
+++ b/sources/install/hosting.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/index.php b/sources/install/index.php
index c8de97f..0b96c3e 100644
--- a/sources/install/index.php
+++ b/sources/install/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/php5_apache_configuration.php b/sources/install/php5_apache_configuration.php
index 4a6ca31..be0f02d 100644
--- a/sources/install/php5_apache_configuration.php
+++ b/sources/install/php5_apache_configuration.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/piwigo_structure-mysql.sql b/sources/install/piwigo_structure-mysql.sql
index b36844a..1c7853e 100644
--- a/sources/install/piwigo_structure-mysql.sql
+++ b/sources/install/piwigo_structure-mysql.sql
@@ -51,7 +51,7 @@ DROP TABLE IF EXISTS `piwigo_comments`;
 CREATE TABLE `piwigo_comments` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `image_id` mediumint(8) unsigned NOT NULL default '0',
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL default '1970-01-01 00:00:00',
   `author` varchar(255) default NULL,
   `email` varchar(255) default NULL,
   `author_id` mediumint(8) unsigned DEFAULT NULL,
@@ -121,7 +121,7 @@ CREATE TABLE `piwigo_groups` (
 DROP TABLE IF EXISTS `piwigo_history`;
 CREATE TABLE `piwigo_history` (
   `id` int(10) unsigned NOT NULL auto_increment,
-  `date` date NOT NULL default '0000-00-00',
+  `date` date NOT NULL default '1970-01-01',
   `time` time NOT NULL default '00:00:00',
   `user_id` mediumint(8) unsigned NOT NULL default '0',
   `IP` varchar(15) NOT NULL default '',
@@ -131,6 +131,8 @@ CREATE TABLE `piwigo_history` (
   `image_id` mediumint(8) default NULL,
   `summarized` enum('true','false') default 'false',
   `image_type` enum('picture','high','other') default NULL,
+  `format_id` int(11) unsigned default NULL,
+  `auth_key_id` int(11) unsigned DEFAULT NULL,
   PRIMARY KEY  (`id`),
   KEY `history_i1` (`summarized`)
 ) ENGINE=MyISAM;
@@ -162,6 +164,18 @@ CREATE TABLE `piwigo_image_category` (
   KEY `image_category_i1` (`category_id`)
 ) ENGINE=MyISAM;
 
+--
+-- Table structure for table `piwigo_image_format`
+--
+
+CREATE TABLE `piwigo_image_format` (
+  `format_id` int(11) unsigned NOT NULL auto_increment,
+  `image_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ext` varchar(255) NOT NULL,
+  `filesize` mediumint(9) unsigned DEFAULT NULL,
+  PRIMARY KEY  (`format_id`)
+) ENGINE=MyISAM;
+
 --
 -- Table structure for table `piwigo_image_tag`
 --
@@ -182,7 +196,7 @@ DROP TABLE IF EXISTS `piwigo_images`;
 CREATE TABLE `piwigo_images` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
   `file` varchar(255) binary NOT NULL default '',
-  `date_available` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date_available` datetime NOT NULL default '1970-01-01 00:00:00',
   `date_creation` datetime default NULL,
   `name` varchar(255) default NULL,
   `comment` text,
@@ -234,7 +248,7 @@ DROP TABLE IF EXISTS `piwigo_old_permalinks`;
 CREATE TABLE `piwigo_old_permalinks` (
   `cat_id` smallint(5) unsigned NOT NULL default '0',
   `permalink` varchar(64) binary NOT NULL default '',
-  `date_deleted` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date_deleted` datetime NOT NULL default '1970-01-01 00:00:00',
   `last_hit` datetime default NULL,
   `hit` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`permalink`)
@@ -262,7 +276,7 @@ CREATE TABLE `piwigo_rate` (
   `element_id` mediumint(8) unsigned NOT NULL default '0',
   `anonymous_id` varchar(45) NOT NULL default '',
   `rate` tinyint(2) unsigned NOT NULL default '0',
-  `date` date NOT NULL default '0000-00-00',
+  `date` date NOT NULL default '1970-01-01',
   PRIMARY KEY  (`element_id`,`user_id`,`anonymous_id`)
 ) ENGINE=MyISAM;
 
@@ -286,7 +300,7 @@ DROP TABLE IF EXISTS `piwigo_sessions`;
 CREATE TABLE `piwigo_sessions` (
   `id` varchar(255) binary NOT NULL default '',
   `data` mediumtext NOT NULL,
-  `expiration` datetime NOT NULL default '0000-00-00 00:00:00',
+  `expiration` datetime NOT NULL default '1970-01-01 00:00:00',
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM;
 
@@ -336,7 +350,7 @@ CREATE TABLE `piwigo_themes` (
 DROP TABLE IF EXISTS `piwigo_upgrade`;
 CREATE TABLE `piwigo_upgrade` (
   `id` varchar(20) NOT NULL default '',
-  `applied` datetime NOT NULL default '0000-00-00 00:00:00',
+  `applied` datetime NOT NULL default '1970-01-01 00:00:00',
   `description` varchar(255) default NULL,
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM;
@@ -352,6 +366,20 @@ CREATE TABLE `piwigo_user_access` (
   PRIMARY KEY  (`user_id`,`cat_id`)
 ) ENGINE=MyISAM;
 
+--
+-- Table structure for table `piwigo_user_auth_keys`
+--
+
+CREATE TABLE `piwigo_user_auth_keys` (
+  `auth_key_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `auth_key` varchar(255) NOT NULL,
+  `user_id` mediumint(8) unsigned NOT NULL,
+  `created_on` datetime NOT NULL,
+  `duration` int(11) unsigned DEFAULT NULL,
+  `expired_on` datetime NOT NULL,
+  PRIMARY KEY (`auth_key_id`)
+) ENGINE=MyISAM;
+
 --
 -- Table structure for table `piwigo_user_cache`
 --
@@ -427,7 +455,7 @@ CREATE TABLE `piwigo_user_infos` (
   `show_nb_hits` enum('true','false') NOT NULL default 'false',
   `recent_period` tinyint(3) unsigned NOT NULL default '7',
   `theme` varchar(255) NOT NULL default 'elegant',
-  `registration_date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `registration_date` datetime NOT NULL default '1970-01-01 00:00:00',
   `enabled_high` enum('true','false') NOT NULL default 'true',
   `level` tinyint unsigned NOT NULL default '0',
   `activation_key` varchar(255) default NULL,
diff --git a/sources/install/upgrade_1.3.0.php b/sources/install/upgrade_1.3.0.php
index c7f4618..3df58fe 100644
--- a/sources/install/upgrade_1.3.0.php
+++ b/sources/install/upgrade_1.3.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_1.3.1.php b/sources/install/upgrade_1.3.1.php
index 2ecec01..5106a52 100644
--- a/sources/install/upgrade_1.3.1.php
+++ b/sources/install/upgrade_1.3.1.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_1.4.0.php b/sources/install/upgrade_1.4.0.php
index f83c34a..737b7b9 100644
--- a/sources/install/upgrade_1.4.0.php
+++ b/sources/install/upgrade_1.4.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_1.5.0.php b/sources/install/upgrade_1.5.0.php
index 5b9c7f3..3920d22 100644
--- a/sources/install/upgrade_1.5.0.php
+++ b/sources/install/upgrade_1.5.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_1.6.0.php b/sources/install/upgrade_1.6.0.php
index 7acb45d..66ec216 100644
--- a/sources/install/upgrade_1.6.0.php
+++ b/sources/install/upgrade_1.6.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_1.6.2.php b/sources/install/upgrade_1.6.2.php
index 87c14e2..79485c3 100644
--- a/sources/install/upgrade_1.6.2.php
+++ b/sources/install/upgrade_1.6.2.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_1.7.0.php b/sources/install/upgrade_1.7.0.php
index 9e69b4f..c5bd747 100644
--- a/sources/install/upgrade_1.7.0.php
+++ b/sources/install/upgrade_1.7.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_2.0.0.php b/sources/install/upgrade_2.0.0.php
index 401e5c2..cc52d53 100644
--- a/sources/install/upgrade_2.0.0.php
+++ b/sources/install/upgrade_2.0.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_2.1.0.php b/sources/install/upgrade_2.1.0.php
index ed63d97..2a39830 100644
--- a/sources/install/upgrade_2.1.0.php
+++ b/sources/install/upgrade_2.1.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_2.2.0.php b/sources/install/upgrade_2.2.0.php
index 832d091..c9b6c58 100644
--- a/sources/install/upgrade_2.2.0.php
+++ b/sources/install/upgrade_2.2.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_2.3.0.php b/sources/install/upgrade_2.3.0.php
index 0ce6330..acb7224 100644
--- a/sources/install/upgrade_2.3.0.php
+++ b/sources/install/upgrade_2.3.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_2.4.0.php b/sources/install/upgrade_2.4.0.php
index 554f761..c9a2b96 100644
--- a/sources/install/upgrade_2.4.0.php
+++ b/sources/install/upgrade_2.4.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_2.5.0.php b/sources/install/upgrade_2.5.0.php
index 32c7c91..ce0d86a 100644
--- a/sources/install/upgrade_2.5.0.php
+++ b/sources/install/upgrade_2.5.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/install/upgrade_2.6.0.php b/sources/install/upgrade_2.6.0.php
index 90f13c0..28ed3f1 100644
--- a/sources/install/upgrade_2.6.0.php
+++ b/sources/install/upgrade_2.6.0.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -105,6 +105,7 @@ for ($upgrade_id = 140; $upgrade_id <= 144; $upgrade_id++) // TODO change on eac
   // include & execute upgrade script. Each upgrade script must contain
   // $upgrade_description variable which describe briefly what the upgrade
   // script does.
+  $up_start = get_moment();
   include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php');
 
   // notify upgrade (TODO change on each release)
@@ -112,7 +113,7 @@ for ($upgrade_id = 140; $upgrade_id <= 144; $upgrade_id++) // TODO change on eac
 INSERT INTO `'.PREFIX_TABLE.'upgrade`
   (id, applied, description)
   VALUES
-  (\''.$upgrade_id.'\', NOW(), \'[migration from 2.6.0 to '.PHPWG_VERSION.'] '.$upgrade_description.'\')
+  (\''.$upgrade_id.'\', NOW(), \'[migration from 2.6.0 to '.PHPWG_VERSION.', '.get_elapsed_time($up_start, get_moment()).'] '.$upgrade_description.'\')
 ;';
   pwg_query($query);
 }
@@ -121,5 +122,5 @@ echo '</pre>';
 ob_end_clean();
 
 // now we upgrade from 2.7.0
-// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.7.0.php');
+include_once(PHPWG_ROOT_PATH.'install/upgrade_2.7.0.php');
 ?>
diff --git a/sources/install/upgrade_2.7.0.php b/sources/install/upgrade_2.7.0.php
new file mode 100644
index 0000000..128accd
--- /dev/null
+++ b/sources/install/upgrade_2.7.0.php
@@ -0,0 +1,126 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die ('This page cannot be loaded directly, load upgrade.php');
+}
+else
+{
+  if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
+  {
+    die ('Hacking attempt!');
+  }
+}
+
+// +-----------------------------------------------------------------------+
+// |             Fill upgrade table without applying upgrade               |
+// +-----------------------------------------------------------------------+
+
+// retrieve already applied upgrades
+$query = '
+SELECT id
+  FROM '.PREFIX_TABLE.'upgrade
+;';
+$applied = array_from_query($query, 'id');
+
+// retrieve existing upgrades
+$existing = get_available_upgrade_ids();
+
+// which upgrades need to be applied?
+$to_apply = array_diff($existing, $applied);
+$inserts = array();
+foreach ($to_apply as $upgrade_id)
+{
+  if ($upgrade_id >= 145) // TODO change on each release
+  {
+    break;
+  }
+  
+  array_push(
+    $inserts,
+    array(
+      'id' => $upgrade_id,
+      'applied' => CURRENT_DATE,
+      'description' => '[migration from 2.7.0 to '.PHPWG_VERSION.'] not applied', // TODO change on each release
+      )
+    );
+}
+
+if (!empty($inserts))
+{
+  mass_inserts(
+    '`'.UPGRADE_TABLE.'`',
+    array_keys($inserts[0]),
+    $inserts
+    );
+}
+
+// +-----------------------------------------------------------------------+
+// |                          Perform upgrades                             |
+// +-----------------------------------------------------------------------+
+
+ob_start();
+echo '<pre>';
+
+for ($upgrade_id = 145; $upgrade_id <= 148; $upgrade_id++) // TODO change on each release
+{
+  if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
+  {
+    continue;
+  }
+
+  // maybe the upgrade task has already been applied in a previous and
+  // incomplete upgrade
+  if (in_array($upgrade_id, $applied))
+  {
+    continue;
+  }
+  
+  unset($upgrade_description);
+
+  echo "\n\n";
+  echo '=== upgrade '.$upgrade_id."\n";
+
+  // include & execute upgrade script. Each upgrade script must contain
+  // $upgrade_description variable which describe briefly what the upgrade
+  // script does.
+  $up_start = get_moment();
+  include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php');
+
+  // notify upgrade (TODO change on each release)
+  $query = '
+INSERT INTO `'.PREFIX_TABLE.'upgrade`
+  (id, applied, description)
+  VALUES
+  (\''.$upgrade_id.'\', NOW(), \'[migration from 2.7.0 to '.PHPWG_VERSION.', '.get_elapsed_time($up_start, get_moment()).'] '.$upgrade_description.'\')
+;';
+  pwg_query($query);
+}
+
+echo '</pre>';
+ob_end_clean();
+
+// now we upgrade from 2.8.0
+// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.8.0.php');
+?>
diff --git a/sources/language/af_ZA/admin.lang.php b/sources/language/af_ZA/admin.lang.php
index 1309d9b..fc56d1b 100644
--- a/sources/language/af_ZA/admin.lang.php
+++ b/sources/language/af_ZA/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/af_ZA/common.lang.php b/sources/language/af_ZA/common.lang.php
index cd21db7..bdc1eeb 100644
--- a/sources/language/af_ZA/common.lang.php
+++ b/sources/language/af_ZA/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Afrikaans [ZA]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=572
 Author: Marius Loots and Mignon Smit
 Author URI: http://piwigo.org
diff --git a/sources/language/af_ZA/index.php b/sources/language/af_ZA/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/af_ZA/index.php
+++ b/sources/language/af_ZA/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/af_ZA/install.lang.php b/sources/language/af_ZA/install.lang.php
index d6e8195..77300f1 100644
--- a/sources/language/af_ZA/install.lang.php
+++ b/sources/language/af_ZA/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -29,7 +29,7 @@ $lang['Download the config file'] = 'Laai die konfigurasie lêer af';
 $lang['Installation'] = 'Installasie';
 $lang['Just another Piwigo gallery'] = 'Net nog \'n Piwigo gallery';
 $lang['Password [confirm]'] = 'Wagwoord [bevestig]';
-$lang['PHP 5 is required'] = 'PHP 5 word vereis';
+$lang['PHP 5 is required'] = 'PHP 5.2 word vereis';
 $lang['Sorry!'] = 'Jammer!';
 $lang['Start Install'] = 'Begin installasie';
 $lang['User'] = 'Gebruiker';
@@ -51,12 +51,12 @@ $lang['It will be shown to the visitors. It is necessary for website administrat
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Hou dit geheim. Dit laat jou toe om administrasieblasye te sien';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Benodig hulp? Vra jou vraag op die <a href="%s">Piwigo aanplakbord</a>';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Let op dat jy self die opstelling kan verander en daarna Piwigo heruitvoer.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan probeer om PHP 5 te gebruik deur \'n .htaccess-lêer te skep of te verander.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kon nie PHP 5 opstel nie.';
-$lang['Try to configure PHP 5'] = 'Probeer PHP 5 op te stel';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan probeer om PHP 5.2 te gebruik deur \'n .htaccess-lêer te skep of te verander.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kon nie PHP 5.2 opstel nie.';
+$lang['Try to configure PHP 5'] = 'Probeer PHP 5.2 op te stel';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Besoekers sal hierdie adres kan gebruik om die webmeester te kontak';
 $lang['Welcome to your new installation of Piwigo!'] = 'Welkom by jou nuwe Piwigo webtuiste!';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Verwys na jou diensverskaffer om uit te vind hoe jy PHP 5 kan gebruik.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Verwys na jou diensverskaffer om uit te vind hoe jy PHP 5.2 kan gebruik.';
 $lang['also given by your host provider'] = 'ook deur diensverskaffer voorsien';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'dit sal vooraan tabelname geheg word om tabelle beter te bestuur';
 $lang['enter a login for webmaster'] = 'kies \'n gebruikersnaam vir die webmeester';
@@ -64,5 +64,4 @@ $lang['please enter your password again'] = 'tike assblief weer jou wagwoord in'
 $lang['user login given by your host provider'] = 'gebruikersnaam deur diensverskaffer voorsien';
 $lang['user password given by your host provider'] = 'wagwoord deur diensverskaffer voorsien';
 $lang['webmaster login can\'t contain characters \' or "'] = 'gebruikersnaam kan nie die karakter \' en " bevat nie';
-$lang['localhost or other, supplied by your host provider'] = 'localhost of ander, voorsien deur jou diensverskaffer';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost of ander, voorsien deur jou diensverskaffer';
\ No newline at end of file
diff --git a/sources/language/af_ZA/upgrade.lang.php b/sources/language/af_ZA/upgrade.lang.php
index 4b4ccdf..9f034fd 100644
--- a/sources/language/af_ZA/upgrade.lang.php
+++ b/sources/language/af_ZA/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ar_EG/ar_EG.jpg b/sources/language/ar_EG/ar_EG.jpg
new file mode 100644
index 0000000..da50a37
Binary files /dev/null and b/sources/language/ar_EG/ar_EG.jpg differ
diff --git a/sources/language/ar_EG/common.lang.php b/sources/language/ar_EG/common.lang.php
new file mode 100644
index 0000000..1f664ca
--- /dev/null
+++ b/sources/language/ar_EG/common.lang.php
@@ -0,0 +1,429 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+/*
+Language Name: العربية (مصر) [EG]
+Version: 2.8.2
+Language URI: http://piwigo.org/ext/extension_view.php?eid=779
+Author: Piwigo team
+Author URI: http://piwigo.org
+*/
+
+$lang_info['language_name'] = "العربية (مصر)";
+$lang_info['country'] = "مصر";
+$lang_info['direction'] = "rtl";
+$lang_info['code'] = "ar";
+$lang_info['zero_plural'] = true;
+
+
+
+$lang['%d comments to validate'] = '%d التعليقات للتأكيد';
+$lang['%d hit'] = '%d مشاهدة';
+$lang['%d hits'] = '%d مشاهدات';
+$lang['%d photos per page'] = '%d صور فى كل صفحة';
+$lang['%d photo is also linked to current tags'] = '%d الصورة مرتبطة ايضا بالمدونة الحالية';
+$lang['%d photos are also linked to current tags'] = '%d الصور مرتبطون ايضا بالمدونة الحالية';
+$lang['%d photos'] = '%d صور';
+$lang['%d photo'] = '%d صورة';
+$lang['%d new users'] = '%d مستخدمين جدد';
+$lang['%d new photos'] = '%d صور جدد';
+$lang['%d new user'] = '%d مستخدم جديج';
+$lang['%d new photo'] = '%d صورة جديدة';
+$lang['%d new comment'] = '%d تعليق جديد';
+$lang['%d new comments'] = '%d تعليقات جداد';
+$lang['%d comments'] = '%d التعليقات';
+$lang['%d comment to validate'] = '%d علق للتأكيد';
+$lang['%d comment'] = '%d تعليق';
+$lang['%d album updated'] = '%d تم تحديث الألبوم';
+$lang['%d albums updated'] = '%d تم تحديث الألبوم';
+$lang['About Piwigo'] = 'عن Piwigo';
+$lang['About'] = 'من نحن';
+$lang['... or please deactivate this message, I will find my way by myself'] = 'او من فضلك إلغى هذة الرسالة، سأجد طريقى بمفردى';
+$lang['A comment on your site'] = 'تعليق على موقعك';
+$lang['2small'] = 'XXS - صغير';
+$lang['... or browse your empty gallery'] = 'او تصفح الأستوديو الفارغ الخاص بك';
+$lang['(!) This comment requires validation'] = '!هذا التعليق يستدعى التحقق منه';
+$lang['User comments'] = 'تعليقات المستخدم';
+$lang['User: %s'] = '%s :المستخدم';
+$lang['Username'] = 'اسم المستخدم';
+$lang['Username "%s" on gallery %s'] = '%s فى المعرض "%s" اسم المستخدم';
+$lang['Username is mandatory'] = 'اسم المستخدم إلزامي';
+$lang['Username modification'] = 'تعديل اسم المستخدم';
+$lang['Username or email'] = 'اسم المستخدم أو البريد الإلكتروني';
+$lang['Username: %s'] = '%s :اسم المستخدم';
+$lang['View'] = 'مشاهدة';
+$lang['View in'] = 'مشاهدة فى';
+$lang['Visits'] = 'زيارة';
+$lang['Visits, high &rarr; low'] = 'منخفضة &rarr; زيارة، مرتفعة';
+$lang['Visits, low &rarr; high'] = 'مرتفعة &rarr; زيارة، منخفضة';
+$lang['Webmaster'] = 'المسؤول عن الموقع';
+$lang['Website'] = 'الموقع';
+$lang['Week %d'] = '%d شهر';
+$lang['Welcome'] = '!أهلا وسهلا';
+$lang['Welcome to your Piwigo photo gallery!'] = '!الخاص بك Piwigo أهلا بك في معرض صور';
+$lang['Yes'] = 'نعم';
+$lang['You are not authorized to access the requested page'] = 'غير مصرح لك للوصول إلى الصفحة المطلوبة';
+$lang['The gallery is locked for maintenance. Please, come back later.'] = '.المعرض مغلق للصيانة. يرجى العودة لاحقا';
+$lang['The number of photos per page must be a not null scalar'] = 'يجب أن يكون عدد الصور في الصفحة عدد صحيح غير الصفر';
+$lang['The passwords do not match'] = 'كلمات السر لا تتطابق';
+$lang['Theme'] = 'موضوع';
+$lang['This author modified following comment:'] = ':عدل هذا الكاتب التعليق التالي';
+$lang['This author removed the comment with id %d'] = '%d ازال هذا الكاتب التعليق رقم';
+$lang['This login is already used by another user'] = 'يستخدم مستخدم آخر هذا الأسم';
+$lang['Thumbnails'] = 'الصور المصغرة';
+$lang['To reset your password, visit the following address:'] = ':لإعادة تعيين كلمة المرور الخاصة بك، قم بزيارة الرابط التالي';
+$lang['Unknown feed identifier'] = 'المعرف غير معروف';
+$lang['Unknown identifier'] = 'المعرف غير معروف';
+$lang['Update your rating'] = 'تحديث تصويتك';
+$lang['User "%s" has no email address, password reset is not possible'] = 'ليس لديه بريد الكترزنى، اعادة تعيين كلمة السر غير ممكن "%s" المستخدم';
+$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = ':الأعلام على احداث جديدة فى هذا الموقع RSSتوفرال
+.RSS صور، ألبومات، تعلاقات جديدة. ليتم اسخدامها مع قارئ';
+$lang['Submit'] = 'تقديم';
+$lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'عملية التسجيل تمت بنجاح، سوف تتلقى قريبا رسالة بالبريد الالكتروني مع إعدادات الاتصال الخاصة بك. مرحبا!';
+$lang['Tag'] = 'علامة';
+$lang['Tag results for'] = 'نتائج العلامات ل';
+$lang['Tags'] = 'علامات';
+$lang['Thank you for registering at %s!'] = '!%s شكرا لك على التسجيل في';
+$lang['Search for all terms'] = 'ابحث عن جميع الكلمات';
+$lang['Search for any term'] = 'ابحث عن أي مصطلح';
+$lang['Search for words'] = 'البحث عن كلمات';
+$lang['Search in albums'] = 'البحث في الألبومات';
+$lang['Search in sub-albums'] = 'البحث فى الألبومات الفرعية';
+$lang['Search results'] = 'نتائج البحث';
+$lang['Search rules'] = 'معايير البحث';
+$lang['Search tags'] = 'بطاقات البحث';
+$lang['Send my connection settings by email'] = 'إرسال إعدادات الاتصال الخاصة بي عن طريق البريد الإلكتروني';
+$lang['Sent by'] = 'أرسلت من';
+$lang['Show file metadata'] = 'عرض ملف التعريف';
+$lang['Show latest comments first'] = 'عرض أحدث التعليقات أولا';
+$lang['Show number of comments'] = 'عرض عدد التعليقات';
+$lang['Show number of hits'] = 'عرض عدد الزيارات';
+$lang['Show oldest comments first'] = 'عرض أقدم التعليقات أولا';
+$lang['Since'] = 'منذ';
+$lang['Someone requested that the password be reset for the following user account:'] = ':طلب شخص ما أن يتم إعادة تعيين كلمة المرور لحساب المستخدم التالى';
+$lang['Sort by'] = 'ترتيب حسب';
+$lang['Sort order'] = 'ترتيب';
+$lang['Specials'] = 'العروض الخاصة';
+$lang['Related tags'] = 'العلامات ذات الصلة';
+$lang['Repeat the slideshow'] = 'تكرار عرض الشرائح';
+$lang['Requested album does not exist'] = 'الألبوم المطلوب غير موجود';
+$lang['Requested tag does not exist'] = 'العلامة المطلوبة غير موجودة';
+$lang['Reset'] = 'إعادة تعيين';
+$lang['Reset to default values'] = 'إعادة تعيين إلى القيم الافتراضية';
+$lang['Retrieve password'] = 'استرجاع كلمة المرور';
+$lang['Return to home page'] = 'العودة إلى الصفحة الرئيسية';
+$lang['SQL queries in'] = 'فى SQL استعلامات';
+$lang['Search'] = 'بحث';
+$lang['Search by date'] = 'البحث بالتاريخ';
+$lang['Search for Author'] = 'البحث عن مؤلف';
+$lang['Recent period'] = 'الفترة الأخيرة';
+$lang['Recent period must be a positive integer value'] = 'يجب أن تكون الفترة الأخيرة قيمة عدد صحيح موجب';
+$lang['Recent photos'] = 'الصور الأخيرة';
+$lang['Redirection...'] = '...إعادة توجيه';
+$lang['Reduce diaporama speed'] = 'تقليل سرعة عرض الشرائح';
+$lang['Register'] = 'تسجيل';
+$lang['Registration'] = 'تسجيل';
+$lang['Registration of %s'] = '%s تسجيل';
+$lang['Piwigo encountered a non recoverable error'] = 'واجه خطأ غير قابل للأسترداد Piwigo';
+$lang['Play of slideshow'] = 'تشغيل عرض الشرائح';
+$lang['Please enter your username or email address.'] = 'الرجاء أدخل اسم المستخدم أو البريد الإلكتروني الخاص بك.';
+$lang['Please, enter a login'] = 'من فضلك، سجل الدخول';
+$lang['Post date'] = 'نشر التاريخ';
+$lang['Posted on'] = 'نشرت فى';
+$lang['Powered by'] = 'مدعوم من';
+$lang['Preferences'] = 'التفضيلات';
+$lang['Previous'] = 'السابق';
+$lang['Profile'] = 'الفحة الشخصية';
+$lang['Quick connect'] = 'تسجيل الدخول السريع';
+$lang['Quick search'] = 'بحث سريع';
+$lang['RSS feed'] = 'RSSال';
+$lang['Random photos'] = 'صور عشوائية';
+$lang['Rank'] = 'رتبة';
+$lang['Rate this photo'] = 'قيم هذه الصورة';
+$lang['Rating score'] = 'درجة تصنيف';
+$lang['Rating score, high &rarr; low'] = 'منخفضة &rarr; درجة تصنيف، عالية';
+$lang['Rating score, low &rarr; high'] = 'عالية &rarr; درجة تصنيف، منخفضة';
+$lang['Recent albums'] = 'آخر الألبومات';
+$lang['Page generated in'] = 'تم انشاء الصفحة في';
+$lang['Page not found'] = 'لم يتم العثور على الصفحة';
+$lang['Password'] = 'كلمة المرور';
+$lang['Password Reset'] = 'إعادة تعيين كلمة المرور';
+$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'تأكيد كلمة السر مفقود. يرجى تأكيد كلمة السر المختارة.';
+$lang['Password forgotten'] = 'نسيت كلمة السر';
+$lang['Password is missing. Please enter the password.'] = 'كلمة المرور مفقود. يرجى إدخال كلمة المرور.';
+$lang['Password reset is not allowed for this user'] = 'لا يجوز إعادة تعيين كلمة المرور لهذا المستخدم';
+$lang['Password: %s'] = '%s :كلمة المرور';
+$lang['Pause of slideshow'] = 'وقف عرض الشرائح';
+$lang['Permalink for album not found'] = 'لم يتم العثور على رابط دائم للألبوم';
+$lang['Photo description'] = 'وصف الصورة';
+$lang['Photo sizes'] = 'احجام الصورة';
+$lang['Photo title'] = 'عنوان اصورة';
+$lang['Photo title, A &rarr; Z'] = 'ى &rarr; عنوان اصورة، ا';
+$lang['Photo title, Z &rarr; A'] = 'ا &rarr; عنوان اصورة، ى';
+$lang['Photos only RSS feed'] = 'فقط RSSصور ال';
+$lang['Photos posted within the last %d day.'] = '.يوم الماضية فقط %dالصور المنشورة خلال ال';
+$lang['Photos posted within the last %d days.'] = '.ايام الماضية فقط %dالصور المنشورة خلال ال';
+$lang['Piwigo Help'] = 'Piwigoمساعدة ال';
+$lang['Logout'] = 'تسجيل الخروج';
+$lang['Manage this user comment: %s'] = '%s :تعديل تعليق هذا المستخدم';
+$lang['Manual sort order'] = 'ترتيب يدوى';
+$lang['Menu'] = 'القائمة';
+$lang['Mobile'] = 'موبايل';
+$lang['Most visited'] = 'الأكثر زيارة';
+$lang['N/A'] = 'لا ينطبق';
+$lang['New on %s'] = '%s جديد فى';
+$lang['New password'] = 'كلمة مرور جديدة';
+$lang['Next'] = 'التالى';
+$lang['No'] = 'لا';
+$lang['No results for'] = 'لا يوجد نتائج ل';
+$lang['Not repeat the slideshow'] = 'عدم تكرار عرض الشرائح';
+$lang['Notification'] = 'إشعار';
+$lang['Number of items'] = 'عدد المرات';
+$lang['Number of photos per page'] = 'عدد الصور فى الصفحة';
+$lang['Numeric identifier, 1 &rarr; 9'] = '9 &rarr; معرف رقمى، 1';
+$lang['Numeric identifier, 9 &rarr; 1'] = '1 &rarr; معرف رقمى، 9';
+$lang['Original'] = 'الأصل';
+$lang['Original dimensions'] = 'الأبعاد الأصلية';
+$lang['Help'] = 'مساعدة';
+$lang['Here are your connection settings'] = 'هذه اعدادات الأتصال الخاصة بك';
+$lang['Home'] = 'الصفحة الرئيسية';
+$lang['I want to add photos'] = 'اريد اضافة صور';
+$lang['IP: %s'] = 'IP: %s';
+$lang['IPTC Metadata'] = 'IPTC Metadata';
+$lang['Identification'] = 'دخول';
+$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'إذا كان هذا خطأ، فقط تجاهل هذه الرسالة و لن يحدث شيئا.';
+$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'إذا كنت تعتقد أنك تلقيت هذه الرسالة عن طريق الخطأ، يرجى الاتصال بنا %s على';
+$lang['Invalid key'] = 'مفتاح غير صالح';
+$lang['Invalid password!'] = 'كلمة المرور غير صحيحة!';
+$lang['Invalid username or email'] = 'اسم المستخدم أو البريد الإلكتروني غير صحيح';
+$lang['Keyword'] = 'الكلمة';
+$lang['Kind of date'] = 'نوع من التاريخ';
+$lang['Language'] = 'اللغة';
+$lang['Last'] = 'آخر';
+$lang['Last Page'] = 'الصفحة الأخيرة';
+$lang['Link: %s'] = '%s :الرابط';
+$lang['Links'] = 'الروابط';
+$lang['Login'] = 'تسجيل الدخول';
+$lang['Favorites'] = 'المفضلة';
+$lang['File'] = 'ملف';
+$lang['File name'] = 'اسم الملف';
+$lang['File name, A &rarr; Z'] = 'ى &rarr; اسم الملف، ا';
+$lang['File name, Z &rarr; A'] = 'ا &rarr; اسم الملف، ى';
+$lang['Filesize'] = 'حجم الملف';
+$lang['Filter'] = 'فلتر';
+$lang['Filter and display'] = 'فلتر و عرض';
+$lang['First'] = 'اول';
+$lang['First Page'] = 'اول صفحة';
+$lang['Forbidden'] = 'محظور';
+$lang['Forgot your password?'] = 'نسيت كلمة المرور؟';
+$lang['Go back to the album'] = 'الرجوع الى الألبوم';
+$lang['Go through the gallery as a visitor'] = 'التنقل في معرض كزائر';
+$lang['Hello'] = 'أهلا';
+$lang['Hello %s,'] = '،%s أهلا';
+$lang['Hello %s, your Piwigo photo gallery is empty!'] = '!الخاص بك فارغ Piwigoمعرض صور ال ،%s أهلا';
+$lang['Expand all albums'] = 'توسيع جميع الألبومات';
+$lang['Error sending email'] = 'خطأ عند إرسال البريد الإلكتروني';
+$lang['Enter your personnal informations'] = 'أدخل بياناتك الشخصية';
+$lang['Enter your new password below.'] = 'ادخل كلمة المرور فى الأسفل';
+$lang['End-Date'] = 'تاريخ الأنتهاء';
+$lang['Empty query. No criteria has been entered.'] = 'الاستعلام فار. لم يتم ادخال اى معايير.';
+$lang['Email: %s'] = '%s :البريد الإلكتروني';
+$lang['Email address is missing. Please specify an email address.'] = 'البريد الإلكتروني غير موجود. يرجى تحديد بريد الكترونى.';
+$lang['Email address is mandatory'] = 'البريد الإلكتروني إلزامي';
+$lang['EXIF Metadata'] = 'EXIF Metadata';
+$lang['Email'] = 'البريد الإلكتروني';
+$lang['Email address'] = 'عنوان البريد الإلكتروني';
+$lang['Edit a comment'] = 'تعديل تعليق';
+$lang['Edit'] = 'تعديل';
+$lang['Each listed rule must be satisfied.'] = 'كل من المعايير المذكورة يجب أن يكون محققا.';
+$lang['Download this file'] = 'حمل هذا الملف';
+$lang['Download'] = 'حمل';
+$lang['Display'] = 'عرض';
+$lang['Dimensions'] = 'أبعاد';
+$lang['Desktop'] = 'سطح المكتب';
+$lang['Delete'] = 'حظف';
+$lang['Default'] = 'الأصل';
+$lang['Date posted, old &rarr; new'] = 'حديث &rarr; تاريخ النشر، قديم';
+$lang['Date posted, new &rarr; old'] = 'قديم &rarr; تاريخ النشر، جديد';
+$lang['Date created, old &rarr; new'] = 'حديث &rarr; تاريخ الأنشاء، قديم';
+$lang['Date created, new &rarr; old'] = 'قديم &rarr; تاريخ الأنشاء، جديد';
+$lang['Date'] = 'تاريخ';
+$lang['Customize'] = 'تعديل';
+$lang['Current password is wrong'] = 'كلمة المرور الحالية خاطئة';
+$lang['Creation date'] = 'تاريخ الإنشاء';
+$lang['Created on'] = 'تم إنشاؤها فى';
+$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'يتم حظر الكوكيز فى متصفحك او هو لا يدعمهم. يجب عليك تمكين ملفات تعريف الأرتباط لتسجيل الدخول.';
+$lang['Create a new account'] = 'انشاء حساب جديد';
+$lang['Contact webmaster'] = 'اتصل بالمسؤول عن الموقع';
+$lang['Contact'] = 'اتصل';
+$lang['Connected user: %s'] = '%s :المستخد المتصل';
+$lang['Connection settings'] = 'إعدادات الاتصال';
+$lang['Complete RSS feed (photos, comments)'] = '(صور، تعليقات) RSSجميع ال';
+$lang['Confirm Password'] = 'تأكيد من كلمة السر';
+$lang['Comments'] = 'تعليقات';
+$lang['Comment: %s'] = '%s :تعليق';
+$lang['Comment by %s'] = '%s تعليق من';
+$lang['Comment'] = 'تعليق';
+$lang['Click on the photo to see it in high definition'] = 'اضغط على الصورة لرؤيتها فى اعلى جودة';
+$lang['Check your email for the confirmation link'] = 'تحقق من بريدك الألكترونى من اجل الحصول على رابط التأكيد';
+$lang['Click here if your browser does not automatically forward you'] = 'اضغط هنا اذا لم يتم تحويلك اوتوماتيكيا';
+$lang['Change my password'] = 'تغير كلمة السر';
+$lang['Calendar'] = 'التقويم';
+$lang['Browser: %s'] = '%s :متصفح';
+$lang['Best rated'] = 'اعلى تصنيف';
+$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'خالة خاطئة للعضو "زائر"، الحالة الأساسية سوف توضع. من فضلك ابلغ صاحب .الموقع او المسئول';
+$lang['Bad request'] = 'طلب خاطء';
+$lang['Close this window'] = 'قفل هذه النافظة';
+$lang['Auto login'] = 'تسجيل دخول تلقائى';
+$lang['Author'] = 'المؤلف';
+$lang['Author: %s'] = '%s :المؤلف';
+$lang['At least one listed rule must be satisfied.'] = 'على الأقل معيار واحد يجب ان يكون محقق';
+$lang['Apply on properties'] = 'تطبيق على الخصائص';
+$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'من فضلك انتظر قليلا قبل وضع تعليق اخر';
+$lang['An administrator must authorize your comment before it is visible.'] = 'قبل ظهور تعليقق، يجب على الأدارة التحقق منه';
+$lang['Are you sure?'] = 'هل انت متأكد؟';
+$lang['Any tag'] = 'جميع العلامات';
+$lang['All tags'] = 'جميع العلامات';
+$lang['%d Kb'] = '%d كيلوبايت';
+$lang['All'] = 'الكل';
+$lang['Albums'] = 'ألبومات';
+$lang['Album: %s'] = '%s :البوم';
+$lang['Album results for'] = 'نتائج الألبومات فى';
+$lang['Album name, Z &rarr; A'] = 'ا &rarr; اسم الألبوم، ى';
+$lang['Album name, A &rarr; Z'] = 'ى &rarr; اسم الألبوم، ا';
+$lang['Administration'] = 'الإدارة';
+$lang['Album'] = 'ألبوم';
+$lang['Admin: %s'] = '%s :ادمين';
+$lang['Add a comment'] = 'اضف تعليق';
+$lang['%d rates'] = '%d تقيمات';
+$lang['%d rate'] = '%d تقيم';
+$lang['Accelerate diaporama speed'] = 'زيادة سرعة عرض الشرائح';
+$lang['the username must be given'] = 'اسم المستخدم مطلوب';
+$lang['this email address is already in use'] = 'عنوان البريد الإلكتروني هذا مستخدم';
+$lang['this login is already used'] = 'اسم الدخول هذا مستخدم';
+$lang['thumb'] = 'الصورة المصغرة';
+$lang['today'] = 'اليوم';
+$lang['useful when password forgotten'] = 'مفيدة في حالة نسيان كلمة المرور';
+$lang['wrong date'] = 'التاريخ غير صحيح';
+$lang['xlarge'] = 'XL - كبير جدا';
+$lang['xsmall'] = 'XS - صغير جدا';
+$lang['xxlarge'] = 'XXL - ضخم';
+$lang['password updated'] = 'تم تحديث كلمة المرور';
+$lang['photo'] = 'صورة';
+$lang['photos posted during the last %d days'] = 'ايام %d الصور التي نشرت خلال آخر';
+$lang['posted after %s (%s)'] = '%s(%s) نشرت بعد';
+$lang['posted before %s (%s)'] = '%s(%s) نشرت قبل';
+$lang['posted between %s (%s) and %s (%s)'] = '%s(%s) و %s(%s) نشرت بين';
+$lang['posted on %s'] = '%s نشرت فى';
+$lang['remove this tag from the list'] = 'إزالة هذه العلامة من القائمة';
+$lang['representative'] = 'الصور المصغرة للألبوم';
+$lang['return to normal view mode'] = 'عودة إلى وضع العرض العادي';
+$lang['return to the display of all photos'] = 'العودة إلى عرض جميع الصور';
+$lang['search'] = 'بحث';
+$lang['searched words : %s'] = '%s :بحثت الكلمات';
+$lang['set as album representative'] = 'وضع كصورة مصغرة للألبوم';
+$lang['show tag cloud'] = 'اظهار علامات السحاب';
+$lang['slideshow'] = 'عرض الشرائح';
+$lang['small'] = 'S - صغير';
+$lang['square'] = 'مربع';
+$lang['stop the slideshow'] = 'إيقاف عرض الشرائح';
+$lang['the beginning'] = 'البداية';
+$lang['letters'] = 'رسائل';
+$lang['login mustn\'t end with a space character'] = 'تسجيل الدخول يجب أن لا ينتهي بمسافة';
+$lang['login mustn\'t start with a space character'] = 'يجب ألا يبدأ تسجيل الدخول بمسافة';
+$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = '(jack@altern.org :مثال) xxx@yyy.eee يجب أن يكون البريد الإلكتروني مثل';
+$lang['mandatory'] = 'إلزامي';
+$lang['medium'] = 'M - متوسط';
+$lang['month']['10'] = 'أكتوبر';
+$lang['month']['11'] = 'نوفمبر';
+$lang['month']['12'] = 'ديسمبر';
+$lang['month']['1'] = 'يناير';
+$lang['month']['2'] = 'فبراير';
+$lang['month']['3'] = 'مارس';
+$lang['month']['4'] = 'أبريل';
+$lang['month']['5'] = 'مايو';
+$lang['month']['6'] = 'يونيو';
+$lang['month']['7'] = 'يوليو';
+$lang['month']['8'] = 'أغسطس';
+$lang['month']['9'] = 'سبتمبر';
+$lang['no rate'] = 'لا يوجد تقيم';
+$lang['obligatory'] = 'إلزامي';
+$lang['display last user comments'] = 'عرض آخر تعليقات المستعمل';
+$lang['display most recent photos'] = 'عرض الصور الأخيرة';
+$lang['display most visited photos'] = 'عرض الصور الأكثر زيارة';
+$lang['display only recently posted photos'] = 'عرض الصور التى نشرت مؤخرا فقط';
+$lang['display photos linked to this tag'] = 'عرض الصور المرتبطة بهذه العلامة';
+$lang['display recently updated albums'] = 'عرض الألبومات التى تم تحديثها مؤخرا';
+$lang['display this album'] = 'عرض هذا الألبوم';
+$lang['display your favorites photos'] = 'عرض صورك المفضلة';
+$lang['edit'] = 'تعديل';
+$lang['excluded'] = 'مستبعدة';
+$lang['from %s to %s'] = '%s الى %s من';
+$lang['group by letters'] = 'تجميع الرسائل';
+$lang['guest'] = 'زائر';
+$lang['html tags are not allowed in login'] = 'فى تسجيل الدخول HTML لا يسمح بأستخدام اى علامات';
+$lang['in %d sub-album'] = 'البوم فرعى %d فى';
+$lang['in %d sub-albums'] = 'البوم فرعى %d فى';
+$lang['in this album'] = 'فى هذا الألبوم';
+$lang['included'] = 'مضمونة';
+$lang['large'] = 'L - كبير';
+$lang['last %d days'] = 'ايام %d آخر';
+$lang['created on %s'] = '%s تم إنشاؤها فى';
+$lang['customize the appareance of the gallery'] = 'تعديل مظهر المعرض';
+$lang['day']['0'] = 'الأحد';
+$lang['day']['1'] = 'الاثنين';
+$lang['day']['2'] = 'الثلاثاء';
+$lang['day']['3'] = 'الأربعاء';
+$lang['day']['4'] = 'الخميس';
+$lang['day']['5'] = 'الجمعة';
+$lang['day']['6'] = 'السبت';
+$lang['delete all photos from your favorites'] = 'حذف جميع الصور من المفضلة';
+$lang['delete this photo from your favorites'] = 'حذف هذه الصورة من المفضلة';
+$lang['descending'] = 'تنازلي';
+$lang['display a calendar by creation date'] = 'عرض التقويم حسب تاريخ الإنشاء';
+$lang['display a calendar by posted date'] = 'عرض التقويم حسب تاريخ نشرها';
+$lang['display a set of random photos'] = 'عرض مجموعة من الصور العشوائية';
+$lang['display all photos in all sub-albums'] = 'عرض جميع الصور في جميع الألبومات الفرعية';
+$lang['display available tags'] = 'عرض العلامات المتاحة';
+$lang['display best rated photos'] = 'عرض الصور الأفضل تصنيفا';
+$lang['display each day with photos, month per month'] = 'عرض الأيام مع الصور، الشهر لكل شهر';
+$lang['created before %s (%s)'] = '(%s)%s انشئت قبل';
+$lang['created after %s (%s)'] = '(%s)%s أنشئت بعد';
+$lang['created between %s (%s) and %s (%s)'] = '(%s)%s و (%s)%s انشئت بين';
+$lang['You will receive a link to create a new password via email.'] = '.سوف تحصل على رابط عبر البريد الإلكتروني لإنشاء كلمة مرور جديدة';
+$lang['Your Gallery Customization'] = 'تعديل معرضك';
+$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'لم يتم تسجيل تعليقك لأنه لم يجتز قواعد التحقق من الصحة';
+$lang['Your comment has been registered'] = 'تم تسجيل تعليقك';
+$lang['Your favorites'] = 'المفضلة';
+$lang['Your password has been reset'] = 'تم إعادة تعيين كلمة المرور الخاصة بك';
+$lang['Your username has been successfully changed to : %s'] = '%s :تم تغيير اسم المستخدم الخاص بك بنجاح الى';
+$lang['Your website URL is invalid'] = 'رابط موقع الويب الخاص بك غير صالح';
+$lang['add this photo to your favorites'] = 'إضافة هذه الصورة إلى المفضلة';
+$lang['all'] = 'جميع';
+$lang['ascending'] = 'تصاعدي';
+$lang['author(s) : %s'] = '%s :(المؤلف(ون';
+$lang['available for administrators only'] = 'متاح للمسؤلين فقط';
+$lang['chronology_monthly_calendar'] = 'التقويم الشهري';
+$lang['chronology_monthly_list'] = 'القائمة الشهرية';
+$lang['chronology_weekly_list'] = 'القائمة الأسبوعية';
+$lang['cloud'] = 'سحاب';
+$lang['comment date'] = 'تاريخ التعليق';
\ No newline at end of file
diff --git a/sources/language/ar_EG/index.php b/sources/language/ar_EG/index.php
new file mode 100644
index 0000000..0b96c3e
--- /dev/null
+++ b/sources/language/ar_EG/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/sources/language/ar_EG/install.lang.php b/sources/language/ar_EG/install.lang.php
new file mode 100644
index 0000000..087f6fc
--- /dev/null
+++ b/sources/language/ar_EG/install.lang.php
@@ -0,0 +1,70 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+$lang['PHP 5 is required'] = 'مطلوب PHP 5.2';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = '.htaccess عن طريق تعديل او انشاء ملف PHP 5.2 قد تحاول تعديل ملفاتك الى Piwigo';
+$lang['Piwigo was not able to configure PHP 5.'] = '.PHP 5.2 غير قادر على تعديل Piwigo كان';
+$lang['Try to configure PHP 5'] = '.PHP 5.2 حاول تعديل ';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'يجب التوجه إلى دعم مزود الاستضافة الخاص بك حتى نرى كيف يمكنك التبديل .PHP 5.2 من قبل نفسك الى';
+$lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'بحاجة الى مساعدة؟ أسأل سؤالك فى <a href="%s">لوحة الرسائل</a>.';
+$lang['You can download the config file and upload it to local/config directory of your installation.'] = 'يمكنك تحميل ملف الconfig و وضعه فى local/config في التثبيت.';
+$lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'سيتم بادئة أسماء جدول قاعدة البيانات بها (تمكنك من إدارة الجداول الخاصة بك بشكل أفضل)';
+$lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = ':الحل البديل هو نسخ النص في المربع بالأعلى ولصقه في ملف 
+"local/config/database.inc.php" 
+database.inc.php :تحذير)
+يجب أن يحتوي على ما هو موجود في ناحية النص فقط، لا عودة او حرف مساف(';
+$lang['Creation of config file local/config/database.inc.php failed.'] = 'config فشل إنشاء ملف التكوين 
+local/config/database.inc.php';
+$lang['Database table prefix'] = 'بادئة جداول قاعدة البيانات';
+$lang['Default gallery language'] = 'لغة المعرض الافتراضية ';
+$lang['Installation'] = 'تثبيت';
+$lang['user login given by your host provider'] = 'تسجيل دخول المستخدم توفيره من قبل مضيف السرفر الخاص بك';
+$lang['user password given by your host provider'] = 'كلمة مرور المستخدم التي يوفرها مضيف السرفر الخاص بك';
+$lang['verification'] = 'التحقق';
+$lang['webmaster login can\'t contain characters \' or "'] = '" تسجيل دخول المسؤول عن الموقع قد لا تحتوي على العلامات \' او';
+$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '.Piwigo لاحظ انه يمكنك تغيير البيانات الخاصة بك من نفسك ثم قم بإعادة تشغيل';
+$lang['Password ']['confirm'] = 'كلمة السر [تأكيد]';
+$lang['Sorry!'] = 'معذرة!';
+$lang['Start Install'] = 'بدء التثبيت';
+$lang['User'] = 'مستخدم';
+$lang['Visitors will be able to contact site administrator with this mail'] = 'سيتمكن الزوار من استخدام هذا البريد الإلكتروني للاتصال بالمسؤول عن الموقع';
+$lang['Welcome to my photo gallery'] = 'مرحبا بكم في معرض الصور الخاص بي';
+$lang['Welcome to your new installation of Piwigo!'] = '!Piwigoمرحبا بكم في التثبيت الجديد ل';
+$lang['also given by your host provider'] = 'زودت أيضا من قبل موفر استضافة الخاص بك';
+$lang['enter a login for webmaster'] = 'من فضلك ادخل اسم المستخدم المسؤول عن الموقع';
+$lang['localhost or other, supplied by your host provider'] = 'المضيف المحلي أو غيره، مقدم من مضيف السرفر الخاص بك';
+$lang['please enter your password again'] = 'يرجى إدخال كلمة المرور مرة أخرى';
+$lang['Don\'t hesitate to consult our forums for any help : %s'] = '%s :لا تتردد في استشارة منتدياتنى للحصول على اي مساعدة';
+$lang['Basic configuration'] = 'التعديل الأصلى';
+$lang['Can\'t connect to server'] = 'لا يمكن الاتصال بالسرفر';
+$lang['Congratulations, Piwigo installation is completed'] = 'Piwigo تهانينا، اكتمال تنزيل';
+$lang['Connection to server succeed, but it was impossible to connect to database'] = 'كان الاتصال السرفر ناجح، ولكن الاتصال إلى قاعدة البيانات غير ممكن.';
+$lang['Database configuration'] = 'تعديل قاعدة بيانات';
+$lang['Database name'] = 'اسم قاعدة البيانات';
+$lang['Download the config file'] = 'تحميل ملف التعديل';
+$lang['Hope to see you back soon.'] = '.نأمل أن نراكم مرة أخرى قريبا';
+$lang['Host'] = 'المضيف';
+$lang['It appears your webhost is currently running PHP %s.'] = 'PHP %s يبدو  كأن مضيف الموقع الخاص بك يعمل على نسخة';
+$lang['It will be shown to the visitors. It is necessary for website administration'] = 'سوف تظهر للزوار. فهى ضرورية لإدارة الموقع';
+$lang['Just another Piwigo gallery'] = 'آخر Piwigo مجرد معرض ';
+$lang['Keep it confidential, it enables you to access administration panel'] = 'ابقيه سري، فإنه يتيح لك الوصول إلى لوحة الإدارة';
+$lang['Admin configuration'] = 'تعديل الإدارة';
\ No newline at end of file
diff --git a/sources/language/ar_EG/iso.txt b/sources/language/ar_EG/iso.txt
new file mode 100644
index 0000000..5331609
--- /dev/null
+++ b/sources/language/ar_EG/iso.txt
@@ -0,0 +1 @@
+العربية (مصر) [EG]
\ No newline at end of file
diff --git a/sources/language/ar_MA/common.lang.php b/sources/language/ar_MA/common.lang.php
index 1584634..07e3085 100644
--- a/sources/language/ar_MA/common.lang.php
+++ b/sources/language/ar_MA/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: العربية [MA]
-Version: 2.5.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/ar_MA/index.php b/sources/language/ar_MA/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/ar_MA/index.php
+++ b/sources/language/ar_MA/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ar_SA/admin.lang.php b/sources/language/ar_SA/admin.lang.php
index 451965f..915d49a 100644
--- a/sources/language/ar_SA/admin.lang.php
+++ b/sources/language/ar_SA/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -724,7 +724,7 @@ $lang['Extensions Update'] = 'ترقية الاضافات';
 $lang['Update in progress... Please wait.'] = 'يتم معالجة التحديثات ،لحظات الانتظار .. املئها بالاستغفار';
 $lang['Ignore this update'] = 'اهمال هذا التحديث';
 $lang['Reset ignored updates'] = 'اعادة تعييين التحديثات المهملة';
-$lang['Update All'] = 'تجديث الكل';
+$lang['Update All'] = 'تحديث الكل';
 $lang['ERROR'] = 'خطأ';
 $lang['All extensions are up to date.'] = 'كل الاضافة محدثة.';
 $lang['Following plugins may not be compatible with the new version of Piwigo:'] = 'الادوات التالية يمكن ان تكون غير متوافقة مع الاصدار الجديد ل Piwigo :';
@@ -982,4 +982,13 @@ $lang['The settings for the guest are from the %s user'] = 'الإعدادات 
 $lang['No and unlock sub-albums'] = 'لا و إلغي اتاحة الإلبومات الفرعية ';
 $lang['Mail address is mandatory for registration'] = 'عنوان البريد إلزامية للتسجيل';
 $lang['Impossible to deactivate the default theme.'] = 'من المستحيل إلغاء تنشيط السمة الافتراضية.';
-$lang['Empty caddie'] = 'العلبة فارغة';
\ No newline at end of file
+$lang['Empty caddie'] = 'العلبة فارغة';
+$lang['Delete %d orphan photos'] = 'حذف  %d الصور مجهولة المصدر';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'كل الرسائل ستتضمن  رابط مفتاح المصادقة التلقائي  %s.';
+$lang['Edit user'] = 'تحرير المستخدم';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'لأسباب أمنية، مفاتيح التوثيق لا تعمل للمسؤولين.';
+$lang['No recipient selected'] = 'لم يتم تحديد مستلم';
+$lang['No user is permitted to see this private album'] = 'لا يجوز للمستخدم أن يرى هذا الألبوم الخاص';
+$lang['Orphans'] = 'مجهول المصدر';
+$lang['Recipients'] = 'متلقي';
+$lang['Y Repeat'] = 'Y كرر';
\ No newline at end of file
diff --git a/sources/language/ar_SA/common.lang.php b/sources/language/ar_SA/common.lang.php
index 8ab9306..c115f8d 100644
--- a/sources/language/ar_SA/common.lang.php
+++ b/sources/language/ar_SA/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: العربية [AR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=412
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -181,7 +181,7 @@ $lang['First'] = 'الأولى';
 $lang['The gallery is locked for maintenance. Please, come back later.'] = 'مغلق للصيانة و التحديث .. نرجوا إعادة الزيارة مرة أخرى.';
 $lang['Page generated in'] = 'صفحة أنشئت في ..';
 $lang['guest'] = 'ضيف';
-$lang['Hello'] = 'السلام عليكم ';
+$lang['Hello'] = 'مرحبا';
 $lang['available for administrators only'] = 'متاح للأدارين فقط';
 $lang['display this album'] = 'عرض  جميع صور هذا الألبوم';
 $lang['display last user comments'] = 'شاهد آخر التعليقات';
@@ -434,4 +434,5 @@ $lang['Apply on properties'] = 'تطبيق على خصائص';
 $lang['Link: %s'] = 'الرابط: %s';
 $lang['No results for'] = 'لا يوجد نتائج';
 $lang['Photo description'] = 'وصف الصورة';
-$lang['Photo title'] = 'عنوان الصورة';
\ No newline at end of file
+$lang['Photo title'] = 'عنوان الصورة';
+$lang['Your authentication key is no longer valid.'] = 'مفتاح المصادقة الخاصة بك لم يعد صالحا.';
\ No newline at end of file
diff --git a/sources/language/ar_SA/help/photos_add_ftp.html b/sources/language/ar_SA/help/photos_add_ftp.html
index 19a76af..4d7db35 100644
--- a/sources/language/ar_SA/help/photos_add_ftp.html
+++ b/sources/language/ar_SA/help/photos_add_ftp.html
@@ -30,47 +30,39 @@
 المعرض (ولكن
 به العديد من الميزات:</p>
 
-<pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- album-1
-|   |   |-- album-1.1
-|   |   |   |-- album-1.1.1
-|   |   |   |   |-- album-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- album-1.1.1.2
-|   |   |   +-- album-1.1.2
-|   |   |-- album-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- album-1.3
-|   +-- album-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- local
-|-- plugins
-|-- template-extension
-|-- themes
-+-- tool</pre>
+    <pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
 </li>
 
 <li>باستثناء تلك المسماة "تصغير"، "pwg_high "
-"pwg_representative"(انظر شرح أدناه)، تحت كل مجلد
+"pwg_representative" and "pwg_format"(انظر شرح أدناه)، تحت كل مجلد
 "معرض" تنتج ألبوم, لا يوجد حد في العمق,</li>
 
 <li>في الأساس ، اي عنصر يمثل ب ملف, يمكن أن يكون ملف
@@ -109,6 +101,8 @@ wedding.jpg في المثال أعلاه, بدون اختصار على الصو
 <li>ملفات الصور المصغرة وليس من الضروري ان يكون ملحقها نفس
 الصورة المرتبطة بها (على سبيل المثال " JPG" صورة قد يكون لها ملحق " GIF").</li>
 
+<li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
 <li>من المستحسن استخدام وحدة خارجية انشاء صورة مصغرة</li>
 
 <li>إستخدام أداة إنشاء الصورة المصغرة المتكاملة في Piwigo هو
@@ -117,4 +111,4 @@ wedding.jpg في المثال أعلاه, بدون اختصار على الصو
 <li>إذا اخترت استخدام خادم الويب ل إنشاء الصور المصغرة ، يجب السماح حق الوصول للكتابة على كافة مجلدات الالبومات</li>
 
 </ul>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/sources/language/ar_SA/index.php b/sources/language/ar_SA/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/ar_SA/index.php
+++ b/sources/language/ar_SA/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ar_SA/install.lang.php b/sources/language/ar_SA/install.lang.php
index 6c429ee..37f8a68 100644
--- a/sources/language/ar_SA/install.lang.php
+++ b/sources/language/ar_SA/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'كلمة المرور [confirm]';
 $lang['verification'] = 'التحقق';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'هل تحتاج لمساعده؟ يمكنك السؤال  <a href="%s">Piwigo لجنة الأسئلة في </a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = ' سيتمكن الزوار لاستخدام هذا البريد إلى الاتصال بالمسؤول عن الموقع';
-$lang['PHP 5 is required'] = 'مطلوب  PHP 5 ';
+$lang['PHP 5 is required'] = 'مطلوب  PHP 5.2 ';
 $lang['It appears your webhost is currently running PHP %s.'] = 'PHP %s يبدوا أن المضيف يستخدم حاليا ';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'قد يحاول تبديل التكوين الخاص بك إلىPHP 5 عن طريق إنشاء أو تعديل ملف htaccess . Piwigo ';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'قد يحاول تبديل التكوين الخاص بك إلىPHP 5.2 عن طريق إنشاء أو تعديل ملف htaccess . Piwigo ';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'ملاحظة يمكنك تغيير التكوين الخاص بك من نفسك وإعادة Piwigo بعد ذلك.';
-$lang['Try to configure PHP 5'] = 'PHP 5 محاولة تكوين ';
+$lang['Try to configure PHP 5'] = 'PHP 5.2 محاولة تكوين ';
 $lang['Sorry!'] = 'مـعـذرة !1';
-$lang['Piwigo was not able to configure PHP 5.'] = ' Piwigo غير قادر على تكوين PHP 5';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'تحقق من مزود الاستضافة حول دعمه لـ PHP 5';
+$lang['Piwigo was not able to configure PHP 5.'] = ' Piwigo غير قادر على تكوين PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'تحقق من مزود الاستضافة حول دعمه لـ PHP 5.2';
 $lang['Hope to see you back soon.'] = 'نأمل أن نرى عودتك إلى هنا قريبا';
 $lang['Congratulations, Piwigo installation is completed'] = 'تم بحمد الله تثبيت معرضPiwigo  بنجاح  ، مبروك ';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'حل آخر هو نسخ النص في المربع أعلاه ولصقه في ملف"local/config/database.inc.php" (تحذير : database.inc.php يجب أن تحتوي فقط ما هو موجود في   النص،  الخط أو حرف مسافة)';
@@ -64,5 +64,4 @@ $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'لاتترد
 $lang['Just another Piwigo gallery'] = 'معرض آخر من Piwigo';
 $lang['Welcome to my photo gallery'] = 'مرحباً بك في معرض الصور';
 $lang['Welcome to your new installation of Piwigo!'] = 'مرحبا بكم في التثبيت الجديد من Piwigo!';
-$lang['localhost or other, supplied by your host provider'] = 'المضيف المحلي او المقدم من قبل موفر الخدمة الخاص بك';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'المضيف المحلي او المقدم من قبل موفر الخدمة الخاص بك';
\ No newline at end of file
diff --git a/sources/language/ar_SA/upgrade.lang.php b/sources/language/ar_SA/upgrade.lang.php
index 56117b7..68cf34e 100644
--- a/sources/language/ar_SA/upgrade.lang.php
+++ b/sources/language/ar_SA/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/az_AZ/common.lang.php b/sources/language/az_AZ/common.lang.php
index 8096e5f..ee335ec 100644
--- a/sources/language/az_AZ/common.lang.php
+++ b/sources/language/az_AZ/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Azərbaycanca [AZ]
-Version: 2.5.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=618
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/bg_BG/admin.lang.php b/sources/language/bg_BG/admin.lang.php
index b8625e9..5066ad5 100644
--- a/sources/language/bg_BG/admin.lang.php
+++ b/sources/language/bg_BG/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -981,4 +981,14 @@ $lang['No and unlock sub-albums'] = 'Не и отключване на под-а
 $lang['Mail address is mandatory for registration'] = 'Имейл адресът е задължителна за регистрация';
 $lang['Impossible to deactivate the default theme.'] = 'Невъзможно е деактивиране на темата по подразбиране.';
 $lang['Empty caddie'] = 'Изпразване на колекцията';
-$lang['Upload in progress'] = 'Качването е в ход';
\ No newline at end of file
+$lang['Upload in progress'] = 'Качването е в ход';
+$lang['Recipients'] = 'Получатели';
+$lang['Orphans'] = 'Самотни';
+$lang['No user is permitted to see this private album'] = 'Никой потребител не е избран да вижда този личен албум';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'От съображения за сигурност, уникалните ключове няма да работят за администратори.';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Всеки изпратен имейл ще съдържа свой уникален ключ към линковете, валиден за %s.
+';
+$lang['Delete %d orphan photos'] = 'Изтриване %d самотни снимки';
+$lang['No recipient selected'] = 'Не е избран получател';
+$lang['Edit user'] = 'Редакция на потребител';
+$lang['Y Repeat'] = 'Y Повторение';
\ No newline at end of file
diff --git a/sources/language/bg_BG/common.lang.php b/sources/language/bg_BG/common.lang.php
index d1d94fe..5f32b4c 100644
--- a/sources/language/bg_BG/common.lang.php
+++ b/sources/language/bg_BG/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Български [BG]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=510
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -444,4 +444,5 @@ $lang['month']['5'] = 'май';
 $lang['month']['6'] = 'юни';
 $lang['month']['7'] = 'юли';
 $lang['month']['8'] = 'август';
-$lang['month']['9'] = 'септември';
\ No newline at end of file
+$lang['month']['9'] = 'септември';
+$lang['Your authentication key is no longer valid.'] = 'Вашият ключ да верификация вече не е активен.';
\ No newline at end of file
diff --git a/sources/language/bg_BG/help/group_list.html b/sources/language/bg_BG/help/group_list.html
new file mode 100644
index 0000000..5811bb0
--- /dev/null
+++ b/sources/language/bg_BG/help/group_list.html
@@ -0,0 +1,22 @@
+<h2>Списък с групи</h2>
+
+<p>Тук се управляват групите.</p>
+
+<h3>Добави група</h3>
+
+<p>Администраторите могат да добавят групи.</p>
+
+<h3>Групи</h3>
+
+<p>За всяка група могат да се прилагат следните действия:</p>
+
+
+<ul>
+  <li>управление на потребителите (Администратори &raquo; Потребители &raquo; Управление)</li>
+  <li>управление на правата за достъп за даване или отнемане на достъпа до лични албуми.</li>
+  <li>изтриване на група (изисква потвърждение)</li>
+  <li>превключване на статус "по подразбиране" (изисква потвърждение)</li>
+</ul>
+
+<h3>Групи по подразбиране</h3>
+<p>Това са групи, към които се асоциират автоматично новите потребители когато се регистрират, или когато се създават от администратор.</p>
diff --git a/sources/language/bg_BG/help/help_groups.html b/sources/language/bg_BG/help/help_groups.html
new file mode 100644
index 0000000..ebcaa3b
--- /dev/null
+++ b/sources/language/bg_BG/help/help_groups.html
@@ -0,0 +1,11 @@
+<p>Групите са най-удобния начин за задаване на права за списък от потребители.</p>
+
+<p>Саздай групи в <span class="pwgScreen">Администрация &raquo; Потребители
+&raquo; Групи</span> и добавете потребители към тях
+в <span class="pwgScreen">Администрация &raquo; Потребители &raquo;
+Управление</span>.</p>
+
+<p>Потребителя може да се добави към няколко групи. Разрешителното има предимство пред
+забраната: Ако потребителя "Иван" е член на групи "семейство" и "приятели", а само 
+групата "семейство" може да вижда албум "Нова година 2008", то тогава "Иван" ще може
+да виждат този албум.</p>
\ No newline at end of file
diff --git a/sources/language/bg_BG/help/help_misc.html b/sources/language/bg_BG/help/help_misc.html
new file mode 100644
index 0000000..ebea64d
--- /dev/null
+++ b/sources/language/bg_BG/help/help_misc.html
@@ -0,0 +1,7 @@
+<p>Веднъж съдали галерия вие може да конфигурирата посетителите<ul>
+	<li>Настройки се намират в <span class="pwgScreen">Администрация &raquo; Конфигуриране &raquo; Опции</span> tab <span class="pwgScreen">Гости Настройки</span></li>
+	<li>Облик на темата е в <span class="pwgScreen">Администрация &raquo; Конфигуриране &raquo; Теми</span></li>
+	<li>Настройки на език са в <span class="pwgScreen">Администрация &raquo; Конфигуриране &raquo; Езици</span></li></ul>
+ По подразбиране всеки нов потребител ще вижда зададени тези настройки.
+</p>
+<p>Ако имате въпроси, Piwigo общността е на ваше разположение на своя <a href="http://piwigo.org/forum">форум</a>.</p>
\ No newline at end of file
diff --git a/sources/language/bg_BG/install.lang.php b/sources/language/bg_BG/install.lang.php
index f8a4f11..e8c393d 100644
--- a/sources/language/bg_BG/install.lang.php
+++ b/sources/language/bg_BG/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/bg_BG/upgrade.lang.php b/sources/language/bg_BG/upgrade.lang.php
index 4bbf012..1396814 100644
--- a/sources/language/bg_BG/upgrade.lang.php
+++ b/sources/language/bg_BG/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/bn_IN/common.lang.php b/sources/language/bn_IN/common.lang.php
index cb66ca7..e19b7c7 100644
--- a/sources/language/bn_IN/common.lang.php
+++ b/sources/language/bn_IN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: বাংলা[IN]
-Version: 2.5.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=657
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -61,5 +61,24 @@ $lang['... or please deactivate this message, I will find my way by myself'] = '
 $lang['A comment on your site'] = 'আপনার সাইটে একটি মন্তব্য';
 $lang['About Piwigo'] = 'পিউইগো বিষয়ক';
 $lang['About'] = 'বিষয়ক';
-
+$lang['Date']      = 'তারিখ';
+$lang['day'][0]    = 'রবিবার';
+$lang['day'][1]    = 'সোমবার';
+$lang['day'][2]    = 'মঙ্গলবার';
+$lang['day'][3]    = 'বুধবার';
+$lang['day'][4]    = 'বৃহস্পতিবার';
+$lang['day'][5]    = 'শুক্রবার';
+$lang['day'][6]    = 'শনিবার';
+$lang['month'][10] = 'অক্টোবর';
+$lang['month'][11] = 'নভেম্বর';
+$lang['month'][12] = 'ডিসেম্বর';
+$lang['month'][1]  = 'জানুয়ারী';
+$lang['month'][2]  = 'ফেব্রুয়ারি';
+$lang['month'][3]  = 'মার্চ';
+$lang['month'][4]  = 'এপ্রিল';
+$lang['month'][5]  = 'মে';
+$lang['month'][6]  = 'জুন';
+$lang['month'][7]  = 'জুলাই';
+$lang['month'][8]  = 'অগাস্ট';
+$lang['month'][9]  = 'সেপ্টেম্বর';
 ?>
\ No newline at end of file
diff --git a/sources/language/br_FR/admin.lang.php b/sources/language/br_FR/admin.lang.php
index 28eae88..52fbbf4 100755
--- a/sources/language/br_FR/admin.lang.php
+++ b/sources/language/br_FR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -42,8 +42,8 @@ $lang['%d anomaly has been corrected.'] = '%d direizhder a zo bet reizhet.';
 $lang['%d anomaly has been detected.'] = '%d direizhder a zo bet detektet.';
 $lang['%d anomaly has been ignored.'] = '%d direizhder n\'eo ket bet reizhet.';
 $lang['%d anomaly has not been corrected.'] = '%d direizhder n\'eo ket bet posubl reizhañ.';
-$lang['%d guest'] = '%d gweladenner';
-$lang['%d guests'] = '%d gweladenner';
+$lang['%d guest'] = '%d ostiziad';
+$lang['%d guests'] = '%d ostiziad';
 $lang['%d hour'] = '%d eurvezh';
 $lang['%d hours'] = '%d eurvezh';
 $lang['%d member'] = '%d ezel';
@@ -96,7 +96,7 @@ $lang['group "%s" updated'] = 'strollad "%s" hizivaet';
 $lang['This is a major update, with <a href="%s">new exciting features</a>.'] = 'Un hizivadur meur eo, gant <a href="%s">arc\'hweladurioù nevez a-feson</a>.';
 $lang['This is a minor update, with only bug corrections.'] = 'Un hizivadur bihan eo, gant reizhadurioù drein hepken.';
 $lang['Update photos information'] = 'Hizivaat titouroù al luc\'hskeudenn';
-$lang['Two updates are available'] = 'Daou hizivadur hergerzh';
+$lang['Two updates are available'] = 'Daou hizivadur hegerzh';
 $lang['Update All'] = 'Hizivaat pep tra';
 $lang['Update Complete'] = 'Echu eo an hizivadur';
 $lang['Update albums informations'] = 'Hizivaat titouroù ar rummadoù';
@@ -170,7 +170,7 @@ $lang['(this tag will be deleted)'] = '(ar merker-mañ a vo dilemet)';
 $lang['Delete this language'] = 'Dilemel ar yezh-mañ';
 $lang['Delete this theme'] = 'Dilemel an tem-mañ';
 $lang['Deleted on'] = 'Dilemet d\'an';
-$lang['%u users have automatic permission because they belong to a granted group.'] = 'implijerien %u o deus an aotre emgefreek peogwir int e-barzh ur strollad aotreet.';
+$lang['%u users have automatic permission because they belong to a granted group.'] = '%u implijer o deus an aotre emgefreek peogwir int e-barzh ur strollad aotreet.';
 $lang['(filtered from %s total users)'] = '(silet etre %s implijer en holl)';
 $lang['A locked gallery is only visible to administrators'] = 'Ur palier prennet a vez gwelet gant ar verourien hepken';
 $lang['A new version of Piwigo is available.'] = 'Ur stumm nevez Piwigo a zo hegerz';
@@ -330,7 +330,7 @@ $lang['Complementary mail content'] = 'Endalc\'h ar bostel evit klokaat';
 $lang['Confirm merge'] = 'Kadarnaat ar c\'hendeuzadur';
 $lang['Check for upgrade'] = 'Sell ma vez un hizivadur';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Ne oa ket posubl da sellet ma vez un hizivadur, ha n\'eo ket anavezet an abeg.';
-$lang['Check all'] = 'Gwiriañ pep tra';
+$lang['Check all'] = 'Diuzañ pep tra';
 $lang['Check automatic corrections'] = 'Gwiriañ ar reizhadurioù emgefreek';
 $lang['Check integrity'] = 'Gwiriadur an anterinded';
 $lang['Choose an option'] = 'Dibabit un dibarzh';
@@ -355,12 +355,12 @@ $lang['Default photos order'] = 'Urzh al luc\'hskeudennoù dre ziouer';
 $lang['Default user cannot be deleted'] = 'N\'haller ket dilemel an arveriad dre ziouer ';
 $lang['Default user does not exist'] = 'An arveriad dre ziouer n\'eus ket anezhañ';
 $lang['Delete Representant'] = 'Dilemel skeudennig ar rummad';
-$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'Skrammañ titouroù uc\'hek (rummadoù ha luc\'hskeudennoù ouzhpennet, uc\'hek (rummadoù ha luc\'hskeudennoù dilemet)';
-$lang['Include display of recent photos grouped by dates'] = 'Skrammañ al luc\'hskeudennoù nevez e strolladoù dre zeiziad';
+$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'Diskouez titouroù uc\'hek (rummadoù ha luc\'hskeudennoù ouzhpennet, uc\'hek (rummadoù ha luc\'hskeudennoù dilemet)';
+$lang['Include display of recent photos grouped by dates'] = 'Diskouez al luc\'hskeudennoù nevez e strolladoù dre zeiziad';
 $lang['Default display'] = 'Skrammañ dre ziouer';
-$lang['Display options'] = 'Dibarzhioù skrammañ';
+$lang['Display options'] = 'Diskouez an dibarzhioù';
 $lang['No display'] = 'Skrammadur ebet';
-$lang['display'] = 'Skrammañ';
+$lang['display'] = 'Diskouez';
 $lang['Link all album photos to some existing albums'] = 'Liammañ pep luc\'hskeudenn er rummad da rummadoù a zo anezho';
 $lang['Tag "%s" already exists'] = 'Bez ez eus ar merker "%s" anezhañ dija.';
 $lang['This site already exists'] = 'Bez ez eus al lec\'hienn anezhañ dija.';
@@ -462,4 +462,478 @@ $lang['Find a new representant by random'] = 'Kavout ur skeudennig dre zegouezh
 $lang['Optimizations have been completed with some errors.'] = 'Ar gwellekadurioù a zo bet graet gant fazioù.';
 $lang['an error happened'] = 'Ur fazi a zo c\'hoarvezet';
 $lang['errors during synchronization'] = 'Fazi e-pad ar sinkroneladur';
-$lang['File/directory read error'] = 'Fazi e-pad lenn ar restr/kavlec\'h';
\ No newline at end of file
+$lang['File/directory read error'] = 'Fazi e-pad lenn ar restr/kavlec\'h';
+$lang['Grant selected groups'] = 'Dereiñ ar strolladoù diuzet';
+$lang['Grant selected users'] = 'Dereiñ an implijerien diuzet';
+$lang['Permission granted'] = 'Aotre dereet';
+$lang['Permission granted for groups'] = 'Aotre dereet evit strolladoù';
+$lang['Permission granted for users'] = 'Aotre dereet evit implijerien';
+$lang['Permission granted thanks to a group'] = 'Aotre dereet dre ur strollad';
+$lang['Go to %s or %s for more informations'] = 'Mont da %s pe %s evit muioc\'h titouroù';
+$lang['Instructions to use Piwigo'] = 'Kemennoù evit implij Piwigo';
+$lang['Piwigo Uploader'] = 'Ezkarger Piwigo';
+$lang['Piwigo export plugin for Aperture'] = 'Lugant ezporzhiañ Piwigo evit Aperture';
+$lang['Piwigo export plugin for iPhoto'] = 'Lugant ezporzhiañ Piwigo evit iPhoto';
+$lang['Piwigo for Android'] = 'Piwigo evit Android';
+$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'Piwigo evit iOS (iPhone, iPad, iPod Touch)';
+$lang['Piwigo publish plugin for Shotwell'] = 'Lugant embann Piwigo evit Shotwell';
+$lang['Piwigo publish plugin for digiKam'] = 'Lugant embann Piwigo evit digiKam';
+$lang['The name of a group must not contain " or \' or be empty.'] = 'Arabat da anv ur strollad enderc\'hel " pe \', pe bezañ goullo.';
+$lang['The name of an album must not be empty'] = 'Arabat da anv ur rummad bezañ goullo';
+$lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = 'Ret eo da anv ar restroù enderc\'hel lizherennoù, niverennoù, "-", "_" pe "." hepken';
+$lang['The number of comments a page must be between 5 and 50 included.'] = 'An niver a evezhiadennoù a rank bezañ etre 5 ha 50 (e-barzh).';
+$lang['The original image quality must be a number between %d and %d'] = 'Perzhded orin al luc\'hskeudenn a rank bezañ un niver etre %d ha %d';
+$lang['You need to confirm deletion'] = 'Ret eo deoc\'h kadarnaat an dilamadur';
+$lang['height must be a number superior to'] = 'An uhelder a rank bezañ un niver brasoc\'h eget';
+$lang['width must be a number superior to'] = 'Al ledander a rank bezañ un niver brasoc\'h eget';
+$lang['The original maximum height must be a number between %d and %d'] = 'Uhelder uc\'hek orin a rank bezañ un niver etre %d ha %d';
+$lang['The original maximum width must be a number between %d and %d'] = 'Ledander uc\'hek orin a rank bezañ un niver etre %d ha %d';
+$lang['guest'] = 'ostiziad';
+$lang['Group name'] = 'Anv ar strollad';
+$lang['Groups'] = 'Strolladoù';
+$lang['Permission denied'] = 'Difennet';
+$lang['Manage Permissions'] = 'Merañ an aotreoù';
+$lang['Manage permissions for group "%s"'] = 'Merañ aotreoù ar strollad "%s"';
+$lang['Manage permissions for user "%s"'] = 'Merañ aotreoù an implijer "%s"';
+$lang['Permission management'] = 'Merañ an aotreoù';
+$lang['Permissions'] = 'Aotreoù';
+$lang['Group management'] = 'Merañ ar strolladoù';
+$lang['Hit'] = 'skor';
+$lang['Last hit'] = 'skor diwezhañ';
+$lang['Purge search history'] = 'Dilemel istor an enklaskoù';
+$lang['Searching...'] = 'Enklask…';
+$lang['Type in a search term'] = 'Lakait ger-alc\'hwez hor enklask';
+$lang['History'] = 'Roll-istor ';
+$lang['Purge history detail'] = 'Dilemel munudoù ar roll-istor';
+$lang['Help Me'] = 'Sikour';
+$lang['Hide'] = 'Kuzhat';
+$lang['hide details'] = 'kuzhat ar munudoù';
+$lang['High definition'] = 'HD (despizadur uhel)';
+$lang['High definition enabled'] = 'HD (despizadur uhel) gweredekaet';
+$lang['Maximum width'] = 'Ledander uc\'hek';
+$lang['Minimum width'] = 'Ledander izek';
+$lang['Width'] = 'Ledander';
+$lang['width & height'] = 'Ledander hag uhelder';
+$lang['Height'] = 'Uhelder';
+$lang['Maximum height'] = 'Uhelder uc\'hek';
+$lang['Minimum height'] = 'Uhelder izek';
+$lang['Guest cannot be deleted'] = 'Ne c\'hell ket an ostiziad bezañ dilemet';
+$lang['The following tag was deleted'] = 'Dilemet eo bet ar merker a-heul';
+$lang['delete'] = 'dilemel';
+$lang['delete photo'] = 'dilemel al luc\'hskeudenn';
+$lang['deleted'] = 'dilemet';
+$lang['Operating system'] = 'Reizhiad korvoiñ';
+$lang['Rating'] = 'Notennoù';
+$lang['Rating by guests'] = 'Notennoù roet gant ostiziaded';
+$lang['Guest Settings'] = 'Arventennoù an ostiziad';
+$lang['Parameter'] = 'Arventennoù';
+$lang['Save Settings'] = 'Enrollañ an arventennoù';
+$lang['Settings'] = 'Arventennoù';
+$lang['The settings for the guest are from the %s user'] = 'An arventennoù evit an ostiziad a teu eus implijer %s';
+$lang['Guests'] = 'Ostiziaded';
+$lang['Hello'] = 'Demat';
+$lang['Hello,'] = 'Demat,';
+$lang['Install'] = 'Staliañ';
+$lang['Install on your computer,'] = 'Staliañ war hoc\'h urzhiataer,';
+$lang['Installed Languages'] = 'Yezhoù staliet';
+$lang['Installed Themes'] = 'Temoù staliet';
+$lang['Uninstall'] = 'Distaliañ';
+$lang['Impossible to delete this theme. Other themes depends on it: %s'] = 'N\'haller ket gweredekaat an tem-se peogwir temoù-all a zo e dalc\'h anezhañ: %s';
+$lang['Impossible to activate this theme, the parent theme is missing: %s'] = 'N\'haller ket gweredekaat an tem-se peogwir e vank an tem-tad: %s';
+$lang['Impossible to deactivate the default theme.'] = 'N\'haller ket diweredekaat an tem dre ziouer.';
+$lang['Impossible to deactivate this language, you need at least one language.'] = 'N\'haller ket diweredekaat ar yezh-se, ur yezh ho po ezhom d\'an neubeutañ.';
+$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'N\'haller ket diweredekaat an tem-se, un tem ho po ezhom d\'an neubeutañ.';
+$lang['Hoverbox display'] = 'Diskwel boest-gournij';
+$lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'Lakaet ho peus <i>$conf[\'order_by\']</i> en ho restr kefluniadur lec\'hel, an arventenn-mañ a zo diamzeret, dilemit anezhañ pe cheñchit da <i>$conf[\'order_by_custom\']</i> !';
+$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Ne c\'hellit ket termenañ urzh al luc\'hskeudennoù dre ziouer peogwir ez eus arventennoù personelaet en ho kefluniadur lec\'hel.';
+$lang['Use the default photo sort order'] = 'Implij urzh rummañ al luc\'skeudennoù dre ziouer';
+$lang['default'] = 'dre ziouer';
+$lang['cancel manual order'] = 'Nullañ an urzh dornel';
+$lang['apply automatic sort order'] = 'Rummañ gant urzh emgefreek';
+$lang['automatic order'] = 'urzh emgefreek';
+$lang['Images manual order was saved'] = 'Urzh dornel al luc\'hskeudennoù a zo bet enrollet';
+$lang['Manage photo ranks'] = 'Urzh rummañ al luc\'hskeudennoù';
+$lang['Manual order'] = 'Urzh dornel';
+$lang['Save manual order'] = 'Enrollañ an urzh dornel';
+$lang['Save order'] = 'Enrollañ an urzh';
+$lang['manual order'] = 'urzh dornel';
+$lang['Image id'] = 'Anaouder al luc\'hskedenn';
+$lang['If you encounter problems or have any question, please send a message to'] = 'M\'ho peus kudennoù pe goulennoù, kasit ur c\'hemennad da';
+$lang['[NBM] Problems or questions'] = '[NBM] Kudennoù pe goulennoù';
+$lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'Ma n\'eus stumm HD (despizadur uhel) hegerzh ebet, ha ment a-vremañ a zo brasoc\'h eget hini admentet, Piwigo a zilec\'ho anezhañ evel HD hag a grouo ul luc\'hskeudenn bihan gantañ.';
+$lang['Image Quality'] = 'Perzhded al luc\'hskeudenn';
+$lang['Ignore All'] = 'Leuskel pep tra';
+$lang['Ignore selected anomalies'] = 'Leuskel direizhderioù diuzet';
+$lang['IP'] = 'IP';
+$lang['Order of menubar items has been updated successfully.'] = 'Urzh lañserioù er barrenn a zo bet hizivaet';
+$lang['Show menubar'] = 'Diskouez barrenn al lañserioù';
+$lang['I decide to update anyway'] = 'Divizet am eus da hizivaat evelkent';
+$lang['Hour'] = 'Eur';
+$lang['Learn more'] = 'Gouzout muioc\'h';
+$lang['Level 0'] = '---';
+$lang['Visit Piwigo project website'] = 'Gweladenniñ lec\'hienn raktres Piwigo';
+$lang['Visit language site'] = 'Gweladenniñ lec\'hienn ar yezh';
+$lang['Visit plugin site'] = 'Gweladenniñ lec\'hienn al lugant';
+$lang['Visit theme site'] = 'Gweladenniñ lec\'hienn an tem';
+$lang['Visited %d times'] = 'Gweladennet %d gwech';
+$lang['Last visit on %s, %s.'] = 'Gweladenn diwezhañ d\'ar %s, %s.';
+$lang['[%s] Visit album %s'] = '[%s] Gweladenn rummad %s';
+$lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Ur bevenn-amzer ez eus evit prientiñ roll ar posteloù da gas d\'an implijerien. An implijerien-all n\'int ket er roll.';
+$lang['Last send'] = 'An hini diwezhañ kaset';
+$lang['Mail sent to %s [%s].'] = 'Postel kaset da %s [%s].';
+$lang['No mail to send.'] = 'N\'eus postel ebet da gas.';
+$lang['Last revisions'] = 'Saveteadennoù diwezhañ';
+$lang['Last import'] = 'Enporzh diwezhañ';
+$lang['Languages'] = 'Yezhoù';
+$lang['Language has been successfully installed'] = 'Staliet mat eo bet ar yezh';
+$lang['Theme has been successfully installed'] = 'Staliet mat eo bet an tem';
+$lang['Uninstalled Plugins'] = 'Lugantoù distaliet';
+$lang['Landscape'] = 'Gweledva';
+$lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Chom e darempred gant raktres Piwigo, koumanantit al lizher-kelaouiñ Piwigo. Posteloù ho po pa vo ur stumm Piwigo nevez (a-wechoù gant reizhadur un draen surentez, e vez pouezhus gouzout diwar-benn un hizivadur) ha pa c\'hoarvez darvoudoù meur gant ar raktres. Un nebeud posteloù er boavezh hepken.';
+$lang['Invert'] = 'Eilpennañ';
+$lang['Metadata synchronized from file'] = 'Metaroadennoù sinkronelaet eus ar restr';
+$lang['Synchronize'] = 'Sinkronelaat';
+$lang['Synchronize metadata'] = 'Sinkronelaat ar metaroadennoù';
+$lang['photos informations synchronized with files metadata'] = 'titouroù al luc\'hskeudenn sinkronelaet gant metaroadenn ar restroù';
+$lang['Informations'] = 'Titour';
+$lang['Modify information'] = 'Cheñch titour';
+$lang['Information data registered in database'] = 'Bank titouroù enrollet en diaz roadennoù';
+$lang['albums added in the database'] = 'rummadoù lakaet en diaz roadennoù';
+$lang['photos added in the database'] = 'luc\'hskeudennoù lakaet en diaz roadennoù';
+$lang['photos deleted from the database'] = 'luc\'hskeudennoù dilemet en diaz roadennoù';
+$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Endelc\'her ar roll-istor (diwallit: memor ar servijer a c\'hellfe bezañ dic\'hlannet)';
+$lang['Save visits in history for'] = 'Enrollañ gweladennoù en istor evit';
+$lang['Purge history summary'] = 'Dilemel diverradenn ar roll-istor';
+$lang['Inactive Themes'] = 'Temoù anoberiek';
+$lang['Inactive Plugins'] = 'Lugantoù anoberiek';
+$lang['Inactive Languages'] = 'Yezhoù anoberiek';
+$lang['Make this language available to users'] = 'Lakaat ar yezh-se e kerz an implijerien';
+$lang['Make this theme available to users'] = 'Lakaat an tem-se e kerz an implijerien';
+$lang['Maintenance'] = 'Kas en-dro';
+$lang['Mail content'] = 'Endalc\'had ar bostel';
+$lang['Mail theme'] = 'Tem ar bostel';
+$lang['Main Page'] = 'Penn-bajenn';
+$lang['Mail address is mandatory for registration'] = 'Ret eo lakaat ur bostel evit en em enrollañ';
+$lang['Registered on %s, %s.'] = 'Enrollet d\'ar %s, %s.';
+$lang['registered users'] = 'Implijerien enrollet';
+$lang['registration date'] = 'deiziat enrollañ';
+$lang['Lock'] = 'Prennañ';
+$lang['Lock albums'] = 'Prennañ ar rummadoù';
+$lang['Locked'] = 'Prennet';
+$lang['Linked albums'] = 'Rummadoù liammet';
+$lang['List'] = 'Listenn';
+$lang['Loading...'] = 'O kargañ';
+$lang['Local'] = 'Lec\'hel';
+$lang['Represents'] = 'a zo skeudennig evit';
+$lang['Thumbnail'] = 'Skeudennig';
+$lang['Representant'] = 'Skeudennig ar rummad';
+$lang['Representation of albums'] = 'Skeudennig ar rummad';
+$lang['Representative'] = 'Skeudennig ar rummad';
+$lang['randomly represented'] = 'Skeudennig ar rummad dargouezhek';
+$lang['singly represented'] = 'Skeudennig ar rummad ratreet';
+$lang['This album contains %d photos, added on %s.'] = '%d luc\'hskeudenn ez eus er rummad-mañ, lakaet d\'ar %s.';
+$lang['This album contains no photo.'] = 'N\'eus luc\'hskeudenn ebet er rummad-se';
+$lang['You cannot move an album in its own sub album'] = 'N\'eo ket posubl lakaat ur rummad en e iz-rummad';
+$lang['Link all album photos to a new album'] = 'Liammañ pep luc\'hskeudenn er rummad d\'ur rummad nevez';
+$lang['Level 2'] = 'Mignoned';
+$lang['Level 4'] = 'Familh';
+$lang['Level 8'] = 'Merourien';
+$lang['Level 1'] = 'Darempredoù';
+$lang['Edit user'] = 'Aozañ implijer';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'E pep postel kaset e vo un alc\'hwezh dilesa emgefreek en ul liamm,  talvoudek evit %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Evit abegoù surentez, ne za ket en-dro an alc\'hwezhioù dilesa evit ar merourien.';
+$lang['Delete %d orphan photos'] = 'Dilemel %d luc\'hskeudenn emzivat';
+$lang['Orphan tags deleted'] = 'Merkerioù emzivat dilemet';
+$lang['Orphans'] = 'Emzivaded';
+$lang['You have %d orphan tags: %s.'] = '%d merkerioù emzivat ho peus : %s.';
+$lang['Menu Management'] = 'Lañserioù';
+$lang['Original Size'] = 'Ment orin';
+$lang['Original file : %s'] = 'Restr orin : %s';
+$lang['Maximum file size: %sB.'] = 'ment uc\'hek ar rest: %sB.';
+$lang['Manage authorizations for selected albums'] = 'Merañ aotreoù ar rummadoù diuzet';
+$lang['Manage photos'] = 'Merañ al luc\'hskeudennoù';
+$lang['Manage tags'] = 'Merañ ar merkerioù';
+$lang['Manage this set of %d photos'] = 'Merañ an %d luc\'hskeudenn-se';
+$lang['manage album photos'] = 'Merañ luc\'hskeudennoù ar rummad';
+$lang['manage sub-albums'] = 'Merañ an iz-rummadoù';
+$lang['Manage the members'] = 'Merañ an izili';
+$lang['Members'] = 'Izili';
+$lang['No members to manage'] = 'Ezel ebet da verañ';
+$lang['Manage'] = 'Merañ';
+$lang['Photo %s of %s'] = 'Luc\'hskeudenn %s etre %s';
+$lang['wrong filename'] = 'anv-restr diwiriek';
+$lang['Month'] = 'Miz';
+$lang['Name'] = 'Anv';
+$lang['New name'] = 'Anv nevez';
+$lang['New tag'] = 'Merker nevez';
+$lang['New parent album'] = 'Rummad-vamm nevez';
+$lang['Parent album'] = 'Rummad-vamm';
+$lang['User %s [%s] added.'] = 'Implijer %s [%s] ouzhpennet.';
+$lang['New photos added'] = 'Luc\'hskeudennoù nevez ouzhpennet';
+$lang['New photos were added'] = 'Luc\'hskeudennoù nevez a zo bet ouzhpennet';
+$lang['Tag "%s" was added'] = 'Ar merker "%s" a zo bet ouzhpennet';
+$lang['User %s added'] = 'Implijer %s ouzhpennet';
+$lang['group "%s" added'] = 'strollad "%s" ouzhpennet';
+$lang['added'] = 'lakaet ouzhpenn';
+$lang['first photo added on %s'] = 'luc\'hskeudenn kentañ ouzhpennet d\'ar %s';
+$lang['user "%s" added'] = 'implijer "%s" ouzhpennet';
+$lang['Name of the duplicate'] = 'Anv an eilad';
+$lang['Tag "%s" is now a duplicate of "%s"'] = 'Merker "%s" a zo bremañ un eilad eus "%s"';
+$lang['Move'] = 'Dilec\'hiañ';
+$lang['Move albums'] = 'Dilec\'hiañ ar rummadoù';
+$lang['Move to album'] = 'Dilec\'hiañ d\'ar rummad';
+$lang['Remove all filters'] = 'Tennañ an holl siloù';
+$lang['remove author'] = 'tennañ an oberour';
+$lang['remove tags'] = 'tennañ ar merkerioù';
+$lang['remove this filter'] = 'tennañ ar sil-se';
+$lang['remove title'] = 'tennañ an titl';
+$lang['User "%s" created with "%s" like password'] = 'Implijer "%s" krouet gant ar ger-tremen "%s"';
+$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Kadarnaat ar ger-tremen a vank. Kadarnait ar ger-tremen dibabet.';
+$lang['Password is missing. Please enter the password.'] = 'Ar ger-tremen a vank. Lakait ar ger-tremen.';
+$lang['Missing Plugins'] = 'Lugantoù a vank';
+$lang['Miscellaneous'] = 'Liesseurt';
+$lang['Minimum privacy level'] = 'Live prevezded bihanañ';
+$lang['Privacy level'] = 'Live prevezded';
+$lang['Privacy level set to "%s"'] = 'Live prevezded lakaet da "%s"';
+$lang['include photos with lower privacy level'] = 'endelc\'her luc\'hskeudennoù gant ul live prevezded bihanoc\'h';
+$lang['Metadata synchronization results'] = 'Disoc\'hoù sinkroneladur ar metaroadennoù';
+$lang['Used metadata'] = 'Metaroadennoù implijet';
+$lang['photos candidates for metadata synchronization'] = 'Luc\'hskeudennoù war ar renk evit sinkronelaat ho metaroadennoù';
+$lang['synchronize files metadata with database photos informations'] = 'Sinkronelaat luc\'hskeudennoù an diaz roadennoù gant metaroadennoù ar restroù';
+$lang['Merge selected groups'] = 'Kendeuziñ ar strolladoù diuzet';
+$lang['Merge selected tags'] = 'Kendeuziñ ar merkerioù diuzet';
+$lang['Merge tags'] = 'Kendeuziñ ar merkerioù';
+$lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = 'Merkerioù <em>%s</em> kendeuzet d\'ar merker <em>%s</em>';
+$lang['No user to send notifications by mail.'] = 'Implijer ebet da gemenn gant ur bostel';
+$lang['There is no available subscribers to mail.'] = 'Den ebet da gemenn gant ur bostel';
+$lang['Notification'] = 'Kemenn';
+$lang['No user selected of %d users'] = 'Impljer ebet diuzet, etre %d implijer';
+$lang['No results'] = 'Disoc\'h ebet';
+$lang['User'] = 'Implijer';
+$lang['Users'] = 'Implijerien';
+$lang['The whole page'] = 'Ar bajenn a-bezh';
+$lang['Themes'] = 'Temoù';
+$lang['Title'] = 'Titl';
+$lang['No recipient selected'] = 'Resever ebet diuzet';
+$lang['Recipients'] = 'Reseverien';
+$lang['Select recipients'] = 'Diuzañ ar reseverien';
+$lang['No photo in this album'] = 'Luc\'hskeudenn ebet er rummad-se';
+$lang['No photo in the current set.'] = 'Luc\'hskeudenn ebet er stroll a-vremañ';
+$lang['No photo selected, %d photos in current set'] = 'Luc\'hskeudenn ebet diuzet, %d luc\'hskeudenn er stroll a-vremañ';
+$lang['The whole set'] = 'Ar stroll a-bezh';
+$lang['No photo can be deleted'] = 'Ne c\'hell luc\'hskeudenn ebet bezañ dilemet';
+$lang['No order field selected'] = 'Maezienn urzh ebet diuzet';
+$lang['No matching user found'] = 'Ne glot implijer ebet';
+$lang['No group is permitted to see this private album'] = 'Ne c\'hell strollad ebet gwelet ar rummad prevez-se.';
+$lang['No user is permitted to see this private album'] = 'Ne c\'hell implijer ebet gwelet ar rummad prevez-se.';
+$lang['No file was uploaded'] = 'Restr ebet pellkarget';
+$lang['Upload in progress'] = 'Oc\'h ezkargañ';
+$lang['No group selected, no action possible.'] = 'Strollad ebet diuzet, obererezh ebet d\'ober.';
+$lang['No photo selected, no action possible.'] = 'Luc\'hskeudenn ebet diuzet, obererezh ebet d\'ober.';
+$lang['No user selected, no action possible.'] = 'Implijer ebet diuzet, obererezh ebet d\'ober.';
+$lang['No destination tag selected'] = 'Merker pal ebet diuzet';
+$lang['No and unlock sub-albums'] = 'Ket ha dibrennañ iz-rummadoù';
+$lang['Unlocked'] = 'Dibrennet';
+$lang['There is no other language available.'] = 'N\'eus yezh-all ebet hegerz';
+$lang['There is no other plugin available.'] = 'N\'eus lugant-all ebet hegerz';
+$lang['There is no other theme available.'] = 'N\'eus tem-all ebet hegerz';
+$lang['Other plugins'] = 'Lugantoù all hegerz';
+$lang['Some themes and plugins may be not available yet.'] = 'Temoù pe lugantoù a c\'hell bezañ dihegerz evit poent';
+$lang['Options'] = 'Dibarzhioù';
+$lang['Optional URL keyword'] = 'Ger-alc\'hwez an URL war zibab';
+$lang['Operation in progress'] = 'Treterezh war-ober';
+$lang['Open user details'] = 'Digeriñ titouroù an implijer';
+$lang['show details'] = 'diskouez ar munudoù';
+$lang['Opacity'] = 'Divoullder';
+$lang['Public'] = 'Foran';
+$lang['Public / Private'] = 'Foran / Prevez';
+$lang['public'] = 'foran';
+$lang['Only private albums are listed'] = 'Ar rummadoù prevez a zo el listenn hepken';
+$lang['Other private albums'] = 'Rummadoù prevez hepken';
+$lang['Private'] = 'Prevez';
+$lang['private'] = 'prevez';
+$lang['Piwigo Publish plugin for Lightroom'] = 'Lugant embann Piwigo evit Lightroom';
+$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'Gant lugant embann Piwigo, e c\'hellit ezporzhiañ ha sinkronaat luc\'hskeudennoù war-eeun eus Lightroom d\'ho palier Piwigo.';
+$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'War ho Linux, staliañ Shotwell gant ar merour-pakadoù, ha gweredekaat dibarzh embann Piwigo.';
+$lang['Obsolete Plugins'] = 'Lugantoù diamzer';
+$lang['Numeric identifier : %d'] = 'Niverenn-anaout : %d';
+$lang['Select at least two tags for merging'] = 'Evit kendeuziñ, diuzit daou merker d\'an neubeutañ';
+$lang['Please select at least two groups'] = 'Diuzit daou strollad d\'an neubeutañ';
+$lang['Select at least one album'] = 'Diuzit ur rummad d\'an neubeutañ';
+$lang['Select at least one comment'] = 'Diuzit un evezhiadenn d\'an neubeutañ';
+$lang['Select at least one photo'] = 'Diuzit ul luc\'hskeudenn d\'an neubeutañ';
+$lang['Select at least one tag'] = 'Diuzit ur merker d\'an neubeutañ';
+$lang['Select at least one user'] = 'Diuzit un implijer d\'an neubeutañ';
+$lang['Number of comments per page'] = 'Niver a evezhiadenn war pep pajenn';
+$lang['Number of albums per page'] = 'Niver a rummad war pep pajenn';
+$lang['None'] = 'Hini ebet';
+$lang['Preferences'] = 'Dibaboù';
+$lang['Position'] = 'Lec\'hiadur';
+$lang['X Position'] = 'Lec\'hiadur X';
+$lang['Y Position'] = 'Lec\'hiadur Y';
+$lang['Portrait'] = 'Poltred';
+$lang['Plugins'] = 'Lugantoù';
+$lang['Photo unreachable or no support'] = 'N\'eus ket tu diraez al luc\'hskeudenn, pe n\'eo ket embreget he furmad';
+$lang['Piwigo Administration'] = 'Mererezh Piwigo';
+$lang['Switch to clear or dark colors for administration'] = 'Cheñch livioù ar mererezh evit sklaer pe teñval';
+$lang['administrators'] = 'merourien';
+$lang['user_status_admin'] = 'Merour';
+$lang['Photo name'] = 'Anv al luc\'hskeudenn';
+$lang['Photos'] = 'Luc\'hskeudennoù';
+$lang['Photo Properties'] = 'Perzhioù al luc\'hskeudenn';
+$lang['Properties'] = 'Perzhioù';
+$lang['Toggle \'default group\' property'] = 'Cheñch perzh \'strollad dre ziouer\'';
+$lang['Photo Page'] = 'Pajenn al luc\'hskeudenn';
+$lang['Path'] = 'Hent moned';
+$lang['Parameters'] = 'Arventennoù';
+$lang['Panorama'] = 'Gwel meur';
+$lang['Pages seen'] = 'Pajennoù gwelet';
+$lang['Page end'] = 'Dibenn ar bajenn';
+$lang['Overall'] = 'Gwel a-vras';
+$lang['Page banner'] = 'Banniel ar bajenn';
+$lang['top left corner'] = 'Korn an uhelañ a gleiz';
+$lang['top right corner'] = 'Korn an uhelañ a-zehoù';
+$lang['user_status_generic'] = 'Generek';
+$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'Ar mestr-gwiad en deus koumanantet ac\'hanoc\'h da kemennoù dre bosteloù.';
+$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Ar mestr-gwiad en deus digoumanantet ac\'hanoc\'h eus kemennoù dre bosteloù.';
+$lang['Warning: subscribing or unsubscribing will send mails to users'] = 'Diwallit: koumanantiñ pe digoumanantiñ a gaso postelloù d\'an implijerien';
+$lang['Subscribe to notification by mail'] = 'Koumanantiñ da kemennoù dre bosteloù.';
+$lang['Unsubscribe from notification by mail'] = 'Digoumanantiñ eus kemennoù dre bosteloù.';
+$lang['User %s [%s] was added to the subscription list.'] = 'Implijer %s [%s] lakaet e listenn ar c\'houmananterien.';
+$lang['User %s [%s] was not added to the subscription list.'] = 'Ne oa ket lakaet implijer %s [%s] e listenn ar c\'houmananterien.';
+$lang['User %s [%s] was not removed from the subscription list.'] = 'Ne oa ket tennet implijer %s [%s] eus listenn ar c\'houmananterien.';
+$lang['User %s [%s] was removed from the subscription list.'] = 'Implijer %s [%s] tennet eus listenn ar c\'houmananterien.';
+$lang['You have subscribed to receiving notifications by mail.'] = 'Koumanantet ho peus da kemennoù dre bosteloù.';
+$lang['You have unsubscribed from receiving notifications by mail.'] = 'Digoumanantet ho peus eus kemennoù dre bosteloù.';
+$lang['To unsubscribe'] = 'Digoumanantiñ';
+$lang['Subscribe'] = 'Koumanantiñ';
+$lang['Subscribe %s'] = 'Koumanantiñ %s';
+$lang['Subscribe/unsubscribe users'] = 'Koumanantiñ/digoumanantiñ implijerien';
+$lang['Subscribed'] = 'Koumanantet';
+$lang['Unsubscribed'] = 'Digoumanantet';
+$lang['Plugin list'] = 'Listenn al lugantoù';
+$lang['User list'] = 'Listenn an implijerien';
+$lang['Piwigo configuration'] = 'Kefluniadur Piwigo';
+$lang['Restore default configuration. You will lose your plugin settings!'] = 'Adsevel ar c\'hefluniadur dre ziouer. Kollet \'vo arventennoù ho lugantoù!';
+$lang['Your configuration settings are saved'] = 'Saveteet eo bet arventennoù ho c\'hefluniadur';
+$lang['Please wait...'] = 'Gortozit mar plij...';
+$lang['Piwigo Announcements Newsletter'] = 'Lizher-kelaouiñ Piwigo';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Koumanantiñ %s al lizher-kelaouiñ Piwigo';
+$lang['Send'] = 'Kas';
+$lang['Tools'] = 'Ostilhoù';
+$lang['and'] = 'ha';
+$lang['between'] = 'etre';
+$lang['Year'] = 'Bloaz';
+$lang['all'] = 'holl';
+$lang['close'] = 'serriñ';
+$lang['jump to photo'] = 'mont da luc\'hskeudenn';
+$lang['new'] = 'nevez';
+$lang['nothing'] = 'netra';
+$lang['other'] = 'all';
+$lang['photos per page'] = 'luc\'hskeudenn er bajenn';
+$lang['Rename'] = 'Cheñch anv';
+$lang['Purge never used notification feeds'] = 'Skarzhañ ar c\'hemennoù n\'int ket bet implijet';
+$lang['Purge sessions'] = 'Skarzhañ an dalc\'hoù';
+$lang['Purge user cache'] = 'Skarzhañ krubuilh an implijer';
+$lang['See you soon,'] = 'Ken ar c\'hentañ,';
+$lang['Random photo'] = 'Luc\'hskeudenn dre zegouezh';
+$lang['Refresh photo set'] = 'Freskaat ar stroll luc\'hskeudennoù';
+$lang['Refresh'] = 'Freskaat';
+$lang['Posted %s on %s'] = 'Postet %s war %s';
+$lang['Reinitialize check integrity'] = 'Adderaouekaat gwiriadur an anterinded';
+$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Sellit ouzh aotreoù kavlec\'h al lugantoù, hag e iskavlec\'hioù (CHMOD).';
+$lang['Uncheck all'] = 'Gwiriañ pep tra';
+$lang['You are running on development sources, no check possible.'] = 'Diziuzañ pep tra';
+$lang['any visitor can see this album'] = 'Pep gweladenner a c\'hell gwelet ar rummad-mañ';
+$lang['simple visitors'] = 'Gweladennerien plaen';
+$lang['visitors need to login and have the appropriate permissions to see this album'] = 'Ar gweladennerien a rank kaout an aotreoù azas evit gwelet ar rummad-mañ';
+$lang['Plugin has been successfully copied'] = 'Eilet mat eo bet al lugant';
+$lang['Piwigo cannot retrieve upgrade file from server'] = 'Ne c\'hell ket Piwigo delec\'hiañ ar restr hizivaat war ar servijer';
+$lang['Select a zone with your mouse to define a new center of interest.'] = 'Diuzit un takad gant al logodenn evit spisaat an darn talvoudus nevez.';
+$lang['The center of interest is the most meaningful zone in the photo.'] = 'An darn talvoudus a zo an takad ar pouezusañ el luc\'hskeudenn.';
+$lang['Select users...'] = 'Diuzit implijerien...';
+$lang['Select a file'] = 'Diuzit ur restr';
+$lang['Select an album'] = 'Diuzit ur rummad';
+$lang['Select files'] = 'Diuzit restroù';
+$lang['Select groups...'] = 'Diuzit strolladoù...';
+$lang['Select:'] = 'Diuzañ:';
+$lang['Selection'] = 'Diuz';
+$lang['Tag selection'] = 'Diuz merkerioù';
+$lang['on the %d selected photos'] = 'war an %d luc\'hskeudenn diuzet';
+$lang['on the %d selected users'] = 'war an %d implijer diuzet';
+$lang['selection'] = 'diuz';
+$lang['Restore'] = 'Adsevel';
+$lang['See you soon.'] = 'Ken ar c\'hentañ.';
+$lang['ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform.'] = 'ReGalAndroid (arval RemoteGallery evit Android) a zo arval Piwigo evit savenn Android, e kod mammennoù a zo digor (GPL v3).';
+$lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwell a zo un dibaber luc\'hskeudennoù, e kod mammennoù a zo digor, mont a ra en-dro war Linux. An dibaber dre ziouer eo e Ubuntu ha Fedora.';
+$lang['Webmaster status is required.'] = 'Ret eo kaout statud ar mestr-gwiad.';
+$lang['Status'] = 'Statud';
+$lang['User status'] = 'Statud an implijer';
+$lang['status'] = 'statud';
+$lang['Show %s users'] = 'Diskouez %s implijer';
+$lang['Show info'] = 'Diskouez an titouroù';
+$lang['Showing %s to %s of %s users'] = 'O-tiskouez %s betek %s etre %s implijer';
+$lang['Remote'] = 'A-bell';
+$lang['Set as default language for unregistered and new users'] = 'Lakaat evel ar yezh dre ziouer evit ar re n\'int ket enrollet, hag an implijerien nevez';
+$lang['Set as default theme for unregistered and new users'] = 'Lakaat evel an tem dre ziouer evit ar re n\'int ket enrollet, hag an implijerien nevez';
+$lang['Set author'] = 'Lakaat an oberour';
+$lang['Set creation date'] = 'Lakaat an deiziad krouidigezh';
+$lang['Set title'] = 'Lakaat an titl';
+$lang['set to'] = 'lakaat da';
+$lang['unset'] = 'dilemel';
+$lang['Send connection settings by email'] = 'Kas an arventennoù kevreañ dre bostel';
+$lang['Send mail on HTML format'] = 'Kas ar bostel e furmad HTML';
+$lang['Send mail to users'] = 'Kas ur bostel d\'an implijerien';
+$lang['To send ?'] = 'Da gas ?';
+$lang['Read Piwigo Documentation'] = 'Lennit teuliadur Piwigo';
+$lang['Send mail as'] = 'Kas ar bostel evel';
+$lang['Quick Local Synchronization'] = 'Sinkroneladur lec\'hel prim';
+$lang['even already synchronized photos'] = 'memes al luc\'hskeudennoù sinkronelaet';
+$lang['synchronize files structure with database'] = 'Sinkronelaat framm ar restroù gant an diaz roadennoù';
+$lang['Predefined filter'] = 'Sil raktermenet';
+$lang['custom'] = 'Personelaet';
+$lang['Waiting'] = 'O c\'hortoz';
+$lang['Time'] = 'Eur';
+$lang['With no album'] = 'Hep rummad';
+$lang['With no tag'] = 'Hep merker';
+$lang['The %d following tags were deleted'] = 'An %d merkerioù-se a zo bet dilemet';
+$lang['albums deleted in the database'] = 'rummad dilemet en diaz roadennoù';
+$lang['delete album'] = 'dilemel ar rummad';
+$lang['group "%s" deleted'] = 'dilemet strollad "%s"';
+$lang['high'] = 'uhel';
+$lang['leave'] = 'kuitaat';
+$lang['middle'] = 'kreiz';
+$lang['modified'] = 'cheñchet';
+$lang['none'] = 'netra';
+$lang['unknown'] = 'dianav';
+$lang['pixels'] = 'pikselioù';
+$lang['ranks'] = 'renkoù';
+$lang['sub-albums'] = 'iz-rummadoù';
+$lang['target'] = 'bukenn';
+$lang['test'] = 'test';
+$lang['the forum'] = 'ar forom';
+$lang['the wiki'] = 'ar wiki';
+$lang['total time'] = 'pad hollek';
+$lang['Type here the author name'] = 'Lakait anv an oberour amañ';
+$lang['Type here the name of the new group'] = 'Lakait anv ar strollad nevez amañ';
+$lang['Type here the title'] = 'Lakait an titl amañ';
+$lang['bottom left corner'] = 'Korn an izelañ a gleiz';
+$lang['bottom right corner'] = 'Korn an izelañ a-zehoù';
+$lang['Week starts on'] = 'Ar sizhun a krog d\'';
+$lang['Who can see these photos?'] = 'Piv a c\'hell gwelet al luc\'hskeudennoù-mañ ?';
+$lang['Who can see this photo?'] = 'Piv a c\'hell gwelet al luc\'hskeudenn-mañ ?';
+$lang['X Repeat'] = 'Adober X';
+$lang['Y Repeat'] = 'Adober Y';
+$lang['Zoom'] = 'Zoum';
+$lang['reduce to single existing albums'] = 'bihanaat da rummadoù a zo unan hepken anezho';
+$lang['include child albums'] = 'endelc\'hel rummadoù-bugale';
+$lang['create a new album'] = 'krouiñ ur rummad nevez';
+$lang['Storage album'] = 'Rummad-klenkañ';
+$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'Gant al lugant ezporzhiañ Piwigo e vo tu deoc\'h krouiñ rummadoù hag ezporzhiañ luc\'hskeudennoù.';
+$lang['jump to album'] = 'Mont d\'ar rummad';
+$lang['This album contains %d photos, added between %s and %s.'] = '%d luc\'hskeudenn ez eus er rummad-mañ, lakaet etre %s hag %s.';
+$lang['Support'] = 'Skor';
+$lang['Simulation'] = 'Darvanerezh';
+$lang['Statistics'] = 'Stadegoù';
+$lang['Repair and optimize database'] = 'Ratreañ ha gwellekaat an diaz roadennoù';
+$lang['Ratio'] = 'Parenn an neuz';
\ No newline at end of file
diff --git a/sources/language/br_FR/common.lang.php b/sources/language/br_FR/common.lang.php
index e6a547a..7b2d19d 100644
--- a/sources/language/br_FR/common.lang.php
+++ b/sources/language/br_FR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Brezhoneg [FR]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=698
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -223,7 +223,7 @@ $lang['Keyword'] = 'Ger alc\'hwez ';
 $lang['Password'] = 'Ger-tremen';
 $lang['Menu'] = 'Lañser';
 $lang['Most visited'] = 'Muiañ-gwelet';
-$lang['New on %s'] = 'Nevez d\'an %s';
+$lang['New on %s'] = 'Nevez d\'%s';
 $lang['Next'] = 'Da-heul';
 $lang['Logout'] = 'Digevreañ';
 $lang['Login'] = 'Kevreañ';
@@ -424,4 +424,24 @@ $lang['Photo description'] = 'Deskrivadur al luc\'hskeudenn';
 $lang['Photo title'] = 'Titl al luc\'hskeudenn';
 $lang['Album name, A &rarr; Z'] = 'Anv ar rummad, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Anv ar rummad, Z &rarr; A';
-$lang['Link: %s'] = 'Liamm: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Liamm: %s';
+$lang['month']['12'] = 'a viz Kerzu';
+$lang['month']['11'] = 'a viz Du';
+$lang['month']['10'] = 'a viz Here';
+$lang['month']['9'] = 'a viz Gwengolo';
+$lang['month']['8'] = 'a viz Eost';
+$lang['month']['7'] = 'a viz Gouere';
+$lang['month']['6'] = 'a viz Even';
+$lang['month']['5'] = 'a viz Mae';
+$lang['month']['4'] = 'a viz Ebrel';
+$lang['month']['2'] = 'a viz C\'hwevrer';
+$lang['month']['1'] = 'a viz Genver';
+$lang['day']['0'] = 'ar Sul';
+$lang['day']['6'] = 'ar Sadorn';
+$lang['day']['5'] = 'ar Gwener';
+$lang['day']['4'] = 'ar Yaou';
+$lang['day']['3'] = 'ar Merc\'her';
+$lang['day']['2'] = 'ar Meurzh';
+$lang['month']['3'] = 'a viz Meurzh';
+$lang['day']['1'] = 'al Lun';
+$lang['Your authentication key is no longer valid.'] = 'N\'eo ket gwiriek ken hoc\'h alc\'hwez dilesadur';
\ No newline at end of file
diff --git a/sources/language/br_FR/install.lang.php b/sources/language/br_FR/install.lang.php
index 81eac2c..3853158 100755
--- a/sources/language/br_FR/install.lang.php
+++ b/sources/language/br_FR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Posubl eo deoc\'h cheñch ho-unan kefluniadur PHP, ha adloc\'hañ Piwigo da c\'houde.';
 $lang['Download the config file'] = 'Pellgargañ ar restr gefluniañ';
-$lang['Try to configure PHP 5'] = 'Esaeit kefluniañ PHP 5';
+$lang['Try to configure PHP 5'] = 'Esaeit kefluniañ PHP 5.2';
 $lang['Basic configuration'] = 'Kefluniadur diazez';
 $lang['Database configuration'] = 'Kefluniadur an diaz roadennoù';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Un diskoulm all a zo eilañ an destenn eus boest a-us ha pegañ anezhañ da restr "local/config/database.inc.php" (Diwallit: ret eo lakaat e-barzh database.inc.php ar pezh a zo er framm-testenn, distro d\'al linenn ebet, hag arouezenn esaouiñ ebet)';
@@ -34,15 +34,15 @@ $lang['User'] = 'Implijer';
 $lang['please enter your password again'] = 'Lakait ho ger-tremen adarre';
 $lang['user password given by your host provider'] = 'ger-tremen roet gant ho pourvezer ostiz';
 $lang['Password ']['confirm'] = 'Ger-tremen [evit kadarnaat]';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'eo ket deuet a-benn da gefluniañ PHP 5.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo a c\'hell cheñch ho kefluniadur da PHP 5 en ur grouiñ pe kemmañ ur restr .htaccess.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'eo ket deuet a-benn da gefluniañ PHP 5.2';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo a c\'hell cheñch ho kefluniadur da PHP 5.2 en ur grouiñ pe kemmañ ur restr .htaccess.';
 $lang['Creation of config file local/config/database.inc.php failed.'] = 'C\'hwitet eo krouadur ar restr gefluniañ local/config/database.inc.php.';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Posubl eo deoc\'h pellgargañ ar restr gefluniañ, hag ezkargañ anezhañ da kavlec\'h local/config ho staliadur.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gourc\'hemennoù, echu eo staliadur Piwigo';
 $lang['Installation'] = 'Staliadur';
 $lang['Start Install'] = 'Kregiñ gant ar staliadur';
 $lang['Welcome to your new installation of Piwigo!'] = 'Degemer mat en ho staliadur nevez Piwigo !';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Goulennit da skor ho pourvezer ostiz penaos e c\'hellit implij PHP 5.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Goulennit da skor ho pourvezer ostiz penaos e c\'hellit implij PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = 'PHP %s a zo o labourat war hoc\'h ostiz.';
 $lang['localhost or other, supplied by your host provider'] = 'localhost pe anv all, roet gant ho pourvezer ostiz';
 $lang['also given by your host provider'] = 'roet gant ho pourvezer ostiz ivez';
@@ -52,7 +52,7 @@ $lang['Can\'t connect to server'] = 'Ne oa ket posubl kevreañ ouzh ar servijer'
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Sikour ho peus ezhom? Savit ho goulennoù war <a href="%s">Forom Piwigo</a>.';
 $lang['verification'] = 'gwiriadur';
 $lang['Sorry!'] = 'Digarezit !';
-$lang['PHP 5 is required'] = 'Ret eo kaout PHP 5';
+$lang['PHP 5 is required'] = 'Ret eo kaout PHP 5.2';
 $lang['Just another Piwigo gallery'] = 'Ur palier-luc\'hskeudennoù Piwigo all';
 $lang['Hope to see you back soon.'] = 'Ken ar wech all !';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Lennit hor foromoù evit kaout sikour: %s';
@@ -63,5 +63,4 @@ $lang['Welcome to my photo gallery'] = 'Degemer mat war ma palier-luc\'hskeudenn
 $lang['Database table prefix'] = 'Rakger taolennoù an diaz roadennoù';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'Ar rakger-mañ a vo ouzhpennet da anvioù taolennoù an diaz roadennoù (Gwelloc\'h e vo mererezh ho taolennoù)';
 $lang['Database name'] = 'Anv an diaz roadennoù';
-$lang['Connection to server succeed, but it was impossible to connect to database'] = 'Kevreet mat ouzh ar servijer omp, met ne oa ket posubl kevreañ ouzh an diaz roadennoù.';
-?>
\ No newline at end of file
+$lang['Connection to server succeed, but it was impossible to connect to database'] = 'Kevreet mat ouzh ar servijer omp, met ne oa ket posubl kevreañ ouzh an diaz roadennoù.';
\ No newline at end of file
diff --git a/sources/language/br_FR/upgrade.lang.php b/sources/language/br_FR/upgrade.lang.php
index 6d32e78..0ca6f5c 100755
--- a/sources/language/br_FR/upgrade.lang.php
+++ b/sources/language/br_FR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ca_ES/admin.lang.php b/sources/language/ca_ES/admin.lang.php
index 55335f7..0561d93 100644
--- a/sources/language/ca_ES/admin.lang.php
+++ b/sources/language/ca_ES/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -650,7 +650,7 @@ $lang['Error on file "%s" : %s'] = 'Error a l\'arxiu "%s": %s';
 $lang['automatic order'] = 'Ordre automàtic';
 $lang['manual order'] = 'ordre manual';
 $lang['Albums automatically sorted'] = 'Àlbums ordenats automàticament';
-$lang['Batch Manager'] = 'Gestor per lots';
+$lang['Batch Manager'] = 'Gestor de pocessamet per lots';
 $lang['include child albums'] = 'incloure els sub-àlbums';
 $lang['Selection'] = 'Selecció';
 $lang['Action'] = 'Acció';
@@ -771,7 +771,7 @@ $lang['Select an album'] = 'Seleccioneu un àlbum';
 $lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'Per defecte, Piwigo crearà una nova mida per a la web a partir de les vostres fotos en versió HD (high definition) ';
 $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'Si no està disponible en alta definició i la mida actual es més gran que les dimensions del canvi de mida, es considerarà \'alta definició\' (HD) tot i què finalment caldrà reduir la mida de la imatge.';
 $lang['An error has occured during upgrade.'] = 'S\'ha produït un error durant el procés d\'actualització.';
-$lang['An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'] = 'S\'ha produït un error mentre l\'extracció. Reviseu els permisos dels fitxers de la instal·lació de piwigo. <br><a href="%s"> Cliqueu aquí per mostrar el registre de l\'error</a>.';
+$lang['An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'] = 'S\'ha produït un error durant l\'extracció. Reviseu els permisos dels fitxers de l\'instal·lació de piwigo. <br><a href="%s"> Cliqueu aquí per mostrar el registre de l\'error</a>.';
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo no pot recuperar l\'arxiu d\'actualització del servidor';
 $lang['Updates'] = 'Actualitzacions';
 $lang['%s has been successfully updated.'] = '%s s\'ha actualitzat correctament.';
@@ -991,4 +991,13 @@ $lang['based on'] = 'basat en';
 $lang['between %s and %s MB'] = 'entre %s i %s MB';
 $lang['date & time'] = 'data i hora';
 $lang['file name'] = 'nom del fitxer';
-$lang['width & height'] = 'amplada i alçada';
\ No newline at end of file
+$lang['width & height'] = 'amplada i alçada';
+$lang['Delete %d orphan photos'] = 'Eliminar %d fotos òrfenes';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada correu electrònic enviat contindrà la seva pròpia clau d\'autenticació en els enllaços, vàlida per %s';
+$lang['Edit user'] = 'Edita l\'usuari';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Per raons de seguretat, les claus d\'autenticació no funcionen amb els administradors';
+$lang['No recipient selected'] = 'No s\'ha indicat cap destinatari';
+$lang['No user is permitted to see this private album'] = 'No s\'ha indicat cap usuari per veure aquest àlbum privat';
+$lang['Orphans'] = 'Òrfenes';
+$lang['Recipients'] = 'Destinataris';
+$lang['Y Repeat'] = 'Repetició Y';
\ No newline at end of file
diff --git a/sources/language/ca_ES/common.lang.php b/sources/language/ca_ES/common.lang.php
index b6652e4..0371595 100644
--- a/sources/language/ca_ES/common.lang.php
+++ b/sources/language/ca_ES/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Català [CA]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=413
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -424,4 +424,5 @@ $lang['Photo description'] = 'Descripció de la foto';
 $lang['Photo title'] = 'Títol de la foto';
 $lang['Album name, A &rarr; Z'] = 'Nom de l\'àlbum, a &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Nom de l\'àlbum, Z &rarr; A';
-$lang['Link: %s'] = 'Enllaç: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Enllaç: %s';
+$lang['Your authentication key is no longer valid.'] = 'D\'aquí poc temps la teva clau autenticació no serà vàlida';
\ No newline at end of file
diff --git a/sources/language/ca_ES/help/photos_add_ftp.html b/sources/language/ca_ES/help/photos_add_ftp.html
index 7d0a90e..3037f73 100755
--- a/sources/language/ca_ES/help/photos_add_ftp.html
+++ b/sources/language/ca_ES/help/photos_add_ftp.html
@@ -25,34 +25,45 @@
 
     <p>Els directoris que representen els &agrave;lbums estan en el directori "galleries". Heus aqu&iacute; la jerarquia d'una galeria molt petita (per&ograve; amb moltes caracter&iacute;stiques):</p>
   
-<pre>
+    <pre>
 galleries
-|-- casament
-|   |-- celebracio
-|   |   |-- sortida
-|   |   |   |-- pol-sol.jpg
-|   |   |   +-- sara-sola.jpg
-|   |   +-- arrivada
-|   |       +-- pol-i-sara.jpg
-|   +-- festa
-|       |-- ball001.jpg
-|       |-- ball002.jpg
-|       +-- ball003.jpg
-+-- llunademel
-    |-- hotel.png
-    |-- video-avio.avi
-    +-- pwg_representacio
-        +-- video-avio.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>A excepci&oacute; de "pwg_representative" (vegeu les explicacions a sota), cada directori en "galleries" produeix un &agrave;lbum. No hi ha l&iacute;mit quan a profunditat, &eacute;s a dir, es poden crear &agrave;lbums i sub-&agrave;lbums a voluntat.</li>
+  <li>A excepci&oacute; de "pwg_representative" and "pwg_format" (vegeu les explicacions a sota), cada directori en "galleries" produeix un &agrave;lbum. No hi ha l&iacute;mit quan a profunditat, &eacute;s a dir, es poden crear &agrave;lbums i sub-&agrave;lbums a voluntat.</li>
 
   <li>B&agrave;sicament, un element est&agrave; representat per un arxiu. Un arxiu pot ser un element per a Piwigo si la seva extensi&oacute; &eacute;s entre la llista de par&agrave;metres de configuraci&oacute; <code>file_ext</code> (veure arxiu <span class="filename">include/config.inc.php</span>). Un arxiu pot ser una imatge si la seva extensi&oacute; &egrave;s entre el par&agrave;metre de configuraci&oacute; <code>picture_ext</code>.</li>
 
   <li>No es representen amb una icona per defecte elements com ara arxius de v&iacute;deo, sons, textos d'arxius, i altres extensions. Opcionalment, es pot associar una miniatura i un arxiu de representanci&oacute; (veure el video-avio.avi en l'exemple anterior).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li>Una vegada que les fotos estan ben col &middot; locades en els directoris, aneu a: <span class="pwgScreen">Gestionar (al Tauler de control) &raquo; Eines &raquo; Sincronitzar</span></li>
 </ul>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/sources/language/ca_ES/install.lang.php b/sources/language/ca_ES/install.lang.php
index d206f84..18c4666 100644
--- a/sources/language/ca_ES/install.lang.php
+++ b/sources/language/ca_ES/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "Contrasenya [confirmeu]";
 $lang['verification'] = "verificació";
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = "Necessiteu ajuda? Feu la vostra pregunta a <a href=\"%s\">Piwigo message board</a>.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "Els visitants poden utilitzar aquesta adreça de correu electrònic per a contactar amb l'administrador del lloc";
-$lang['PHP 5 is required'] = "Es requereix PHP 5 ";
+$lang['PHP 5 is required'] = 'Es requereix PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = "Sembla que el vostre amfitrió web està executant la versió PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pot tractar de canviar la teva configuració per PHP 5 mitjançant la creació o modificació de l\'arxiu .htaccess';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pot tractar de canviar la teva configuració per PHP 5.2 mitjançant la creació o modificació de l\'arxiu .htaccess';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Tingues en compte que en qualsevol moment pots canviar la configuració i reiniciar Piwigo.';
-$lang['Try to configure PHP 5'] = "Intenteu configurar PHP 5";
+$lang['Try to configure PHP 5'] = 'Intenteu configurar PHP 5.2';
 $lang['Sorry!'] = "Perdó!";
-$lang['Piwigo was not able to configure PHP 5.'] = "A Piwigo no li ha estat possible configurar PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Haurieu d'adreçar-vos al vostre proveidor d'hostatge i averiguar com poder canviar-vos cap a PHP 5.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'A Piwigo no li ha estat possible configurar PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Haurieu d\'adreçar-vos al vostre proveidor d\'hostatge i averiguar com poder canviar-vos cap a PHP 5.2';
 $lang['Hope to see you back soon.'] = "Esperem tornar-vos a veure ben aviat.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Felicitats, la instal·lació de Piwigo s\'ha completat';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Una solució alternativa és copiar el text del quadre del costat i pegar-lo dins del fitxer "local/config/database.inc.php" (Advertiment : el fitxer database.inc.php només ha de contenir el que hi ha a l\'àrea de text, sense linia de retorn o caràcter d\'espai)';
@@ -64,5 +64,4 @@ $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'No dubtis en
 $lang['Just another Piwigo gallery'] = 'Just another Piwigo gallery';
 $lang['Welcome to my photo gallery'] = 'Benvingut a la meva galeria fotogràfica';
 $lang['Welcome to your new installation of Piwigo!'] = 'Benvingut a la teva nova instal·lació de Piwigo!';
-$lang['localhost or other, supplied by your host provider'] = 'localhost o un altre, facilitat pel teu proveïdor d\'allotjament';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost o un altre, facilitat pel teu proveïdor d\'allotjament';
\ No newline at end of file
diff --git a/sources/language/ca_ES/upgrade.lang.php b/sources/language/ca_ES/upgrade.lang.php
index eb9c821..ecd80f8 100644
--- a/sources/language/ca_ES/upgrade.lang.php
+++ b/sources/language/ca_ES/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/cs_CZ/admin.lang.php b/sources/language/cs_CZ/admin.lang.php
index d931459..347e54d 100644
--- a/sources/language/cs_CZ/admin.lang.php
+++ b/sources/language/cs_CZ/admin.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -986,4 +986,13 @@ $lang['width & height'] = 'šířka & výška';
 $lang['Empty caddie'] = 'Vyprázdnit košík';
 $lang['No and unlock sub-albums'] = 'Ne a odemknout podalba';
 $lang['The settings for the guest are from the %s user'] = 'Nastavení pro hosta je od uživatele %s';
-$lang['based on'] = 'založeno na';
\ No newline at end of file
+$lang['based on'] = 'založeno na';
+$lang['No recipient selected'] = 'Žádní adresáti nevybráni';
+$lang['Recipients'] = 'Adresáti';
+$lang['Y Repeat'] = 'Y opakování';
+$lang['Orphans'] = 'Sirotci';
+$lang['No user is permitted to see this private album'] = 'Žádní uživatelé nejsou oprávněni vidět toto soukromé album';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Z bezpečnostních důvodů, ověřovací klíče nefungují pro administrátory.';
+$lang['Edit user'] = 'Upravit uživatele';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Každý odeslaný email bude obsahovat vlastní odkaz obsahující ověřovací klíč, který je platný po %s.';
+$lang['Delete %d orphan photos'] = 'Smazání %d fotografií bez rodiče';
\ No newline at end of file
diff --git a/sources/language/cs_CZ/common.lang.php b/sources/language/cs_CZ/common.lang.php
index 4d2fbc8..8fe3267 100644
--- a/sources/language/cs_CZ/common.lang.php
+++ b/sources/language/cs_CZ/common.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -25,7 +25,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Česky [CZ]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=414
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -431,4 +431,5 @@ $lang['Album name, A &rarr; Z'] = 'Název alba, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Název alba, Z &rarr; A';
 $lang['Apply on properties'] = 'Aplikovat na vlastnosti';
 $lang['Link: %s'] = 'Odkaz: %s';
-$lang['No results for'] = 'Žádné výsledky pro';
\ No newline at end of file
+$lang['No results for'] = 'Žádné výsledky pro';
+$lang['Your authentication key is no longer valid.'] = 'Váš autorizační klíč není nadále platný.';
\ No newline at end of file
diff --git a/sources/language/cs_CZ/help/index.php b/sources/language/cs_CZ/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/cs_CZ/help/index.php
+++ b/sources/language/cs_CZ/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/cs_CZ/help/photos_add_ftp.html b/sources/language/cs_CZ/help/photos_add_ftp.html
index e2d9a57..28c6c41 100644
--- a/sources/language/cs_CZ/help/photos_add_ftp.html
+++ b/sources/language/cs_CZ/help/photos_add_ftp.html
@@ -1,102 +1,53 @@
 <fieldset>
   <legend>Rychlý návod</legend>
-
-<ol>
-  <li>Vytvořte kategorii (adresář) na Vašem počítači.</li>  
-
-  <li>Zkopírujte nějaké fotografije do tohoto adresáře, změňte jejich velikost pro zobrazení na web. <em>Varování</em>: názvy adresářů a souborů musí obsahovat pouze písmena, čísla, "-", "_" or ".". Žádné mezery nebo znaky s diakritikou.</li>
-
-  <li>Pomocí FTP, zkopírujte Váš adresář do adresáře "galleries" vaší instalace  Piwigo.</li>
-
-  <li>Přihlašte se do Vaší Piwigo galerie a přejděte na <span class="pwgScreen">Administrace &raquo; Nástroje &raquo; Náhledy</span> abyste vytvořili chybějící náhledy.</li>
-
-  <li>Jděte na <span class="pwgScreen">Adminstrace</span> a stiskněte velké tlačítko Rychlá místní synchronizace.</li>
-</ol>
-
-Gratulujeme! Právě jste vytvořili vaší první galerii fotografií ve Vaší Piwigo galerii.
+  <ol>
+    <li>Vytvořte kategorii (adresář) na svém počítači.</li>
+    <li>Zkopírujte nějaké fotografije do tohoto adresáře, změňte jejich velikost pro zobrazení na web. <em>Varování</em>: název kteréhokoliv adresáře a souboru smí obsahovat pouze alfanumerické znaky, „-“, „_“ a „.“. Mezery nebo znaky s diakritikou nejsou povoleny.</li>
+    <li>Pomocí FTP zkopírujte tento adresář do adresáře "galleries" své instalace Piwigo.</li>
+    <li>Přihlašte se do administrace své galerie Piwigo a přejděte na <span class="pwgScreen">Administrace</span> a stiskněte velké tlačítko Rychlá místní synchronizace.</li>
+  </ol>
+  Gratulujeme! Právě jste vytvořili svou první galerii fotografií ve své galerii Piwigo.
 </fieldset>
-
 <fieldset>
-  <legend>Organizace souboru a adresářů</legend>
-
-<ul>
-
-  <li>
-
-    <p>Adresáře kategorií jsou v Piwigo adresáři 
-    "galleries". tady je ukázka malé adresářové struktury Piwigo (která ale využívá hodně vlastností Piwigo):</p>
-
-    <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- kategorie-1
-|   |   |-- kategorie-1.1
-|   |   |   |-- kategorie-1.1.1
-|   |   |   |   |-- kategorie-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- svatba.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-svatba.jpg
-|   |   |   |   |   +-- svatba.jpg
-|   |   |   |   +-- kategorie-1.1.1.2
-|   |   |   +-- kategorie-1.1.2
-|   |   |-- kategorie-1.2
-|   |   |   |-- slon.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-slon.jpg
-|   |   +-- kategorie-1.3
-|   +-- kategorie-2
-|       |-- selatko.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-selatko.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
-
-  </li>
-
-  <li>Kromě adreářů pojmenovaných "thumbnail", "pwg_high" nebo "pwg_representative" (čtěte vysvětlení níže), každý adresář v "galleries" vytvoří kategorii. Není zde omezení hloubky adresářů.</li>
-
-  <li>Každý element kategorie je reprezentován souborem. Soubor může být elementem Piwigo pokud jeho přípona odpovídá parametru konfigurace <code>file_ext</code>
-  (viz. soubor <span
-  class="filename">include/config_default.inc.php</span>). Soubor může být obrázek (fotografie) pokud jeho přípona je uvedena v parametru <code>picture_ext</code>.</li>
-
-  <li>Obrázky musí mít přiřazen náhled (viz. sekce o náhledech níže)</li>
-
-  <li>Obrázky mohou mít přiřazenu verzi ve vysoké kvalitě. Jako například svatba.jpg v příkladu výše. Verze ve vysoké kvalitě nemá, na rozdíl od náhledu, žádný prefix v názvu.</li>
-
-  <li>Elementy které nejsou obrázky (video, zvuky, textové sobubory, cokoli chcete...) mají jako výchozí náhled ikonu, které odpovídá jejich příponě. Volitelně můžete přiřadit náhled a reprezentativní soubor (viz. video.avi v příkladu výše).</li>
-
-  <li><em>Varování</em>: názvy adresářů a souborů musí obsahovat pouze písmena, čísla, "-", "_" or ".". Žádné mezery nebo znaky s diakritikou.</li>
-
-  <li>Když jsou elementy, obrázky, náhledy a reprezentativní soubory umístěny v adresářové struktuře přejděte na: <span class="pwgScreen">Administrace &raquo; Kategorie &raquo;
-  Synchronizace</span></li>
-
-</ul>
-</fieldset>
-
-<fieldset>
-  <legend>Náhledy</legend>
-<ul>
-
-  <li>Všechny obrázky (fotografie) musí mít přiřazen náhled.</li>
-
-  <li>Náhledy jsou umístěny v podadresáři "thumbnail", který je v adresáři kategorie. Náhled má stejný název jako jemu odpovídající obrázek, s prefixem podle konfiguračního parametru <code>prefix_thumbnail</code> (viz. <span class="filename">include/config.inc.php</span>).</li>
-
-  <li>Náhled nemusí mít nutně stejnou příponu jako jemu odpovídající obrázek (například ".jpg" obrázek může mít náhled s ".GIF" příponou).</li>
-
-  <li>Doporučujeme použít externí aplikaci protvorbu náhledů.</li>
-
-  <li>Vytvářená náhledů pomocí Piwigo může vést ke špatné kvalitě vytvořených náhledů, protože ta závisí na zdrojích serveru (a toto může být na sdílených serverech (webhosting) problém).
-
-  <li>Pokud budete přesto vytvářet náhledy pomocí Piwigo na serveru, tak musíte povolit přístup pro zápis pro všechny v adresáři "galleries" a všech podadresářích.</li>
-
-</ul>
-</fieldset>
+  <legend>Organizace souborů a adresářů</legend>
+  <ul>
+    <li>
+      <p>Adresáře kategorií jsou v adresáři
+      "galleries". Zde je ukázka adresářové struktury malé galerie Piwigo (která ale využívá hodně vlastností Piwigo):</p>
+      <pre>
+  galleries
+  |-- wedding
+  |   |-- celebration
+  |   |   |-- arrival
+  |   |   |   |-- paul-alone.jpg
+  |   |   |   +-- sarah-alone.jpg
+  |   |   +-- departure
+  |   |       +-- paul-and-sarah.jpg
+  |   +-- party
+  |       |-- dancers001.jpg
+  |       |-- dancers002.jpg
+  |       +-- dancers003.jpg
+  +-- honeymoon
+  |   |-- hotel.png
+  |   |-- video-from-plane.avi
+  |   +-- pwg_representative
+  |       +-- video-from-plane.jpg
+  +-- photoshoot
+      |-- img0001.jpg
+      |-- img0002.jpg
+      +-- pwg_format
+          |-- img0001.cr2
+          |-- img0001.cmyk.jpg
+          |-- img0001.zip
+          |-- img0002.cr2
+          +-- img0002.cmyk.jpg
+      </pre>
+    </li>
+    <li>Kromě adreářů pojmenovaných „thumbnail“, „pwg_high“, „pwg_format“ a „pwg_representative“ (jejich funkce vysvětleny níže) vytvoří každý adresář v „galleries“ kategorii. Není zde omezení hloubky adresářů.</li>
+    <li>Každý element kategorie je reprezentován souborem. Soubor může být elementem kategorie, pokud je jeho přípona mezi parametry konfigurace <code>file_ext</code> (vizte soubor <span class="filename">include/config_default.inc.php</span>). Soubor může být obrázek (fotografie), pokud je jeho přípona mezi parametry <code>picture_ext</code>.</li>
+    <li>Elementy, které nejsou obrázky (video, zvuky, textové soubory, cokoli chcete...), mají jako výchozí náhled ikonu, která odpovídá jejich příponě. Volitelně můžete neobrázkovému souboru přiřadit náhled a reprezentativní soubor (vizte „video-from-plane.avi“ a jeho reprezentační obrázek „video-from-plane.jpg“ ve složce „pwg_representative“ v příkladu výše).</li>
+    <li><em>Varování</em>: název kteréhokoliv adresáře a souboru smí obsahovat pouze alfanumerické znaky, „-“, „_“ a „.“. Mezery nebo znaky s diakritikou nejsou povoleny.</li>
+    <li>Více formátů: pro jeden obrázek je možné mít v galerii Piwigo více formátů. V příkladu výše jsou k obrázkům „img0001.jpg“ a „img0002.jpg“ k dispozici tři další formáty ve složce „pwg_formats“. Alternativní formáty je pak možné stáhnout přes tlačítko „Stáhnout“ na stránce daného obrázku. Tuto funkcionalitu můžete aktivovat ve své lokální konfiguraci (za použití doplňku „LocalFiles editor“) definováním seznamu povolených formátů, např.: <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code>.</li>
+    <li>Když jsou obrázky umístěny v adresářové struktuře, přejděte na: <span class="pwgScreen">Administrace &raquo; Nástroje &raquo; Synchronizace</span> a synchronizujte adresáře s databází.</li>
+  </ul>
+</fieldset>
\ No newline at end of file
diff --git a/sources/language/cs_CZ/index.php b/sources/language/cs_CZ/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/cs_CZ/index.php
+++ b/sources/language/cs_CZ/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/cs_CZ/install.lang.php b/sources/language/cs_CZ/install.lang.php
index 7f6d589..dd900f0 100644
--- a/sources/language/cs_CZ/install.lang.php
+++ b/sources/language/cs_CZ/install.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -34,7 +34,6 @@ $lang['It will be shown to the visitors. It is necessary for website administrat
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Spojení na server se podařilo, ale nebylo možné připojit databázi';
 $lang['Can\'t connect to server'] = 'Nebylo možné se připojit k serveru';
 $lang['Host'] = 'MySQL server';
-$lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.cz';
 $lang['User'] = 'Uživatel';
 $lang['user login given by your host provider'] = 'uživatelské jméno, které Vám přidělil provozovatel serveru';
 $lang['user password given by your host provider'] = 'heslo na tomto serveru';
@@ -50,14 +49,14 @@ $lang['Password [confirm]'] = 'Heslo [potvrzení]';
 $lang['verification'] = 'kontrola';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Potřebujete pomoc ? Zeptejte se na <a href="%s">Piwigo fóru</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Návštěvníci mohou pomocí tohoto e-mailu správce kontaktovat';
-$lang['PHP 5 is required'] = 'Je nutný PHP 5';
+$lang['PHP 5 is required'] = 'Je nutný PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Na Vašem webhostingu je PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo se může pokusit změnit Vaše nastavení na PHP 5 tím, že vytvoří nebo změní soubor .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo se může pokusit změnit Vaše nastavení na PHP 5.2 tím, že vytvoří nebo změní soubor .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Případně můžete změnit Vaši konfirguraci sami a potom restartovat Piwigo .';
-$lang['Try to configure PHP 5'] = 'Pokuste se změnit Vaše nastavení na PHP 5';
+$lang['Try to configure PHP 5'] = 'Pokuste se změnit Vaše nastavení na PHP 5.2';
 $lang['Sorry!'] = 'Bohužel!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nebylo schopno změnit Vaše nastavení na PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Obraťte se na poskytovatele Vašeho webhostingu, aby jste zjistili, jak můžete změnit Vaše nastavení na PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nebylo schopno změnit Vaše nastavení na PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Obraťte se na poskytovatele Vašeho webhostingu, aby jste zjistili, jak můžete změnit Vaše nastavení na PHP 5.2';
 $lang['Hope to see you back soon.'] = 'Věříme, že se brzy uvidíme.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gratulujeme, Piwigo instalace je ukončena';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Náhradním řešením je zkopírovat text z boxu výše a vložit jej do souboru "local/config/database.inc.php" (Upozornění : soubor database.inc.php smí obsahovat jen to, co je v tomto boxu, žádné znaky odřádkování nebo mezery)';
@@ -68,5 +67,4 @@ $lang['Just another Piwigo gallery'] = 'Jen další galerie Piwigo';
 $lang['Welcome to my photo gallery'] = 'Vítejte na mé fotogalerii';
 $lang['Welcome to your new installation of Piwigo!'] = 'Vítejte v nové instalaci Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Neváhejte navštívit naše fórum v případě jakýchkoliv dotazů: %s'; 
-$lang['localhost or other, supplied by your host provider'] = 'localhost, nebo jiný, dodaný poskytovatelem hostingu';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost, nebo jiný, dodaný poskytovatelem hostingu';
\ No newline at end of file
diff --git a/sources/language/cs_CZ/upgrade.lang.php b/sources/language/cs_CZ/upgrade.lang.php
index 7d967f2..dbb8f51 100644
--- a/sources/language/cs_CZ/upgrade.lang.php
+++ b/sources/language/cs_CZ/upgrade.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/da_DK/admin.lang.php b/sources/language/da_DK/admin.lang.php
index 07ef176..82e4554 100644
--- a/sources/language/da_DK/admin.lang.php
+++ b/sources/language/da_DK/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -73,7 +73,7 @@ $lang['Deletions'] = 'Sletninger';
 $lang['Deny selected groups'] = 'Afvis valgte grupper';
 $lang['Deny selected users'] = 'Afvis valgte brugere';
 $lang['Description'] = 'Beskrivelse';
-$lang['Display options'] = 'Vis muligheder';
+$lang['Display options'] = 'Vis indstillinger';
 $lang['Dissociated'] = 'Tilknytning fjernet';
 $lang['Does not represent'] = 'er ikke miniaturebillede for';
 $lang['Edit selected tags'] = 'Rediger valgte tags';
@@ -113,7 +113,7 @@ $lang['Number of comments per page'] = 'Antal kommentarer pr. side';
 $lang['Number of rates'] = 'Antal bedømmelser';
 $lang['Only private albums are listed'] = 'Kun private albummer er opført';
 $lang['Operating system'] = 'Styresystem';
-$lang['Options'] = 'Valgmuligheder';
+$lang['Options'] = 'Indstillinger';
 $lang['Other private albums'] = 'Andre private albummer';
 $lang['Page banner'] = 'Sidebanner';
 $lang['Parent album'] = 'Overordnet album';
@@ -863,7 +863,7 @@ $lang['Multiple Size'] = 'Flere størrelser';
 $lang['%u users have automatic permission because they belong to a granted group.'] = '%u brugere har automatisk tilladelse, fordi de tilhører en gruppe med tilladelser.';
 $lang['<em>Piwigo for Android</em> application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = 'App\'en <em>Piwigo for Android</em> giver dig mulighed for at forbinde en Android-mobiltelelfon eller -tablet med dit Piwigo-galleri, oprette albummer og uploade flere fotografier på én gang.';
 $lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroom er et fotografiprogram beregnet til at håndtere store mængder digitale billeder og foretage efterbehandling.';
-$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture er et ydedygtigt værktøj til at forfine billeder og administrere store biblioteker på Mac.';
+$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture er et ydedygtigt værktøj til at forfine billeder og administrere store biblioteker på en Mac.';
 $lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture er udviklet til professionelle fotografer med iPhoto-enkelhed.';
 $lang['By default, the center of interest is placed in the middle of the photo.'] = 'Som standard er fokusområdet placeret i midten af fotografiet';
 $lang['Center of interest'] = 'Fokusområde';
@@ -984,4 +984,13 @@ $lang['date & time'] = 'dato og tid';
 $lang['file name'] = 'filnavn';
 $lang['width & height'] = 'bredde og højde';
 $lang['No and unlock sub-albums'] = 'Nej, og lås underalbummer op';
-$lang['Upload in progress'] = 'Upload i gang';
\ No newline at end of file
+$lang['Upload in progress'] = 'Upload i gang';
+$lang['Delete %d orphan photos'] = 'Slettede %d forældreløse fotografier';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Hver afsendt mail indeholder sin egen automatiske autentifikationsnøgle i links, gyldig i %s.';
+$lang['Edit user'] = 'Rediger bruger';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Af sikkerhedsgrunde fungerer autentifikationsnøgler ikke for administratorer.';
+$lang['No recipient selected'] = 'Ingen modtager valgt';
+$lang['No user is permitted to see this private album'] = 'Ingen bruger har rettigheder til at se dette private album';
+$lang['Orphans'] = 'Forældreløse';
+$lang['Recipients'] = 'Modtagere';
+$lang['Y Repeat'] = 'Y-gentagelse';
\ No newline at end of file
diff --git a/sources/language/da_DK/common.lang.php b/sources/language/da_DK/common.lang.php
index a5156e6..6add311 100644
--- a/sources/language/da_DK/common.lang.php
+++ b/sources/language/da_DK/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Dansk [DK]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=415
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -194,7 +194,7 @@ $lang['included'] = 'medtaget';
 $lang['Invalid password!'] = 'Forkert adgangskode!';
 $lang['Language']='Sprog';
 $lang['last %d days'] = 'seneste %d dage';
-$lang['Last'] = 'Seneste';
+$lang['Last'] = 'Sidste';
 $lang['Logout'] = 'Log af';
 $lang['obligatory'] = 'obligatorisk';
 $lang['display a calendar by creation date'] = 'viser en kalender over oprettelsesdatoer';
@@ -231,7 +231,7 @@ $lang['Click on the photo to see it in high definition'] = 'Klik på fotografiet
 $lang['Show file metadata'] = 'Vis fotografiets metadata';
 $lang['Powered by'] = 'Drives af';
 $lang['Preferences'] = 'Indstillinger';
-$lang['Previous'] = 'Tidligere';
+$lang['Previous'] = 'Forrige';
 $lang['Random photos'] = 'Tilfældige fotografier';
 $lang['display a set of random photos'] = 'vis et sæt tilfældigt valgte fotografier';
 $lang['Recent albums'] = 'Nyeste albummer';
@@ -427,4 +427,5 @@ $lang['Photo description'] = 'Fotobeskrivelse';
 $lang['Photo title'] = 'Fototitel';
 $lang['Album name, A &rarr; Z'] = 'Albumnavn, A &rarr; Å';
 $lang['Album name, Z &rarr; A'] = 'Albumnavn, Å &rarr; A';
-$lang['Link: %s'] = 'Link: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Link: %s';
+$lang['Your authentication key is no longer valid.'] = 'Din autentifikationsnøgle er ikke længere gyldig.';
\ No newline at end of file
diff --git a/sources/language/da_DK/help/photos_add_ftp.html b/sources/language/da_DK/help/photos_add_ftp.html
index ecac367..66f47e6 100755
--- a/sources/language/da_DK/help/photos_add_ftp.html
+++ b/sources/language/da_DK/help/photos_add_ftp.html
@@ -27,27 +27,36 @@
 
     <pre>
 galleries
-|-- bryllup
-|   |-- fejring
-|   |   |-- ankomst
-|   |   |   |-- mads-alene.jpg
-|   |   |   +-- mette-alene.jpg
-|   |   +-- afrejse
-|   |       +-- mads-og-mette.jpg
-|   +-- fest
-|       |-- dansende001.jpg
-|       |-- dansende002.jpg
-|       +-- dansende003.jpg
-+-- bryllupsrejse
-    |-- hotel.png
-    |-- video-fra-fly.avi
-    +-- pwg_representative
-        +-- video-fra-fly.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Bortset fra "pwg_representative" (se forklaring herunder), genererer hver mappe under "galleries" et album. Der er ingen begrænsning på hvor mange niveauer, der kan være.</li>
+  <li>Bortset fra "pwg_representative" and "pwg_format" (se forklaring herunder), genererer hver mappe under "galleries" et album. Der er ingen begrænsning på hvor mange niveauer, der kan være.</li>
 
   <li>Grundlæggende repræsenteres et element af en fil. En fil kan være et 
   Piwigo-element, hvis dets filendelse er blandt mulighederne angivet i opsætningsparameteret
@@ -58,10 +67,12 @@ galleries
   <li>Ingen fotoelementer (video, lyde, tekstfiler, alt muligt andet ...) er som standard repræsenteret af en ikon 
   svarende til filendelsen. Man kan valgfrit associere et miniaturebillede og repræsentativ fil (se video.avi i eksemplet herover).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Advarsel</em>: Navnene på mapper og filer må kun indeholde bogstaver, tal, "-", "_" eller ".". Ingen mellemrum eller accenttegn.</li>
 
   <li>Når fotografierne er korrekt placeret i mapperne, går man til: <span class="pwgScreen">Administration &raquo; Værktøjer &raquo;
   Synkroniser</span></li>
 
 </ul>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/sources/language/da_DK/index.php b/sources/language/da_DK/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/da_DK/index.php
+++ b/sources/language/da_DK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/da_DK/install.lang.php b/sources/language/da_DK/install.lang.php
index f205989..4e7b451 100644
--- a/sources/language/da_DK/install.lang.php
+++ b/sources/language/da_DK/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Password [bekræft]';
 $lang['verification'] = 'bekræftelse';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Brug for hjælp? Stil dine spørgsmål i <a href="%s">Piwigos forum</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Besøgende vil ved hjælp af denne e-mail have mulighed for at kontakte administratoren';
-$lang['PHP 5 is required'] = 'PHP 5 er nødvendig';
+$lang['PHP 5 is required'] = 'PHP 5.2 er nødvendig';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Det lader til, at din webhost pt. kører PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve at skifte din opsætning til PHP 5 ved at oprette eller ændre en .htaccess-fil.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve at skifte din opsætning til PHP 5.2 ved at oprette eller ændre en .htaccess-fil.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Bemærk, at du selv kan ændre din opsætning og derefter genstarte Piwigo.';
-$lang['Try to configure PHP 5'] = 'Prøv at opsætte PHP 5';
+$lang['Try to configure PHP 5'] = 'Prøv at opsætte PHP 5.2';
 $lang['Sorry!'] = 'Hov!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke i stand til at opsætte PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke i stand til at opsætte PHP 5.2';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Du henvises til din webhost for at se hvordan du selv kan skifte til PHP 5.";
 $lang['Hope to see you back soon.'] = 'Håber snart at se dig igen.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Tillykke, installeringen af Piwigo er afsluttet';
@@ -65,6 +65,5 @@ $lang['Welcome to my photo gallery'] = 'Velkommen til mit fotogalleri';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Tøv ikke med at besøges vores forum for at få hjælp: %s';
 $lang['Welcome to your new installation of Piwigo!'] = 'Velkommen til din nye Piwigo-installation';
 $lang['Password ']['confirm'] = 'Adgangskode [bekræft]';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du henvises til din webhosts support for at finde ud af, om du selv kan skifte til PHP 5.';
-$lang['localhost or other, supplied by your host provider'] = 'localhost eller andet, oplyst af din hostingleverandør';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du henvises til din webhosts support for at finde ud af, om du selv kan skifte til PHP 5.2';
+$lang['localhost or other, supplied by your host provider'] = 'localhost eller andet, oplyst af din hostingleverandør';
\ No newline at end of file
diff --git a/sources/language/da_DK/upgrade.lang.php b/sources/language/da_DK/upgrade.lang.php
index 1bc7d19..98646fb 100644
--- a/sources/language/da_DK/upgrade.lang.php
+++ b/sources/language/da_DK/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/de_DE/about.html b/sources/language/de_DE/about.html
index 7379e83..396ad99 100644
--- a/sources/language/de_DE/about.html
+++ b/sources/language/de_DE/about.html
@@ -8,6 +8,7 @@ Erweiterungen machen Piwigo leicht anpassbar an die verschiedensten Bedürfnisse
 <p>Die deutsche Übersetzung wird gepflegt von (Namen in alphabetischer Reihenfolge):
 
 	<ul>
+		<li><a href="http://piwigo.org/forum/profile.php?id=21048">bigant</a></li>
 		<li><a href="http://de.piwigo.org/forum/profile.php?id=4722">duke</a></li>
 		<li><a href="http://de.piwigo.org/forum/profile.php?id=2664">el ninjo</a></li>
 		<li><a href="http://piwigo.org/forum/profile.php?id=14037">fs101299</a></li>
diff --git a/sources/language/de_DE/admin.lang.php b/sources/language/de_DE/admin.lang.php
index 083754f..bd5a755 100644
--- a/sources/language/de_DE/admin.lang.php
+++ b/sources/language/de_DE/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,13 +22,13 @@
 // +-----------------------------------------------------------------------+
 
 $lang['%d association'] = '%d Element wird angezeigt';
-$lang['%d associations'] = '%d Elemente werden insgesamt angezeigt';
-$lang['%d album including'] = '%d Album inbegriffen, ';
-$lang['%d albums including'] = '%d Alben inbegriffen, ';
+$lang['%d associations'] = '%d Verknüpfungen';
+$lang['%d album including'] = '%d Album enthalten, ';
+$lang['%d albums including'] = '%d Alben enthalten, ';
 $lang['%d physical'] = 'davon %d physisch';
 $lang['%d physicals'] = 'davon %d physische';
 $lang[' and %d virtual'] = ' und %d virtuell';
-$lang[' and %d virtuals'] = ' und %d virtuelle';
+$lang[' and %d virtuals'] = ' und %d virtuell';
 $lang['%d album moved'] = '%d Album verschoben';
 $lang['%d albums moved'] = '%d Alben verschoben';
 $lang['%d group'] = '%d Gruppe';
@@ -91,7 +91,7 @@ $lang['Group name'] = 'Gruppenname';
 $lang['Groups'] = 'Gruppen';
 $lang['Guests'] = 'Gäste';
 $lang['History'] = 'Statistik';
-$lang['Informations'] = 'Informationen';
+$lang['Informations'] = 'Benachrichtigung';
 $lang['Install'] = 'Installieren';
 $lang['Link all album photos to a new album'] = 'Alle Album-Fotos mit einem neuen Album verknüpfen';
 $lang['Link all album photos to some existing albums'] = 'Alle Album-Fotos mit einem existierenden Album verknüpfen';
@@ -111,7 +111,7 @@ $lang['New name'] = 'Neuer Name';
 $lang['New parent album'] = 'Neues übergeordnetes Album';
 $lang['New tag'] = 'Neues Schlagwort';
 $lang['Number of comments per page'] = 'Anzahl Kommentare pro Seite';
-$lang['Number of rates'] = 'Anzahl von Bewertungen';
+$lang['Number of rates'] = 'Anzahl Bewertungen';
 $lang['Only private albums are listed'] = 'Nur private Alben werden aufgelistet';
 $lang['Operating system'] = 'Betriebssystem';
 $lang['Options'] = 'Optionen';
@@ -163,7 +163,7 @@ $lang['Use the default photo sort order'] = 'Die Standard-Sortierreihenfolge ver
 $lang['User comments validation'] = 'Auf Freigabe wartende Kommentare';
 $lang['Users'] = 'Benutzer';
 $lang['Validate'] = 'Freigeben';
-$lang['Validation'] = 'Freigabe der Kommentare durch den Administrator';
+$lang['Validation'] = 'Freigabe der Kommentare durch den Administrator erforderlich';
 $lang['Version'] = 'Version';
 $lang['Virtual albums to move'] = 'Eines oder mehrere virtuelle Alben auswählen, um sie zu verschieben.';
 $lang['Virtual album name'] = 'Virtueller Albumname';
@@ -174,7 +174,7 @@ $lang['You cannot move an album in its own sub album'] = 'Sie können ein Album
 $lang['You need to confirm deletion'] = 'Löschen bestätigen';
 $lang['Associate to album'] = 'Mit einem Album verbinden';
 $lang['associate to group'] = 'mit Gruppe verbinden';
-$lang['Authorized'] = 'Zugriff erlaubt';
+$lang['Authorized'] = 'Kommentare erlaubt';
 $lang['Add a virtual album'] = 'Virtuelles Album hinzufügen';
 $lang['Authorize users to add comments on selected albums'] = 'Benutzern erlauben, in ausgewählten Alben Kommentare zu schreiben';
 $lang['The name of an album must not be empty'] = 'Der Name eines Albums darf nicht leer sein.';
@@ -192,17 +192,17 @@ $lang['Default display'] = 'Standarddarstellung';
 $lang['The gallery URL is not valid.'] = 'Die URL der Galerie ist ungültig.';
 $lang['The number of comments a page must be between 5 and 50 included.'] = 'Die Anzahl der Kommentare pro Seite muss zwischen 5 und 50 liegen.';
 $lang['Configuration'] = 'Konfiguration';
-$lang['confirm'] = 'bestätigen';
+$lang['confirm'] = 'Bestätigen';
 $lang['Date'] = 'Datum';
 $lang['delete album'] = 'Album löschen';
 $lang['Dissociate from album'] = 'Von Album abtrennen';
 $lang['dissociate from group'] = 'von Gruppe abtrennen';
 $lang['Album updated successfully'] = 'Informationen des Albums wurden erfolgreich aktualisiert.';
-$lang['photos per page'] = 'Fotos je Seite';
+$lang['photos per page'] = 'Bilder pro Seite';
 $lang['High definition enabled'] = 'Hohe Auflösung aktiviert';
 $lang['File'] = 'Datei';
 $lang['first photo added on %s'] = 'erstes Foto am %s hinzugefügt';
-$lang['Forbidden'] = 'Zugriff verweigert';
+$lang['Forbidden'] = 'Keine Kommentare erlaubt';
 $lang['global mode'] = 'Übersicht';
 $lang['group "%s" added'] = 'Gruppe "%s" hinzugefügt';
 $lang['group "%s" deleted'] = 'Gruppe "%s" gelöscht';
@@ -236,12 +236,12 @@ $lang['You have subscribed to receiving notifications by mail.'] = 'Sie sind fü
 $lang['To subscribe'] = 'Zum Anmelden';
 $lang['If you encounter problems or have any question, please send a message to'] = 'Bei Problemen oder Fragen eine E-Mail senden an';
 $lang['[NBM] Problems or questions'] = '[NBM] Probleme oder Fragen';
-$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Der Webmaster Sie aus der E-Mail-Benachrichtigung ausgetragen.';
+$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Der Webmaster hat Sie aus der E-Mail-Benachrichtigungsliste ausgetragen.';
 $lang['You have unsubscribed from receiving notifications by mail.'] = 'Sie haben sich aus der E-Mail-Benachrichtigung ausgetragen.';
 $lang[', click on'] = ', auf diesen Link klicken:';
 $lang['To unsubscribe'] = 'Zum Austragen';
 $lang['With blank value, gallery title will be used'] = 'Wenn leer, wird der Galerie-Titel verwendet';
-$lang['Notification'] = 'Benachrichtigung';
+$lang['Notification'] = 'Benachrichtigungen';
 $lang['Error when sending email to %s [%s].'] = 'Fehler beim Versand an %s [%s].';
 $lang['Mail sent to %s [%s].'] = 'E-Mail versendet an %s [%s].';
 $lang['%d mail was sent.'] = '%d E-Mail wurde gesendet.';
@@ -254,7 +254,7 @@ $lang['Subscribers could be listed (available) only if there is new elements to
 $lang['Anyway only webmasters can see this tab and never administrators.'] = 'Wenn niemand in der Mailingliste eingetragen ist, können keine E-Mails versendet werden. Nur der Webmaster erscheint bei Aktualisierungen in dieser Liste.';
 $lang['No user to send notifications by mail.'] = 'Keine Benutzer vorhanden, um Aktualisierungen zu senden.';
 $lang['New photos added'] = 'Neue Fotos hinzugefügt';
-$lang['Subscribe to notification by mail'] = 'Eintragen zur E-Mail-Benachrichtigung';
+$lang['Subscribe to notification by mail'] = 'E-Mail-Benachrichtigung abonnieren';
 $lang['Unsubscribe from notification by mail'] = 'Von der E-Mail-Benachrichtigung austragen';
 $lang['Parameter'] = 'Einstellungen';
 $lang['Continue processing treatment'] = 'Vorgang fortsetzen';
@@ -287,7 +287,7 @@ $lang['Include display of recent photos grouped by dates'] = 'Die neuesten Bilde
 $lang['Available only with HTML format'] = 'Nur verfügbar, wenn die Benachrichtigungen im HTML-Format verschickt werden';
 $lang['no write access'] = 'kein Schreibzugriff';
 $lang['Permissions'] = 'Zugriffsrechte';
-$lang['private'] = 'private';
+$lang['private'] = 'privat';
 $lang['public'] = 'öffentlich';
 $lang['Purge never used notification feeds'] = 'Nicht verwendete Benachrichtigungen löschen';
 $lang['Purge sessions'] = 'Sitzungen löschen';
@@ -322,7 +322,7 @@ $lang['Edit album'] = 'Album bearbeiten';
 $lang['Group management'] = 'Gruppen verwalten';
 $lang['User list'] = 'Benutzer verwalten';
 $lang['Database synchronization with files'] = 'Synchronisierung der Datenbank';
-$lang['all'] = 'alle';
+$lang['all'] = 'Alle';
 $lang['height must be a number superior to'] = 'die Höhe muss größer sein als';
 $lang['width must be a number superior to'] = 'die Breite muss größer sein als';
 $lang['for the file format'] = 'für das Format der Datei';
@@ -352,7 +352,7 @@ $lang['photos candidates for metadata synchronization'] = 'Fotos bereit zur Meta
 $lang['photos informations synchronized with files metadata'] = 'Fotoinformationen mit den Datei-Metadaten synchronisiert';
 $lang['errors during synchronization'] = 'Fehler während der Synchronisation';
 $lang['albums added in the database'] = 'Alben in der Datenbank hinzugefügt';
-$lang['photos added in the database'] = 'der Datenbank hinzugefügte Fotos';
+$lang['photos added in the database'] = 'In der Datenbank hinzugefügte Fotos';
 $lang['photos updated in the database'] = 'in der Datenbank aktualisierte Fotos';
 $lang['Search for new images in the directories'] = 'Nach neuen Fotos in den vorhandenen Verzeichnissen suchen';
 $lang['added'] = 'hinzugefügt';
@@ -360,7 +360,7 @@ $lang['deleted'] = 'gelöscht';
 $lang['Metadata synchronization results'] = 'Ergebnisse der Metadaten-Synchronisierung';
 $lang['only perform a simulation (no change in database will be made)'] = 'Nur Simulation durchführen, ohne Änderungen in der Datenbank vorzunehmen.';
 $lang['Simulation'] = 'Simulation';
-$lang['directories + files'] = 'Verzeichnisse + Dateien';
+$lang['directories + files'] = 'Verzeichnisse und Dateien';
 $lang['only directories'] = 'Nur Verzeichnisse';
 $lang['synchronize files structure with database'] = 'Dateistruktur mit Datenbank synchronisieren';
 $lang['synchronize files metadata with database photos informations'] = 'Datei-Metadaten mit den Fotoinformationen der Datenbank synchronisieren';
@@ -394,9 +394,9 @@ $lang['An information email was sent to group "%s"'] = 'Eine Info-E-Mail wurde a
 $lang['Send an information email to group members'] = 'Eine Info-E-Mail an die Mitglieder dieser Gruppe senden';
 $lang['Group'] = 'Gruppe';
 $lang['[%s] Visit album %s'] = '[%s] Album %s ansehen';
-$lang['Hello,'] = 'Hallo,';
-$lang['See you soon.'] = 'Bis bald.';
-$lang['Discover album:'] = 'Entdecken Sie das Album:';
+$lang['Hello,'] = 'Guten Tag!';
+$lang['See you soon.'] = 'Bis bald!';
+$lang['Discover album:'] = 'Entdecken Sie dieses Album:';
 $lang['Mail content'] = 'Text der E-Mail';
 $lang['none'] = 'nichts';
 $lang['high'] = 'hoch';
@@ -507,7 +507,7 @@ $lang['Templates configuration has been recorded.'] = 'Die Konfiguration der Vor
 $lang['All optimizations have been successfully completed.'] = 'Alle Optimierungen wurden erfolgreich abgeschlossen.';
 $lang['Optimizations have been completed with some errors.'] = 'Bei den durchgeführten Optimierungen sind Fehler aufgetreten.';
 $lang['Modify information'] = 'Informationen ändern';
-$lang['nothing'] = 'nichts';
+$lang['nothing'] = 'Nichts';
 $lang['overrides existing values with empty ones'] = 'Alle in der Datenbank vorhandenen Werte zurücksetzen';
 $lang['Manage photo ranks'] = 'Foto-Sortierreihenfolge';
 $lang['Edit ranks'] = 'Die Reihenfolge ändern';
@@ -529,7 +529,7 @@ $lang['Number of downloads'] = 'Anzahl der Downloads';
 $lang['Piwigo Announcements Newsletter'] = 'Piwigo-Newsletter';
 $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Abonnieren Sie den Piwigo-Newsletter. Wenn eine neue Version von Piwigo bereitsteht oder wichtige Sicherheitsaktualisierungen erschienen sind, werden Sie per E-Mail benachrichtigt. Auch über bedeutende Ereignisse rund um das Piwigo-Projekt werden Sie informiert. Es erscheinen nur wenige Newsletter pro Jahr.';
 $lang['Subscribe %s'] = 'Abonnieren %s';
-$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Melde %s an für den Piwigo-Newsletter';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = '%s für den Piwigo-Newsletter anmelden';
 $lang['Purge search history'] = 'Suchhistorie löschen';
 $lang['Hide'] = 'Ausblenden';
 $lang['Operation in progress'] = 'Vorgang läuft.';
@@ -551,8 +551,8 @@ $lang['Add New Theme'] = 'Ein neues Theme hinzufügen';
 $lang['Forbid this theme to users'] = 'Dieses Theme den Benutzern verbieten';
 $lang['Set as default theme for unregistered and new users'] = 'Standardthema für unregistrierte und neue Benutzer festlegen';
 $lang['unknown'] = 'unbekannt';
-$lang['Upload Photos'] = 'Fotos hochladen';
-$lang['Drop into album'] = 'In das Album hochladen';
+$lang['Upload Photos'] = 'Bilder hochladen';
+$lang['Drop into album'] = 'In dieses Album hochladen';
 $lang['+ Add an upload box'] = '+ Eine weitere Uploadbox hinzufügen';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Erstellen Sie das Verzeichnis "%s" im Hauptverzeichnis (root) Ihrer Piwigo-Installation';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Geben Sie dem Verzeichnis "%s" im Hauptverzeichnis (root) Ihrer Piwigo-Installation Schreibrechte (chmod 777)';
@@ -606,7 +606,7 @@ $lang['Main Page'] = 'Hauptseite';
 $lang['Photo Page'] = 'Fotoseite';
 $lang['Activate Navigation Bar'] = 'Navigationsleiste aktivieren';
 $lang['Activate Navigation Thumbnails'] = 'Navigationsvorschaubilder aktivieren';
-$lang['Activate icon "%s"'] = 'Icon »%s« aktivieren';
+$lang['Activate icon "%s"'] = '»%s«-Symbol anzeigen';
 $lang['Photo Properties'] = 'Fotoeigenschaften';
 $lang['Allow user customization'] = 'Anpassungen durch Benutzer erlauben';
 $lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Die Zeit für die Ausführung ist abgelaufen, der Vorgang muss fortgesetzt werden [Noch benötigte Zeit: %d Sekunden].';
@@ -622,7 +622,7 @@ $lang['Miscellaneous'] = 'Verschiedenes';
 $lang['Virtual Links'] = 'Virtuelle Verbindungen';
 $lang['Webmaster status is required.'] = 'Sie benötigen Webmaster-Berechtigung.';
 $lang['Bound Theme'] = 'Verbundenes Thema';
-$lang['Allow rating'] = 'Bewertung von Fotos erlauben';
+$lang['Allow rating'] = 'Bewertungen von Fotos erlauben';
 $lang['Select at least one comment'] = 'Mindestens einen Kommentar auswählen';
 $lang['Active Plugins'] = 'Aktivierte Plugins';
 $lang['Inactive Plugins'] = 'Deaktivierte Plugins';
@@ -721,8 +721,8 @@ $lang['%s photos can not be regenerated'] = '%s Fotos konnten nicht neu erstellt
 $lang['new'] = 'neu';
 $lang['No results'] = 'Keine Ergebnisse';
 $lang['Searching...'] = 'Suche...';
-$lang['Type in a search term'] = 'Geben Sie bitte einen Suchbegriff ein';
-$lang['Activate icon "new" next to albums and pictures'] = 'Das Icon »Neu« neben den Alben und Fotos aktivieren';
+$lang['Type in a search term'] = 'Suchbegriff eingeben';
+$lang['Activate icon "new" next to albums and pictures'] = 'Das »Neu«-Symbolzeichen bei neuen Alben und Fotos anzeigen';
 $lang['Deactivate all'] = 'Alles deaktivieren';
 $lang['Default photos order'] = 'Voreingestellte Fotoanordnung';
 $lang['Restore'] = 'Zurücksetzen';
@@ -949,7 +949,7 @@ $lang['Resize after upload disabled due to the use of GD as graphic library'] =
 $lang['Select at least one tag'] = 'Mindestens ein Schlagwort auswählen';
 $lang['Basic settings'] = 'Grundeinstellungen';
 $lang['General'] = 'Allgemein';
-$lang['Mail theme'] = 'Mail-Theme';
+$lang['Mail theme'] = 'E-Mail-Theme';
 $lang['%d of %d users selected'] = '%d von %d Benutzern ausgewählt';
 $lang['(filtered from %s total users)'] = '(von insgesamt %s Benutzern gefiltert)';
 $lang['All %d users are selected'] = 'Alle %d Benutzer sind ausgewählt';
@@ -973,7 +973,7 @@ $lang['close'] = 'schließen';
 $lang['Close user details'] = 'Benutzerdetails schließen';
 $lang['Open user details'] = 'Benutzerdetails anzeigen';
 $lang['Activate it now'] = 'Jetzt aktivieren';
-$lang['Allow users to add a link to their website'] = 'Benutzer erlauben einen Link Ihrer Webseite einzufügen';
+$lang['Allow users to add a link to their website'] = 'Benutzer erlauben, einen Link Ihrer Webseite einzufügen';
 $lang['Impossible to deactivate the default theme.'] = 'Es ist nicht möglich, das Standard-Theme zu deaktivieren';
 $lang['Mail address is mandatory for registration'] = 'E-Mail-Adresse wird für die Registrierung benötigt';
 $lang['Empty caddie'] = 'Sammelkorb leeren';
@@ -984,4 +984,13 @@ $lang['between %s and %s MB'] = 'zwischen %s und %s MB';
 $lang['date & time'] = 'Datum und Zeit';
 $lang['file name'] = 'Dateiname';
 $lang['width & height'] = 'Breite und Höhe';
-$lang['Upload in progress'] = 'Upload im Gange';
\ No newline at end of file
+$lang['Upload in progress'] = 'Upload im Gange';
+$lang['Delete %d orphan photos'] = '%d verwaiste Fotos löschen';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Jede gesendete E-Mail enthält einen eigenen automatischen Authentifizierungsschlüssel, der eine bestimmte Zeit gültig ist (%s).';
+$lang['Edit user'] = 'Benutzer bearbeiten';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Aus Sicherheitsgründen funktionieren Authentifizierungsschlüssel nicht für Administratoren.';
+$lang['No recipient selected'] = 'Kein Empfänger ausgewählt';
+$lang['No user is permitted to see this private album'] = 'Es ist keinem Benutzer erlaubt, dieses private Album zu sehen.';
+$lang['Orphans'] = 'Verwaiste Dateien';
+$lang['Recipients'] = 'Empfänger';
+$lang['Y Repeat'] = 'Y Wiederholen';
\ No newline at end of file
diff --git a/sources/language/de_DE/common.lang.php b/sources/language/de_DE/common.lang.php
index d2b6996..6f5710e 100644
--- a/sources/language/de_DE/common.lang.php
+++ b/sources/language/de_DE/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Deutsch [DE]
-Version: 2.7.2
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=416
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -38,8 +38,8 @@ $lang_info['zero_plural'] = false;
 $lang['%d Kb'] = '%d kB';
 $lang['%d album updated'] = '%d Album aktualisiert';
 $lang['%d albums updated'] = '%d Alben aktualisiert';
-$lang['%d comment to validate'] = '%d Kommentar freizuschalten';
-$lang['%d comments to validate'] = '%d Kommentare freizuschalten';
+$lang['%d comment to validate'] = '%d Kommentar zu moderieren';
+$lang['%d comments to validate'] = '%d Kommentare zu moderieren';
 $lang['%d new comment'] = '%d neuer Kommentar';
 $lang['%d new comments'] = '%d neue Kommentare';
 $lang['%d comment'] = '%d Kommentar';
@@ -50,10 +50,10 @@ $lang['%d new photo'] = '%d neues Foto';
 $lang['%d new photos'] = '%d neue Fotos';
 $lang['%d new user'] = '%d neuer Benutzer';
 $lang['%d new users'] = '%d neue Benutzer';
-$lang['About'] = 'Über uns';
+$lang['About'] = 'Info';
 $lang['All tags'] = 'Alle Schlagwörter';
 $lang['Any tag'] = 'Beliebiges Schlagwort';
-$lang['At least one listed rule must be satisfied.'] = 'Mindestens eine aufgelistete Regel muss erfüllt werden.';
+$lang['At least one listed rule must be satisfied.'] = 'Mindestens eine aufgelistete Regel muss erfüllt sein.';
 $lang['Author'] = 'Autor';
 $lang['Albums'] = 'Alben';
 $lang['Album'] = 'Album';
@@ -65,7 +65,7 @@ $lang['Login'] = 'Anmeldung';
 $lang['Contact webmaster'] = 'E-Mail an den Webmaster';
 $lang['Create a new account'] = 'Neues Benutzerkonto erstellen';
 $lang['Created on'] = 'Erstellt am';
-$lang['Creation date'] = 'Erstellungsdatum';
+$lang['Creation date'] = 'Aufnahmedatum';
 $lang['Current password is wrong'] = 'Aktuelles Passwort ist falsch.';
 $lang['Dimensions'] = 'Abmessungen';
 $lang['Display'] = 'Anzeige';
@@ -112,7 +112,7 @@ $lang['Sort by'] = 'Sortieren nach';
 $lang['Sort order'] = 'Sortierreihenfolge';
 $lang['Tag'] = 'Schlagwort';
 $lang['Tags'] = 'Schlagwörter';
-$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'Der RSS-Feed stellt Benachrichtigungen dieser Webseite bereit und informiert Sie über neue Fotos, aktualisierte Alben, neue Kommentare. Benutzen Sie dazu einen RSS-Feed-Reader.';
+$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'Der RSS-Feed stellt Benachrichtigungen dieser Webseite bereit und informiert Sie über neue Fotos, aktualisierte Alben sowie neue Kommentare. Benutzen Sie dazu einen RSS-Feed-Reader.';
 $lang['Unknown feed identifier'] = 'Feed-ID unbekannt.';
 $lang['User comments'] = 'Benutzerkommentare';
 $lang['Username'] = 'Benutzername';
@@ -144,12 +144,12 @@ $lang['Click here if your browser does not automatically forward you'] = 'Klicke
 $lang['comment date'] = 'Datum des Kommentars';
 $lang['Comment'] = 'Kommentar';
 $lang['Your comment has been registered'] = 'Ihr Kommentar wurde gespeichert.';
-$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Anti-Floot-Sperre: Vor dem Absenden eines weiteren Kommentars bitte kurz warten.';
+$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Anti-Flood-Sperre: Vor dem Absenden eines weiteren Kommentars bitte einen Moment warten.';
 $lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Ihr Kommentar wurde abgelehnt, da er den Validierungsregeln nicht entspricht.';
-$lang['An administrator must authorize your comment before it is visible.'] = 'Ein Administrator muss Ihren Beitrag freischalten, bevor er sichtbar wird.';
+$lang['An administrator must authorize your comment before it is visible.'] = 'Ein Administrator muss Ihren Beitrag freigeben, bevor er sichtbar wird.';
 $lang['This login is already used by another user'] = 'Dieser Benutzername ist bereits vergeben.';
 $lang['Comments'] = 'Kommentare';
-$lang['Add a comment'] = 'Kommentar hinzufügen';
+$lang['Add a comment'] = 'Einen Kommentar hinterlassen';
 $lang['created after %s (%s)'] = 'erstellt nach dem %s (%s)';
 $lang['created before %s (%s)'] = 'erstellt vor dem %s (%s)';
 $lang['created between %s (%s) and %s (%s)'] = 'erstellt zwischen %s (%s) und %s (%s)';
@@ -198,7 +198,7 @@ $lang['Last'] = 'Letzte Seite';
 $lang['Logout'] = 'Abmelden';
 $lang['obligatory'] = 'obligatorisch';
 $lang['display a calendar by creation date'] = 'Fotos nach Aufnahmedatum anzeigen';
-$lang['display all photos in all sub-albums'] = 'Alle Fotos aus allen Unteralben anzeigen';
+$lang['display all photos in all sub-albums'] = 'Alle Fotos aller Unteralben anzeigen';
 $lang['return to normal view mode'] = 'Zurück zur normalen Ansicht';
 $lang['display a calendar by posted date'] = 'Fotos nach Veröffentlichungsdatum anzeigen';
 $lang['month'][10] = 'Oktober';
@@ -220,14 +220,14 @@ $lang['New password'] = 'Neues Passwort';
 $lang['Rate this photo'] = 'Foto bewerten';
 $lang['Next'] = 'Vorwärts';
 $lang['no rate'] = 'noch keine Bewertung';
-$lang['Photos posted within the last %d day.'] = 'Fotos eingestellt im letzten %d Tag.';
-$lang['Photos posted within the last %d days.'] = 'Fotos eingestellt in den letzten %d Tagen.';
+$lang['Photos posted within the last %d day.'] = 'Nur hinzugefügte Fotos des letzten %d Tages.';
+$lang['Photos posted within the last %d days.'] = 'Nur hinzugefügte Fotos der letzten %d Tage.';
 $lang['password updated'] = 'Passwort aktualisiert';
-$lang['Recent period must be a positive integer value'] = 'Der Zeitraum muss eine positive Ganzzahl sein';
+$lang['Recent period must be a positive integer value'] = 'Der Zeitraum muss als positive Ganzzahl definiert werden';
 $lang['photo'] = 'Foto';
 $lang['Click on the photo to see it in high definition'] = 'Klicken Sie auf das Foto, um es in hoher Auflösung zu sehen.';
 $lang['Show file metadata'] = 'Metadaten anzeigen';
-$lang['Powered by'] = 'Betrieben durch';
+$lang['Powered by'] = 'Powered by';
 $lang['Preferences'] = 'Einstellungen';
 $lang['Previous'] = 'Zurück';
 $lang['Random photos'] = 'Zufällige Fotos';
@@ -240,7 +240,7 @@ $lang['display most recent photos'] = 'Die neuesten Fotos anzeigen';
 $lang['Redirection...'] = 'Umleitung...';
 $lang['Please, enter a login'] = 'Bitte geben Sie einen Benutzernamen ein.';
 $lang['login mustn\'t end with a space character'] = 'Benutzername darf nicht mit einem Leerzeichen enden';
-$lang['login mustn\'t start with a space character'] = 'Benutzername darf nicht mit einem Leerzeichen anfangen';
+$lang['login mustn\'t start with a space character'] = 'Benutzername darf nicht mit einem Leerzeichen beginnen';
 $lang['this login is already used'] = 'Dieser Benutzername ist bereits vergeben';
 $lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'E-Mail-Adresse muss dem Muster xxx@yyy.eee (Beispiel: jack@altern.org) entsprechen';
 $lang['Auto login'] = 'Auto-Login';
@@ -272,11 +272,11 @@ $lang['return to the display of all photos'] = 'Zurück zu allen Fotos';
 $lang['the beginning'] = 'Beginn';
 $lang['Thumbnails'] = 'Vorschaubilder';
 $lang['Menu'] = 'Menü';
-$lang['A comment on your site'] = 'Ein Kommentar auf Ihrer Website';
+$lang['A comment on your site'] = 'Ein Kommentar zu Ihrer Fotogalerie';
 $lang['today'] = 'heute';
 $lang['Update your rating'] = 'Ihre Bewertung aktualisieren';
 $lang['the username must be given'] = 'Benutzername fehlt';
-$lang['useful when password forgotten'] = 'Nützlich, wenn Sie ihr Passwort vergessen haben';
+$lang['useful when password forgotten'] = 'Nützlich, wenn Sie Ihr Passwort vergessen haben';
 $lang['Quick search'] = 'Schnellsuche';
 $lang['Connected user: %s'] = 'Angemeldete Benutzer: %s';
 $lang['IP: %s'] = 'IP: %s';
@@ -286,7 +286,7 @@ $lang['Comment: %s'] = 'Kommentar: %s';
 $lang['Comment by %s'] = 'Kommentar von %s';
 $lang['User: %s'] = 'Benutzer: %s';
 $lang['Email: %s'] = 'E-Mail-Adresse: %s';
-$lang['Admin: %s'] = 'Verwaltung: %s';
+$lang['Admin: %s'] = 'Admin: %s';
 $lang['Registration of %s'] = 'Registrierung von %s';
 $lang['Album: %s'] = 'Album: %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Ungültiger »Gast«-Status. Stattdessen wird der Standard-Status verwendet. Bitte informieren Sie den Webmaster.';
@@ -294,19 +294,19 @@ $lang['this email address is already in use'] = 'Diese E-Mail-Adresse wird berei
 $lang['Album results for'] = 'Albumresultate für';
 $lang['Tag results for'] = 'Schlagwortergebnisse für';
 $lang['from %s to %s'] = 'von %s bis %s';
-$lang['Play of slideshow'] = 'Diashow fortsetzen';
+$lang['Play of slideshow'] = 'Diashow abspielen';
 $lang['Pause of slideshow'] = 'Diashow anhalten';
 $lang['Repeat the slideshow'] = 'Diashow wiederholen';
 $lang['Not repeat the slideshow'] = 'Diashow nicht wiederholen';
 $lang['Reduce diaporama speed'] = 'Diashow langsamer';
 $lang['Accelerate diaporama speed'] = 'Diashow schneller';
-$lang['Submit'] = 'Bestätigen';
+$lang['Submit'] = 'Absenden';
 $lang['Yes'] = 'Ja';
 $lang['No'] = 'Nein';
 $lang['%d photo'] = '%d Foto';
 $lang['%d photos'] = '%d Fotos';
-$lang['%d photo is also linked to current tags'] = '%d Foto ist auch mit diesen Schlagwörtern verknüpft';
-$lang['%d photos are also linked to current tags'] = '%d Fotos sind auch mit diesen Schlagwörtern verknüpft';
+$lang['%d photo is also linked to current tags'] = '%d Foto ist ebenfalls mit diesen Schlagwörtern verknüpft';
+$lang['%d photos are also linked to current tags'] = '%d Fotos sind ebenfalls mit diesen Schlagwörtern verknüpft';
 $lang['display photos linked to this tag'] = 'Fotos mit diesem Schlagwort anzeigen';
 $lang['photos posted during the last %d days'] = 'Fotos eingestellt während der letzten %d Tage';
 $lang['Piwigo Help'] = 'Piwigo-Hilfe';
@@ -321,11 +321,11 @@ $lang['Sent by'] = 'Gesendet von';
 $lang['Are you sure?'] = 'Sind Sie sicher?';
 $lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Cookies werden geblockt oder von Ihrem Browser nicht unterstützt. Sie müssen Cookies erlauben, um sich anzumelden.';
 $lang['Edit a comment'] = 'Einen Kommentar bearbeiten';
-$lang['(!) This comment requires validation'] = '(!) Dieser Kommentar muss überprüft werden.';
+$lang['(!) This comment requires validation'] = '(!) Dieser Kommentar erfordert Überprüfung.';
 $lang['Welcome'] = 'Willkommen';
 $lang['Welcome to your Piwigo photo gallery!'] = 'Willkommen!';
 $lang['... or browse your empty gallery'] = '...oder durchstöbern Sie Ihre leere Galerie.';
-$lang['... or please deactivate this message, I will find my way by myself'] = '...oder übergehe diese Meldung. Ich finde mich selbst zurecht.';
+$lang['... or please deactivate this message, I will find my way by myself'] = '...oder diese Meldung übergehen. Ich finde mich selbst zurecht.';
 $lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hallo %s, Ihre Piwigo-Fotogalerie ist leer!';
 $lang['I want to add photos'] = 'Ich möchte Fotos hinzufügen.';
 $lang['Manage this user comment: %s'] = 'Diesen Kommentar bearbeiten: %s';
@@ -335,7 +335,7 @@ $lang['html tags are not allowed in login'] = 'HTML-Tags sind im Benutzernamen n
 $lang['The number of photos per page must be a not null scalar'] = 'Die Anzahl der Fotos pro Seite muss eine Ganzzahl größer Null sein.';
 $lang['Number of photos per page'] = 'Anzahl der Fotos pro Seite';
 $lang['%d rates'] = '%d Bewertungen';
-$lang['Rating score'] = 'Bewertungsstand';
+$lang['Rating score'] = 'Bewertung';
 $lang['Change my password'] = 'Mein Passwort ändern';
 $lang['Check your email for the confirmation link'] = 'Überprüfen Sie Ihr E-Mail-Postfach auf eine E-Mail mit Bestätigungslink.';
 $lang['Enter your new password below.'] = 'Neues Passwort unten eingeben.';
@@ -356,7 +356,7 @@ $lang['You will receive a link to create a new password via email.'] = 'Per E-Ma
 $lang['Your password has been reset'] = 'Ihr Passwort wurde zurückgesetzt.';
 $lang['Edit'] = 'Bearbeiten';
 $lang['Hello %s,'] = 'Hallo %s,';
-$lang['Here are your connection settings'] = 'Das sind Ihre Verbindungseinstellungen:';
+$lang['Here are your connection settings'] = 'Dies sind Ihre Verbindungseinstellungen:';
 $lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Sollten Sie diese E-Mail irrtümlich erhalten haben, setzen Sie sich bitte mit uns in Verbindung: %s.';
 $lang['large'] = 'groß';
 $lang['medium'] = 'mittel';
@@ -364,7 +364,7 @@ $lang['Original'] = 'Original';
 $lang['Password: %s'] = 'Passwort: %s';
 $lang['Send my connection settings by email'] = 'Verbindungseinstellungen per E-Mail senden';
 $lang['small'] = 'klein';
-$lang['Someone requested that the password be reset for the following user account:'] = 'Eine Anfrage zum Zurücksetzen des Passworts für den folgenden Benutzer wurde gestellt:';
+$lang['Someone requested that the password be reset for the following user account:'] = 'Eine Anfrage zum Zurücksetzen des Passworts wurde für den folgenden Benutzer gestellt:';
 $lang['square'] = 'quadratisch';
 $lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'Erfolgreiche Registrierung! Sie erhalten in Kürze eine E-Mail mit Ihren Zugangsdaten. Herzlich Willkommen!';
 $lang['Thank you for registering at %s!'] = 'Danke für Ihre Registrierung bei %s!';
@@ -403,14 +403,14 @@ $lang['Bad request'] = 'Fehlerhafte Anfrage';
 $lang['Forbidden'] = 'Verboten';
 $lang['Page not found'] = 'Seite nicht gefunden.';
 $lang['Permalink for album not found'] = 'Permalink für Album nicht gefunden.';
-$lang['Piwigo encountered a non recoverable error'] = 'Piwigo ist auf einen nicht nachvollziehbaren Fehler gestoßen.';
+$lang['Piwigo encountered a non recoverable error'] = 'Piwigo ist auf einen nicht behebbaren Fehler gestoßen.';
 $lang['Requested album does not exist'] = 'Das gewählte Album existiert nicht.';
 $lang['Requested tag does not exist'] = 'Das gewähltes Schlagwort existiert nicht.';
 $lang['Email address is mandatory'] = 'Email Adresse ist erforderlich';
 $lang['Username is mandatory'] = 'Benutzername ist erforderlich';
 $lang['mandatory'] = 'erforderlich';
-$lang['Website'] = 'Webseite';
-$lang['Your website URL is invalid'] = 'Deine Webseiten URL ist ungültig';
+$lang['Website'] = 'Ihre Webseite';
+$lang['Your website URL is invalid'] = 'Die Webseiten-URL ist ungültig';
 $lang['Email'] = 'E-Mail';
 $lang['First Page'] = 'Erste Seite';
 $lang['Go back to the album'] = 'Zurück zum Album';
@@ -425,4 +425,5 @@ $lang['Photo title'] = 'Bildtitel';
 $lang['Album name, A &rarr; Z'] = 'Albumname, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Albumname, Z &rarr; A';
 $lang['Apply on properties'] = 'Eigenschaften übernehmen';
-$lang['Link: %s'] = 'Adresse: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Adresse: %s';
+$lang['Your authentication key is no longer valid.'] = 'Ihr Authentifizierungs-Schlüssel ist nicht mehr gültig.';
\ No newline at end of file
diff --git a/sources/language/de_DE/help/index.php b/sources/language/de_DE/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/de_DE/help/index.php
+++ b/sources/language/de_DE/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/de_DE/help/photos_add_ftp.html b/sources/language/de_DE/help/photos_add_ftp.html
index 5dcee02..8a0a07b 100644
--- a/sources/language/de_DE/help/photos_add_ftp.html
+++ b/sources/language/de_DE/help/photos_add_ftp.html
@@ -35,29 +35,38 @@
       Die Albenverzeichnisse sind im Piwigo-Verzeichnis "galleries" untergebracht. 
       Im Folgenden ist der Verzeichnisbaum einer kleinen Galerie dargestellt: 
     </p>
-<pre>
+    <pre>
 galleries
-|-- Hochzeit
-|   |-- Trauung
-|   |   |-- Ankunft
-|   |   |   |-- Paul.jpg
-|   |   |   +-- Sarah.jpg
-|   |   +-- Abfahrt
-|   |       +-- Paul-und-Sarah.jpg
-|   +-- Feier
-|       |-- tanzen001.jpg
-|       |-- tanzen002.jpg
-|       +-- tanzen003.jpg
-+-- Flitterwochen
-    |-- Hotel.png
-    |-- Video-aus-dem-Flugzeug.avi
-    +-- pwg_representative
-        +-- Video-aus-dem-Flugzeug.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 </li>
 
 <li>
- Außer dem Verzeichnisse "pwg_representative" erzeugt jedes 
+ Außer dem Verzeichnisse "pwg_representative" und "pwg_format" erzeugt jedes 
  Unterverzeichnis ein neues Album in der Galerie.
  Es kann beliebig viele Unterverzeichnisse (Unteralben) geben.
 </li>
@@ -81,6 +90,8 @@ galleries
    class = "filename">Video-aus-dem-Flugzeug.jpg</span> im Beispiel oben).
 </li>
 
+<li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
 <li>
   <em>Achtung</em>: Der Name für ein Verzeichnis oder eine Datei darf
   nur aus Buchstaben, Zahlen, "-", "_" und "." bestehen. Leerzeichen, Umlaute, "ß" 
diff --git a/sources/language/de_DE/index.php b/sources/language/de_DE/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/de_DE/index.php
+++ b/sources/language/de_DE/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/de_DE/install.lang.php b/sources/language/de_DE/install.lang.php
index c13e35f..18abe5c 100644
--- a/sources/language/de_DE/install.lang.php
+++ b/sources/language/de_DE/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -35,7 +35,7 @@ $lang['User'] = 'Benutzer';
 $lang['user login given by your host provider'] = 'Benutzername Ihrer MySQL-Datenbank (wie von Ihrem Hosting-Provider angegeben)';
 $lang['user password given by your host provider'] = 'Kennwort Ihrer MySQL-Datenbank (wie von Ihrem Hosting-Provider angegeben)';
 $lang['Database name'] = 'Name der Datenbank';
-$lang['also given by your host provider'] = 'Sowie von Ihrem Hosting-Provider bereitgestellt';
+$lang['also given by your host provider'] = '(auch von Ihrem Hosting-Provider bereitgestellt)';
 $lang['Database table prefix'] = 'Präfix der Datenbanktabellen';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'Präfix der Datenbanktabellen-Namen, damit Tabellen einfacher verwaltet werden können';
 $lang['enter a login for webmaster'] = 'Geben Sie den Benutzernamen des Webmasters an';
@@ -50,20 +50,20 @@ $lang['PHP 5 is required'] = 'PHP 5.2 ist erforderlich';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Anscheinend läuft auf Ihrem Server die PHP-Version %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo wird versuchen, Ihre Konfiguration auf PHP 5.2 umzustellen. Zu diesem Zweck wird eine .htaccess-Datei erstellt oder geändert.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Hinweis: Sie können Ihre Konfiguration selbst ändern. Starten Sie Piwigo danach neu.';
-$lang['Try to configure PHP 5'] = 'Es wird versucht PHP 5.2 zu konfigurieren';
+$lang['Try to configure PHP 5'] = 'Es wird versucht, PHP 5.2 zu konfigurieren';
 $lang['Sorry!'] = 'Verzeihung!';
 $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ist nicht in der Lage, PHP 5.2 zu konfigurieren.';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Sie können Kontakt zu ihrem Hosting-Provider aufnehmen und um Unterstützung bitten zur Umstellung auf PHP 5.";
 $lang['Hope to see you back soon.'] = 'Hoffentlich bis bald!';
 $lang['Congratulations, Piwigo installation is completed'] = 'Glückwunsch! Sie haben Piwigo erfolgreich installiert';
-$lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Sie können auch den Text in der Box unten kopieren und in die Datei local/config/database.inc.php einfügen. (Warnung: database.inc.php darf nur reinen Text ohne Zeilenumbrüche und Leerzeichen enthalten)';
-$lang['Creation of config file local/config/database.inc.php failed.'] = 'Die Erstellung der Datei local/config/database.inc.php ist fehlgeschlagen.';
+$lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Sie können auch den Text aus der Box unten kopieren und in die Datei local/config/database.inc.php einfügen. (Warnung: database.inc.php darf nur reinen Text ohne Zeilenumbrüche und Leerzeichen enthalten)';
+$lang['Creation of config file local/config/database.inc.php failed.'] = 'Das Erstellen der Datei local/config/database.inc.php ist fehlgeschlagen.';
 $lang['Download the config file'] = 'Die Konfigurationsdatei herunterladen';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Sie können die Konfigurationsdatei herunterladen und in das Verzeichnis local/config Ihrer Installation hochladen.';
 $lang['Just another Piwigo gallery'] = 'Meine Piwigo-Fotogalerie';
 $lang['Welcome to my photo gallery'] = 'Willkommen!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Besuchen Sie für Hilfe unser Forum: %s';
 $lang['Welcome to your new installation of Piwigo!'] = 'Ihre neue Piwigo-Installation heißt Sie willkommen!';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sie können Kontakt mit Ihrem Provider aufnehmen und um Unterstützung bei der Umstellung auf PHP 5.2 bitten.';
-$lang['localhost or other, supplied by your host provider'] = 'Localhost oder weitere, bereitgestellt durch Ihren Provider';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sie sollten Kontakt mit Ihrem Provider aufnehmen und um Unterstützung bei der Umstellung auf PHP 5.2 bitten.';
+$lang['localhost or other, supplied by your host provider'] = '\'localhost\' oder Name des DB-Servers, bereitgestellt durch Ihren Hosting-Provider';
 $lang['Password ']['confirm'] = 'Kennwort [Bestätigung]';
\ No newline at end of file
diff --git a/sources/language/de_DE/upgrade.lang.php b/sources/language/de_DE/upgrade.lang.php
index 3684ccd..872d0bc 100644
--- a/sources/language/de_DE/upgrade.lang.php
+++ b/sources/language/de_DE/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/dv_MV/common.lang.php b/sources/language/dv_MV/common.lang.php
index c5d6cc8..e70b6eb 100644
--- a/sources/language/dv_MV/common.lang.php
+++ b/sources/language/dv_MV/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Dhivehi [MV]
-Version: 2.5.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=570
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/dv_MV/index.php b/sources/language/dv_MV/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/dv_MV/index.php
+++ b/sources/language/dv_MV/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/el_GR/admin.lang.php b/sources/language/el_GR/admin.lang.php
index b202ae7..661c2cb 100644
--- a/sources/language/el_GR/admin.lang.php
+++ b/sources/language/el_GR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -984,4 +984,13 @@ $lang['between %s and %s MB'] = 'μεταξύ %s και %s MB';
 $lang['based on'] = 'βασισμένο σε';
 $lang['The settings for the guest are from the %s user'] = 'Οι ρυθμίσεις για τους επισκέπτες είναι από το χρήστη %s';
 $lang['No and unlock sub-albums'] = 'Όχι και ξεκλείδωμα υπο-λευκώματα';
-$lang['Upload in progress'] = 'Μεταφόρτωση σε εξέλιξη ';
\ No newline at end of file
+$lang['Upload in progress'] = 'Μεταφόρτωση σε εξέλιξη ';
+$lang['Y Repeat'] = 'Y Επανάληψη';
+$lang['Recipients'] = 'Παραλήπτες';
+$lang['Orphans'] = 'Ορφανά';
+$lang['No user is permitted to see this private album'] = 'Κανένας χρήστης δεν επιτρέπεται να δεί αυτό το ιδιωτικό λεύκωμα';
+$lang['No recipient selected'] = 'Δεν έχει επιλεγεί παραλήπτης';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Για λόγους ασφαλείας, τα πλήκτρα ελέγχου ταυτότητας δεν λειτουργούν για διαχειριστές.';
+$lang['Edit user'] = 'Επεξεργασία χρήστη';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Κάθε email που στέλνεται θα περιέχει το δικό του κλειδί για αυτόματο έλεγχο ταυτότητας της σε συνδέσμους, που ισχύει για το %s.';
+$lang['Delete %d orphan photos'] = 'Διαγραφή %d ορφανών φωτογραφιών';
\ No newline at end of file
diff --git a/sources/language/el_GR/common.lang.php b/sources/language/el_GR/common.lang.php
index 233ae8e..ef3d03b 100644
--- a/sources/language/el_GR/common.lang.php
+++ b/sources/language/el_GR/common.lang.php
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Ελληνικά [GR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=508
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -425,4 +425,5 @@ $lang['Photo description'] = 'Περιγραφή Φωτογραφίας';
 $lang['Apply on properties'] = 'Εφαρμόστε σε ιδιότητες';
 $lang['Album name, Z &rarr; A'] = 'Όνομα Λευκώματος, Ω &rarr; Α';
 $lang['Album name, A &rarr; Z'] = 'Όνομα Λευκώματος, Α &rarr; Ω';
-$lang['Link: %s'] = 'Σύνδεσμος: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Σύνδεσμος: %s';
+$lang['Your authentication key is no longer valid.'] = 'Το κλειδί ταυτοποίησης σας δεν είναι πλέον έγκυρο.';
\ No newline at end of file
diff --git a/sources/language/el_GR/help/photos_add_ftp.html b/sources/language/el_GR/help/photos_add_ftp.html
index e29c2a4..07b1458 100755
--- a/sources/language/el_GR/help/photos_add_ftp.html
+++ b/sources/language/el_GR/help/photos_add_ftp.html
@@ -1,68 +1,79 @@
-<fieldset>
-  <legend>Γρήγορη Εκκίνηση</legend>
-
-<ol>
-  <li>Δημιουργήστε έναν κατάλογο στον υπολογιστή σας.</li>  
-
-  <li>Αντιγράψτε μερικές φωτογραφίες μέσα σε αυτόν τον κατάλογο, κι αλλάξετε το μέγεθός τους για προβολή σε ιστοσελίδες. <em>Προειδοποίηση</em>: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.</li>
-
-  <li>Με τη βοήθεια ενός προγράμματος FTP, αντιγράψτε τον κατάλογό σας στο κατάλογο "galleries" της Piwigo εγκατάστασης σας .</li>
-
-  <li>Συνδεθείτε στη γκαλερί σας και πηγαίνετε στο <span class="pwgScreen">Διαχείριση</span> και κάντε κλικ στο μεγάλο κουμπί Συγχρονισμός.</li>
-</ol>
-
-<p>Συγχαρητήρια! Έχετε δημιουργήσει με επιτυχία το πρώτο λεύκωμα της συλλογής φωτογραφιών σας.</p>
-</fieldset>
-
-<fieldset>
-  <legend>Οργάνωση καταλόγων και αρχείων</legend>
-
-<ul>
-
-  <li>
-
-    <p>Καταλόγοι λευκωμάτων στον κατάλογο "galleries" του Piwigo.
-     Ακολουθεί παρακάτω το δέντρο καταλόγου μιας πολύ μικρής γκαλερί(αλλά
-    με πολλά χαρακτηριστικά γνωρίσματα):</p>
-
-    <pre>
-Γκαλλερί
-|-- γάμος
-|   |-- εορτασμός
-|   |   |-- άφιξη
-|   |   |   |-- paul-alone.jpg
-|   |   |   +-- sarah-alone.jpg
-|   |   +-- αναχώρηση
-|   |       +-- paul-and-sarah.jpg
-|   +-- πάρτυ
-|       |-- dancers001.jpg
-|       |-- dancers002.jpg
-|       +-- dancers003.jpg
-+-- μήνας του μέλιτος
-    |-- hotel.png
-    |-- video-from-plane.avi
-    +-- pwg_representative
-        +-- video-from-plane.jpg
-</pre>
-
-  </li>
-
-  <li>Εκτός από "pwg_representative" (βλέπε τις εξηγήσεις παρακάτω), κάθε κατάλογο κάτω απο το "galleries" παράγει ένα λεύκωμα. Δεν υπάρχει όριο στο βάθος.</li>
-
-  <li>Βασικά, κάθε στοιχείο αντιπροσωπεύεται από ένα αρχείο. Ένα αρχείο μπορεί να είναι ένα
-  στοιχείο Piwigo εάν η επέκταση της είναι μεταξύ <code>file_ext</code> των
-  δυνατότητων παράμετρου διαμόρφωσης(βλέπε <span
-  class="filename">include/config_default.inc.php</span> file). Ένα αρχείο μπορεί
-  να είναι μια εικόνα εάν η επέκταση της είναι μεταξύ <code>picture_ext</code>
-  των δυνατότητων παράμετρου διαμόρφωσης.</li>
-
-  <li>Δεν υπάρχουν στοιχεία φωτογραφία (βίντεο, ήχους, κείμενα αρχείου, ό, τι θέλετε ...) αντιπροσωπεύονται από προεπιλογή από ένα εικονίδιο που αντιστοιχεί στο όνομα επέκτασης αρχείου. Προαιρετικά, μπορείτε να συνδέσετε μια μικρογραφία και ένα αντιπροσωπευτικό αρχείο (βλέπε video.avi στο παραπάνω παράδειγμα).</li>
-
-  <li><em>Προειδοποίηση</em>: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.</li>
-
-  <li>Αφού οι φωτογραφίες είναι σωστά τοποθετημένους
-  καταλόγους, μεταβείτε στη διεύθυνση: <span class="pwgScreen">Διαχείρηση &raquo; Εργαλεία &raquo;
-  Συνγχρονισμός</span></li>
-
-</ul>
-</fieldset>
\ No newline at end of file
+<fieldset>
+  <legend>Γρήγορη Εκκίνηση</legend>
+
+<ol>
+  <li>Δημιουργήστε έναν κατάλογο στον υπολογιστή σας.</li>  
+
+  <li>Αντιγράψτε μερικές φωτογραφίες μέσα σε αυτόν τον κατάλογο, κι αλλάξετε το μέγεθός τους για προβολή σε ιστοσελίδες. <em>Προειδοποίηση</em>: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.</li>
+
+  <li>Με τη βοήθεια ενός προγράμματος FTP, αντιγράψτε τον κατάλογό σας στο κατάλογο "galleries" της Piwigo εγκατάστασης σας .</li>
+
+  <li>Συνδεθείτε στη γκαλερί σας και πηγαίνετε στο <span class="pwgScreen">Διαχείριση</span> και κάντε κλικ στο μεγάλο κουμπί Συγχρονισμός.</li>
+</ol>
+
+<p>Συγχαρητήρια! Έχετε δημιουργήσει με επιτυχία το πρώτο λεύκωμα της συλλογής φωτογραφιών σας.</p>
+</fieldset>
+
+<fieldset>
+  <legend>Οργάνωση καταλόγων και αρχείων</legend>
+
+<ul>
+
+  <li>
+
+    <p>Καταλόγοι λευκωμάτων στον κατάλογο "galleries" του Piwigo.
+     Ακολουθεί παρακάτω το δέντρο καταλόγου μιας πολύ μικρής γκαλερί(αλλά
+    με πολλά χαρακτηριστικά γνωρίσματα):</p>
+
+    <pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
+
+  </li>
+
+  <li>Εκτός από "pwg_representative" and "pwg_format" (βλέπε τις εξηγήσεις παρακάτω), κάθε κατάλογο κάτω απο το "galleries" παράγει ένα λεύκωμα. Δεν υπάρχει όριο στο βάθος.</li>
+
+  <li>Βασικά, κάθε στοιχείο αντιπροσωπεύεται από ένα αρχείο. Ένα αρχείο μπορεί να είναι ένα
+  στοιχείο Piwigo εάν η επέκταση της είναι μεταξύ <code>file_ext</code> των
+  δυνατότητων παράμετρου διαμόρφωσης(βλέπε <span
+  class="filename">include/config_default.inc.php</span> file). Ένα αρχείο μπορεί
+  να είναι μια εικόνα εάν η επέκταση της είναι μεταξύ <code>picture_ext</code>
+  των δυνατότητων παράμετρου διαμόρφωσης.</li>
+
+  <li>Δεν υπάρχουν στοιχεία φωτογραφία (βίντεο, ήχους, κείμενα αρχείου, ό, τι θέλετε ...) αντιπροσωπεύονται από προεπιλογή από ένα εικονίδιο που αντιστοιχεί στο όνομα επέκτασης αρχείου. Προαιρετικά, μπορείτε να συνδέσετε μια μικρογραφία και ένα αντιπροσωπευτικό αρχείο (βλέπε video.avi στο παραπάνω παράδειγμα).</li>
+
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
+  <li><em>Προειδοποίηση</em>: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.</li>
+
+  <li>Αφού οι φωτογραφίες είναι σωστά τοποθετημένους
+  καταλόγους, μεταβείτε στη διεύθυνση: <span class="pwgScreen">Διαχείρηση &raquo; Εργαλεία &raquo;
+  Συνγχρονισμός</span></li>
+
+</ul>
+</fieldset>
diff --git a/sources/language/el_GR/index.php b/sources/language/el_GR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/el_GR/index.php
+++ b/sources/language/el_GR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/el_GR/install.lang.php b/sources/language/el_GR/install.lang.php
index b749253..82c5a9b 100644
--- a/sources/language/el_GR/install.lang.php
+++ b/sources/language/el_GR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -30,14 +30,14 @@ $lang['Password [confirm]'] = "Κωδικός [επιβεβαίωση]";
 $lang['verification'] = "Επιβεβαίωση";
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = "Χρειάζεστε βοήθεια; Ρωτήστε στο <a href=\"%s\">Πίνακα μηνυμάτων του Piwigo</a>.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "Οι επισκέπτες θα μπορούν να χρησιμοποιήσουν αυτό το email για να επικοινωνήσουν με τον διαχειριστή του site";
-$lang['PHP 5 is required'] = "Aπαιτείτε PHP 5";
+$lang['PHP 5 is required'] = 'Aπαιτείτε PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = "Φαίνετται ότι ο webhost τώρα τρέχει PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Το Piwigo θα προσπαθήσει να αλλάξει την διαμόρφωση της PHP 5 δημιουργώντας ή τροποποιώντας ένα .htaccess αρχείο.";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Το Piwigo θα προσπαθήσει να αλλάξει την διαμόρφωση της PHP 5.2 δημιουργώντας ή τροποποιώντας ένα .htaccess αρχείο.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Λάβε υπ' όψη ότι μπορείς να αλλάξεις την διαμόρφωση και να επανεκκινήσεις το Piwigo μετά από αυτό.";
-$lang['Try to configure PHP 5'] = "Προσπάθησε να διαμορφώσεις την PHP 5";
+$lang['Try to configure PHP 5'] = 'Προσπάθησε να διαμορφώσεις την PHP 5.2';
 $lang['Sorry!'] = "Συγγνώμη!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Το Piwigo δεν είναι σε θέση να διαμορφώσει την PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Πρέπει να αναφέρετε στην υποστήριξη του παροχέα ςσας για να διαπιστώσετε πως μπορείτε να αλλάξετε σε PHP 5 μόνοι σας.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Το Piwigo δεν είναι σε θέση να διαμορφώσει την PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Πρέπει να αναφέρετε στην υποστήριξη του παροχέα ςσας για να διαπιστώσετε πως μπορείτε να αλλάξετε σε PHP 5.2 μόνοι σας.';
 $lang['Hope to see you back soon.'] = "Ελπίζουμε να σας δούμε πάλι σύντομα.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Συγχαρητήρια, η εγκατάσταση του Piwigo ολοκληρώθηκε';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Μια εναλλακτική λύση είναι να αντιγράψετε το κείμενο σε στο πλαίσιο παρακάτω και να το επικολλήστε στο αρχείο "local/config/database.inc.php" (Προειδοποίηση : το database.inc.php πρέπει να περιέχει ότι είναι στην περιοχή κειμένου, χωρίς enter ή κενό)';
@@ -64,5 +64,4 @@ $lang['Welcome to your new installation of Piwigo!'] = 'Καλώς ήρθατε
 $lang['also given by your host provider'] = 'Επίσης, δίνεται από την εταιρία φιλοξενίας σας';
 $lang['user login given by your host provider'] = 'Όνομα χρήστη που έχει λάβει από το φορέα υποδοχής σας';
 $lang['user password given by your host provider'] = 'Κωδικός προσβασης χρήστη που έχει λάβει από το φορέα υποδοχής σας';
-$lang['localhost or other, supplied by your host provider'] = 'localhost ή άλλο, που σας παρέχεται από τον πάροχο φιλοξενίας σας';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost ή άλλο, που σας παρέχεται από τον πάροχο φιλοξενίας σας';
\ No newline at end of file
diff --git a/sources/language/el_GR/upgrade.lang.php b/sources/language/el_GR/upgrade.lang.php
index 29b9635..ab5d1ab 100755
--- a/sources/language/el_GR/upgrade.lang.php
+++ b/sources/language/el_GR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_GB/admin.lang.php b/sources/language/en_GB/admin.lang.php
index b6cce5b..94ddda9 100644
--- a/sources/language/en_GB/admin.lang.php
+++ b/sources/language/en_GB/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -160,4 +160,24 @@ $lang['Help Me'] = 'Help me';
 $lang['An error occured during extraction (%s).'] = 'An error occurred during the files (%s) extraction.';
 $lang['An error has occured during upgrade.'] = 'An error has occurred during upgrade.';
 $lang['An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'] = 'An error has occurred during extract. Please check file permissions of your Piwigo installation.<br><a href="%s">Click here to show log error</a>.';
-$lang['Empty caddie'] = 'Empty basket';
\ No newline at end of file
+$lang['Empty caddie'] = 'Empty basket';
+$lang[' and %d virtual'] = ' and %d virtual';
+$lang[' and %d virtuals'] = ' and %d virtual';
+$lang['%d album moved'] = '%d album moved';
+$lang['%d albums moved'] = '%d albums moved';
+$lang['%d anomalies have been detected corrected.'] = '%d anomalies have been detected and corrected.';
+$lang['%d anomalies have been detected.'] = '%d anomalies have been detected.';
+$lang['%d anomalies have been ignored.'] = '%d anomalies have been ignored.';
+$lang['%d anomalies have not been corrected.'] = '%d anomalies have not been corrected.';
+$lang['%d anomaly has been corrected.'] = '%d anomaly has been corrected.';
+$lang['%d anomaly has been detected.'] = '%d anomaly has been detected.';
+$lang['%d anomaly has been ignored.'] = '%d anomaly has been ignored.';
+$lang['%d anomaly has not been corrected.'] = '%d anomaly has not been corrected.';
+$lang['%d association'] = '%d association';
+$lang['%d associations'] = '%d associations';
+$lang['%d day'] = '%d day';
+$lang['%d days'] = '%d days';
+$lang['%d group'] = '%d group';
+$lang['%d groups'] = '%d groups';
+$lang['%d guest'] = '%d guest';
+$lang['%d guests'] = '%d guests';
\ No newline at end of file
diff --git a/sources/language/en_GB/common.lang.php b/sources/language/en_GB/common.lang.php
index f328d25..c6b217f 100644
--- a/sources/language/en_GB/common.lang.php
+++ b/sources/language/en_GB/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: English [GB]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=716
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/en_GB/index.php b/sources/language/en_GB/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/en_GB/index.php
+++ b/sources/language/en_GB/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_GB/install.lang.php b/sources/language/en_GB/install.lang.php
index 8f5d165..8197396 100755
--- a/sources/language/en_GB/install.lang.php
+++ b/sources/language/en_GB/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_UK/admin.lang.php b/sources/language/en_UK/admin.lang.php
index 3312822..ba13047 100644
--- a/sources/language/en_UK/admin.lang.php
+++ b/sources/language/en_UK/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -435,7 +435,7 @@ $lang['Installed Themes'] = "Installed Themes";
 $lang['Instructions to use Piwigo'] = "Instructions to use Piwigo";
 $lang['Invert'] = 'Invert';
 $lang['IP'] = "IP";
-$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.';
+$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto is the default photo manager on MacOSX. The Piwigo export plugin lets you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.';
 $lang['jump to album'] = "jump to album";
 $lang['jump to photo'] = "jump to photo";
 $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = "Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will be sent emails when a new release is available (sometimes including a security bug fix, it is important to know and upgrade) and when major events happen to the project. Only a few emails a year.";
@@ -931,6 +931,7 @@ $lang['wrong filename'] = "wrong filename";
 $lang['X Position'] = 'X Position';
 $lang['X Repeat'] = 'X Repeat';
 $lang['Y Position'] = 'Y Position';
+$lang['Y Repeat'] = 'Y Repeat';
 $lang['Year'] = "Year";
 $lang['You are running on development sources, no check possible.'] = "You are running on development sources, no check possible.";
 $lang['You are running the latest version of Piwigo.'] = "You are running Piwigo latest version.";
@@ -980,4 +981,12 @@ $lang['based on'] = 'based on';
 $lang['file name'] = 'file name';
 $lang['date & time'] = 'date & time';
 $lang['width & height'] = 'width & height';
-$lang['Upload in progress'] = 'Upload in progress';
\ No newline at end of file
+$lang['Upload in progress'] = 'Upload in progress';
+$lang['Orphans'] = 'Orphans';
+$lang['Delete %d orphan photos'] = 'Delete %d orphan photos';
+$lang['Edit user'] = 'Edit user';
+$lang['Recipients'] = 'Recipients';
+$lang['No recipient selected'] = 'No recipient selected';
+$lang['No user is permitted to see this private album'] = 'No user is permitted to see this private album';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Each email sent will contain its own automatic authentication key on links, valid for %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'For security reason, authentication keys do not work for administrators.';
\ No newline at end of file
diff --git a/sources/language/en_UK/common.lang.php b/sources/language/en_UK/common.lang.php
index 512cbad..30de664 100644
--- a/sources/language/en_UK/common.lang.php
+++ b/sources/language/en_UK/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: English [UK]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=417
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -425,4 +425,5 @@ $lang['Photo description'] = 'Photo description';
 $lang['Album name, A &rarr; Z'] = 'Album name, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Album name, Z &rarr; A';
 $lang['Link: %s'] = 'Link: %s';
+$lang['Your authentication key is no longer valid.'] = 'Your authentication key is no longer valid.';
 ?>
\ No newline at end of file
diff --git a/sources/language/en_UK/help/index.php b/sources/language/en_UK/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/en_UK/help/index.php
+++ b/sources/language/en_UK/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_UK/help/photos_add_ftp.html b/sources/language/en_UK/help/photos_add_ftp.html
index 3d39f1e..ce90aeb 100644
--- a/sources/language/en_UK/help/photos_add_ftp.html
+++ b/sources/language/en_UK/help/photos_add_ftp.html
@@ -39,15 +39,24 @@ galleries
 |       |-- dancers002.jpg
 |       +-- dancers003.jpg
 +-- honeymoon
-    |-- hotel.png
-    |-- video-from-plane.avi
-    +-- pwg_representative
-        +-- video-from-plane.jpg
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
+  <li>Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
 
   <li>Basically, an element is represented by a file. A file can be a
   Piwigo element if its extension is among <code>file_ext</code>
@@ -56,10 +65,12 @@ galleries
   be a picture if its extension is among <code>picture_ext</code>
   configuration parameter possibilities.</li>
 
-  <li>No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
+  <li>Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
   extension. Optionally, you can associate a thumbnail and a representative
   file (see video.avi in the example above).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Warning</em>: the name of directories and files must contain only letters, figures, "-", "_" or ".". No blank space, nor accentuated characters.</li>
 
   <li>Once photos are correctly placed in the
diff --git a/sources/language/en_UK/help/quick_search.html b/sources/language/en_UK/help/quick_search.html
index 717c09a..d78652a 100644
--- a/sources/language/en_UK/help/quick_search.html
+++ b/sources/language/en_UK/help/quick_search.html
@@ -67,6 +67,13 @@
 <q>file:DSC_</q></td>
 </tr>
 
+<tr>
+<td><q>author:</q>
+</td>
+<td>Searches by author.<br>
+<q>author:John</q></td>
+</tr>
+
 <tr>
 <td><q>created:</q><br>
 <q>taken:</q>
diff --git a/sources/language/en_UK/index.php b/sources/language/en_UK/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/en_UK/index.php
+++ b/sources/language/en_UK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_UK/install.lang.php b/sources/language/en_UK/install.lang.php
index 17f94e1..a8da0a8 100644
--- a/sources/language/en_UK/install.lang.php
+++ b/sources/language/en_UK/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -47,14 +47,14 @@ $lang['Password [confirm]'] = "Password [confirm]";
 $lang['verification'] = "verification";
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Need help? Ask your question on the <a href="%s">Piwigo message board</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Visitors will be able to use this email to contact the site administrator';
-$lang['PHP 5 is required'] = "PHP 5 is required";
+$lang['PHP 5 is required'] = 'PHP 5.2 is required';
 $lang['It appears your webhost is currently running PHP %s.'] = "It appears your webhost is currently running PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo may try to switch your configuration to PHP 5.2 by creating or modifying a .htaccess file.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note you can change your configuration by yourself and then restart Piwigo.';
-$lang['Try to configure PHP 5'] = "Try to configure PHP 5";
+$lang['Try to configure PHP 5'] = 'Try to configure PHP 5.2';
 $lang['Sorry!'] = "Sorry!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo was not able to configure PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "You should refer to your hosting provider's support and see how you can switch to PHP 5 by yourself.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo was not able to configure PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'You should refer to your hosting provider\'s support and see how you can switch to PHP 5.2 by yourself.';
 $lang['Hope to see you back soon.'] = "Hope to see you back soon.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Congratulations, Piwigo installation is completed';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning: database.inc.php must only contain what is in the textarea, no line return or space character)';
@@ -64,5 +64,4 @@ $lang['You can download the config file and upload it to local/config directory
 $lang['Just another Piwigo gallery'] = 'Just another Piwigo gallery';
 $lang['Welcome to my photo gallery'] = 'Welcome to my photo gallery';
 $lang['Welcome to your new installation of Piwigo!'] = 'Welcome to your new installation of Piwigo!';
-$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Don\'t hesitate to consult our forums for any help: %s';
-?>
\ No newline at end of file
+$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Don\'t hesitate to consult our forums for any help: %s';
\ No newline at end of file
diff --git a/sources/language/en_UK/upgrade.lang.php b/sources/language/en_UK/upgrade.lang.php
index 3d40fce..f279fe6 100644
--- a/sources/language/en_UK/upgrade.lang.php
+++ b/sources/language/en_UK/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_US/admin.lang.php b/sources/language/en_US/admin.lang.php
index fec4125..d8c873d 100644
--- a/sources/language/en_US/admin.lang.php
+++ b/sources/language/en_US/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_US/common.lang.php b/sources/language/en_US/common.lang.php
index 0c442e4..f21487f 100644
--- a/sources/language/en_US/common.lang.php
+++ b/sources/language/en_US/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: English [US]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=717
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/en_US/index.php b/sources/language/en_US/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/en_US/index.php
+++ b/sources/language/en_US/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/eo_EO/admin.lang.php b/sources/language/eo_EO/admin.lang.php
index db18ea4..b9e71fb 100644
--- a/sources/language/eo_EO/admin.lang.php
+++ b/sources/language/eo_EO/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/eo_EO/common.lang.php b/sources/language/eo_EO/common.lang.php
index 49346d1..22fc3d8 100644
--- a/sources/language/eo_EO/common.lang.php
+++ b/sources/language/eo_EO/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Esperanto [EO]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=596
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/eo_EO/help/help_misc.html b/sources/language/eo_EO/help/help_misc.html
new file mode 100644
index 0000000..77ab2dd
--- /dev/null
+++ b/sources/language/eo_EO/help/help_misc.html
@@ -0,0 +1,9 @@
+<p>Post kreado de via galerio eblas al vi agordi ĝin por viaj vizitontoj
+<ul>
+	<li>La apriora montro kiel vi deziras en <span class="pwgScreen">Administrado &raquo; Agordoj &raquo; Elektebloj</span> langeto <span class="pwgScreen">Agordoj de invitito</span></li>
+	<li>La apriora temo en <span class="pwgScreen">Administrado &raquo; Agordoj &raquo; Temoj</span></li>
+	<li>La apriora lingvo en <span class="pwgScreen">Administrado &raquo; Agordoj &raquo; Lingvoj</span></li>
+ </ul>
+ Apriore, ĉiu nova uzanto ricevos tiujn ecojn je registriĝo.
+</p>
+<p>Se vi havas iun ajn demandon, Piwigo-komunumo bonvenigos vin ĉe <a href="http://piwigo.org/forum">ĝia forumo</a>.</p>
\ No newline at end of file
diff --git a/sources/language/eo_EO/install.lang.php b/sources/language/eo_EO/install.lang.php
index 7a80237..b544c84 100755
--- a/sources/language/eo_EO/install.lang.php
+++ b/sources/language/eo_EO/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -27,10 +27,10 @@ $lang['user login given by your host provider'] = 'uzanto-salutnomo provizita de
 $lang['please enter your password again'] = 'bonvolu tajpi vian pasvorton denove';
 $lang['enter a login for webmaster'] = 'entajpu retestran salutnomon';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'per ĝi, prefiksoj aldoniĝos sur la nomojn de la datumtabelo (ebligas al vi pli bone mastrumi viajn tabelojn)';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Vi devus vin direkti al la subtenoservo de via provizanto de gastigo, kaj serĉi kiel vi mem povas interŝanĝi al PHP 5.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Vi devus vin direkti al la subtenoservo de via provizanto de gastigo, kaj serĉi kiel vi mem povas interŝanĝi al PHP 5.2';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Vi povas elŝuti la agordan dosieron kaj alŝuti ĝin al la dosierujo "local/config" dum via instalado.';
 $lang['Just another Piwigo gallery'] = 'Nur alia bildogalerio ĉe Piwigo';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Eblas, ke Piwigo provos interŝanĝi vian agordon al PHP 5 kreante aŭ modifiante iun .htaccess-dosieron.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Eblas, ke Piwigo provos interŝanĝi vian agordon al PHP 5.2 kreante aŭ modifiante iun .htaccess-dosieron.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Notu, ke eblas ŝanĝi vian agordon mem kaj poste restartigi Piwigo.';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Gardu ĝin sekreta, ĝi ebligas al vi aliri la administran panelon';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Ĝi montriĝos al vizitantoj. Necesas por reteja administrado';
@@ -38,16 +38,16 @@ $lang['It appears your webhost is currently running PHP %s.'] = 'Ŝajnas, ke via
 $lang['Welcome to your new installation of Piwigo!'] = 'Bonvenon al via nova instalado de Piwigo!';
 $lang['also given by your host provider'] = 'ankaŭ provizita de via provizanto de gastigo';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Ĉu vi bezonas helpon? Starigu demandon ĉe la <a href="%s">mesaĝtabulo de Piwigo</a>.';
-$lang['Try to configure PHP 5'] = 'Provu agordi PHP 5';
+$lang['Try to configure PHP 5'] = 'Provu agordi PHP 5.2';
 $lang['Sorry!'] = 'Pardonu!';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'La vizitantoj povos uzi tiun retadreson por kontakti la retestron';
 $lang['Welcome to my photo gallery'] = 'Bonvenon al mia foto-galerio';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ne kapablis agordi PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ne kapablis agordi PHP 5.2';
 $lang['verification'] = 'kontrolado';
 $lang['Hope to see you back soon.'] = 'Ĝis baldaŭa vizito via.';
 $lang['Start Install'] = 'Komenci la instaladon';
 $lang['Password ']['confirm'] = 'Pasvorto [konfirmu]';
-$lang['PHP 5 is required'] = 'Necesas PHP 5';
+$lang['PHP 5 is required'] = 'Necesas PHP 5.2';
 $lang['User'] = 'Uzanto';
 $lang['Download the config file'] = 'Elŝuti la agordan dosieron';
 $lang['Database table prefix'] = 'Prefikso de datumtabeloj';
@@ -64,5 +64,4 @@ $lang['Congratulations, Piwigo installation is completed'] = 'Gratulon, la insta
 $lang['Can\'t connect to server'] = 'Ne eblas konekti kun la servilo';
 $lang['Basic configuration'] = 'Baza agordo';
 $lang['Admin configuration'] = 'Administra agordo';
-$lang['localhost or other, supplied by your host provider'] = 'loka gasto (localhost) aŭ alia, provizita de via provizanto de gastigo';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'loka gasto (localhost) aŭ alia, provizita de via provizanto de gastigo';
\ No newline at end of file
diff --git a/sources/language/eo_EO/upgrade.lang.php b/sources/language/eo_EO/upgrade.lang.php
index 4200e8d..e681cf3 100755
--- a/sources/language/eo_EO/upgrade.lang.php
+++ b/sources/language/eo_EO/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_AR/common.lang.php b/sources/language/es_AR/common.lang.php
index 4ee6593..393e726 100644
--- a/sources/language/es_AR/common.lang.php
+++ b/sources/language/es_AR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Argentina [AR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=418
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -421,4 +421,10 @@ $lang['%d photos per page'] = '%d fotos por página';
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Falta confirmación de su contraseña. Por favor confirme la contraseña elegida.';
 $lang['Password is missing. Please enter the password.'] = 'Falta la contraseña. Por favor escriba su contraseña';
 $lang['Theme'] = 'Tema';
-?>
\ No newline at end of file
+$lang['Album name, A &rarr; Z'] = 'Nombre del álbum, A &rarr; Z';
+$lang['Album name, Z &rarr; A'] = 'Nombre del álbum, Z &rarr; A';
+$lang['Apply on properties'] = 'Aplicar a las propiedades';
+$lang['Link: %s'] = 'Enlace: %s';
+$lang['No results for'] = 'No hay resultados para';
+$lang['Photo description'] = 'Descripción de la foto';
+$lang['Photo title'] = 'Título de la foto';
\ No newline at end of file
diff --git a/sources/language/es_AR/index.php b/sources/language/es_AR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/es_AR/index.php
+++ b/sources/language/es_AR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_ES/admin.lang.php b/sources/language/es_ES/admin.lang.php
index 4a19bdd..1ea8205 100644
--- a/sources/language/es_ES/admin.lang.php
+++ b/sources/language/es_ES/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -980,4 +980,13 @@ $lang['between %s and %s MB'] = 'entre %s y %s MB';
 $lang['based on'] = 'basada en ';
 $lang['Upload in progress'] = 'Carga en proceso';
 $lang['The settings for the guest are from the %s user'] = 'Los ajustes para el cliente son del usuario %s';
-$lang['No and unlock sub-albums'] = 'No, y desbloquear los subálbumes';
\ No newline at end of file
+$lang['No and unlock sub-albums'] = 'No, y desbloquear los subálbumes';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada email enviado contendrá las claves de autenticación automáticas en el enlace, validas para %s.';
+$lang['Delete %d orphan photos'] = 'Borrar %d fotos huérfanas';
+$lang['Edit user'] = 'Editar usuario';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Por razones de seguridad, las claves de autenticación no funcionan para administradores.';
+$lang['No recipient selected'] = 'No se ha seleccionado ningún recipiente.';
+$lang['No user is permitted to see this private album'] = 'Ningún usuario puede ver este álbum privado.';
+$lang['Orphans'] = 'Huérfanas';
+$lang['Recipients'] = 'Recipiente';
+$lang['Y Repeat'] = 'Repetir Y';
\ No newline at end of file
diff --git a/sources/language/es_ES/common.lang.php b/sources/language/es_ES/common.lang.php
index 3da25c9..faf36de 100644
--- a/sources/language/es_ES/common.lang.php
+++ b/sources/language/es_ES/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Español [ES]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=169
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -433,4 +433,5 @@ $lang['Photo description'] = 'Descripción de la foto';
 $lang['Photo title'] = 'Título de la foto';
 $lang['Album name, Z &rarr; A'] = 'Nombre del album, Z &rarr; A';
 $lang['Album name, A &rarr; Z'] = 'Nombre del album, A &rarr; Z';
-$lang['Link: %s'] = 'Enlace: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Enlace: %s';
+$lang['Your authentication key is no longer valid.'] = 'Su clave de autenticación no es válida.';
\ No newline at end of file
diff --git a/sources/language/es_ES/help/index.php b/sources/language/es_ES/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/es_ES/help/index.php
+++ b/sources/language/es_ES/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_ES/help/photos_add_ftp.html b/sources/language/es_ES/help/photos_add_ftp.html
index 9bc1dda..7c6babc 100644
--- a/sources/language/es_ES/help/photos_add_ftp.html
+++ b/sources/language/es_ES/help/photos_add_ftp.html
@@ -15,29 +15,40 @@
 			<p>Cada álbum se representa por una carpeta dentro del directorio "galleries". 
 			He aquí un ejemplo del árbol de directorios de una galería muy pequeña (pero
 			utilizando muchas características):</p>
-			<pre>
-			galleries
-			|-- boda
-			|   |-- celebracion
-			|   |   |-- llegada
-			|   |   |   |-- paul-solo.jpg
-			|   |   |   +-- sara-sola.jpg
-			|   |   +-- salida
-			|   |       +-- paul-y-sara.jpg
-			|   +-- fiesta
-			|       |-- baile001.jpg
-			|       |-- baile002.jpg
-			|       +-- baile003.jpg
-			+-- luna-de-miel
-				|-- hotel.png
-				|-- video-desde-el-avion.avi
-				+-- pwg_representative
-					+-- video-desde-el-avion.jpg
-			</pre>
+    <pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 		</li>
-		<li>A excepción de "pwg_representative" (ver explicaciones debajo), cada subdirectorio de "galleries" genera un álbum. No hay limite de profundidad en cuanto el número de subniveles a crear.</li>
+		<li>A excepción de "pwg_representative" o "pwg_format" (ver explicaciones debajo), cada subdirectorio de "galleries" genera un álbum. No hay limite de profundidad en cuanto el número de subniveles a crear.</li>
 		<li>Fundamentalmente, cada elemento es representado por un archivo. Piwigo sólo reconocerá los archivos cuyas extensiones figuren en los parámetros de configuración <code>file_ext</code> (Ver archivo <span class="filename">include/config_default.inc.php</span>). Para Piwigo, un archivo de imagen será reconocido como una imagen sólo si su extensión se encuentra dentro de los parámetros de configuración <code>picture_ext</code>.</li>
 		<li>Los elementos que no son imágenes (vídeos, sonidos, archivos de texto, todo lo que quieras...) son representados de forma predeterminada por iconos que corresponden a la extensión cada archivo. Opcionalmente, puedes asociar una miniatura y un archivo de representación (ver video.avi en el ejemplo anterior).</li>
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
 		<li>Una vez todas las fotos estén organizadas y correctamente situadas en sus correspondientes carpetas, ir a <span class="pwgScreen">Administración &raquo; Herramientas &raquo; Sincronizar</span>.</li>
 	</ul>
 </fieldset>
diff --git a/sources/language/es_ES/index.php b/sources/language/es_ES/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/es_ES/index.php
+++ b/sources/language/es_ES/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_ES/install.lang.php b/sources/language/es_ES/install.lang.php
index 84283b4..147a4a9 100644
--- a/sources/language/es_ES/install.lang.php
+++ b/sources/language/es_ES/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Contraseña [Confirmar]';
 $lang['verification'] = 'Comprobación';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = '¿ Necesidad de ayuda? Plantee su pregunta sobre él <a href="%s">foro de Piwigo</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Los visitantes podrán ponerse en contacto con usted por este mail';
-$lang['PHP 5 is required'] = 'PHP 5  requerido';
+$lang['PHP 5 is required'] = 'PHP 5.2  requerido';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Aparentemente, la versión PHP de su alojador web es PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va a tratar de pasar en PHP 5 creando o modificando el fichero .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va a tratar de pasar en PHP 5.2 creando o modificando el fichero .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note que usted mismo puede cambiar la configuración PHP y volver a lanzar  Piwigo después.';
-$lang['Try to configure PHP 5'] = 'Trate de configurar PHP 5';
+$lang['Try to configure PHP 5'] = 'Trate de configurar PHP 5.2';
 $lang['Sorry!'] = 'Lo siento!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo no pudo configurar PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo no pudo configurar PHP 5.2';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = 'Usted debe ponerse en contacto con su alojador web con el fin de saber cómo configurar PHP 5';
 $lang['Hope to see you back soon.'] = 'Esperando verle  muy pronto...';
 $lang['Congratulations, Piwigo installation is completed'] = 'Félicitation, Piwigo está completamente instalado';
@@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Bienvenido a mi galería de fotos';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'No dudes en escribir en nuestros foros para cualquier duda: %s';
 $lang['Welcome to your new installation of Piwigo!'] = '¡Bienvenid@ a la instalación de Piwigo!';
 $lang['localhost or other, supplied by your host provider'] = 'host local o de otro tipo, suministrado por el proveedor de alojamiento';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Usted debe ponerse en contacto con su alojador web con el fin de saber cómo configurar PHP 5.2';
\ No newline at end of file
diff --git a/sources/language/es_ES/upgrade.lang.php b/sources/language/es_ES/upgrade.lang.php
index fba1f4d..e8d5f97 100644
--- a/sources/language/es_ES/upgrade.lang.php
+++ b/sources/language/es_ES/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_MX/common.lang.php b/sources/language/es_MX/common.lang.php
index 7da98db..a0cb277 100644
--- a/sources/language/es_MX/common.lang.php
+++ b/sources/language/es_MX/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: México [MX]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=726
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/es_MX/install.lang.php b/sources/language/es_MX/install.lang.php
index 2076f34..ebc52c1 100644
--- a/sources/language/es_MX/install.lang.php
+++ b/sources/language/es_MX/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/et_EE/admin.lang.php b/sources/language/et_EE/admin.lang.php
index 6f1d22b..8a229b4 100644
--- a/sources/language/et_EE/admin.lang.php
+++ b/sources/language/et_EE/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/et_EE/common.lang.php b/sources/language/et_EE/common.lang.php
index 8f74406..7c149d0 100644
--- a/sources/language/et_EE/common.lang.php
+++ b/sources/language/et_EE/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Estonian [EE]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=569
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/et_EE/install.lang.php b/sources/language/et_EE/install.lang.php
index 45e9d91..e4bd314 100755
--- a/sources/language/et_EE/install.lang.php
+++ b/sources/language/et_EE/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -40,21 +40,21 @@ $lang['It appears your webhost is currently running PHP %s.'] = 'Paistab, et su
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Seda näidetakse külastajatele ning on vajalik veebilehe haldamiseks';
 $lang['Just another Piwigo gallery'] = 'Lihtsalt veel üks järjekordne Piwigo gallerii';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Hoia seda salaja, sellega saad lehekülje haldurisse sisse';
-$lang['PHP 5 is required'] = 'Vajatakse PHP versiooni 5';
+$lang['PHP 5 is required'] = 'Vajatakse PHP versiooni 5.2';
 $lang['Password ']['confirm'] = 'Kinnita parooli';
 $lang['Sorry!'] = 'Vabandust!';
 $lang['Start Install'] = 'Alusta paigaldamist';
-$lang['Try to configure PHP 5'] = 'Proovi häälestada PHP 5';
+$lang['Try to configure PHP 5'] = 'Proovi häälestada PHP 5.2';
 $lang['User'] = 'Kasutaja';
 $lang['Welcome to my photo gallery'] = 'Tere tulemast mu fotogalleriisse';
 $lang['Welcome to your new installation of Piwigo!'] = 'Tere tulemast äsja installitud Piwigosse!';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Sa võid laadida häälestusfaili alla ja ise paigaldada selle oma "local/config" kaustasse.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sa peaksid küsima oma veebimajutuse teenusepakkuja käest, kas on võimalik minna üle PHP versioonile 5.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sa peaksid küsima oma veebimajutuse teenusepakkuja käest, kas on võimalik minna üle PHP versioonile 5.2';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Muidugi kasuta meie foorumeid abi leidmiseks: %s';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Vajad abi? Küsi <a href="%s">Piwigo abilauast</a>.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Sa võid teha muudatusi seadistusfailis ja pärast ümberkäivitada Piwigo.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo oskab ise proovida seadistada PHP 5, seadistades selleks .htaccess faili.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ei suutnud seadistada PHP 5 kasutamist.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo oskab ise proovida seadistada PHP 5.2, seadistades selleks .htaccess faili.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ei suutnud seadistada PHP 5.2 kasutamist.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Külalised võivad kasutada seda epost-aadressi et ühendust võtta administraatoriga';
 $lang['also given by your host provider'] = 'samuti antud veebimajutuse teenusepakkuja poolt';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'andmebaasi tabelite nimed alustatakse selle eesliitega (see hõlpsustab tabelite korraspidamist samas andmebaasis)';
@@ -64,5 +64,4 @@ $lang['user login given by your host provider'] = 'veebimajutuse kasutajanimi';
 $lang['user password given by your host provider'] = 'veebimajutuse parool';
 $lang['verification'] = 'kinnitamine';
 $lang['webmaster login can\'t contain characters \' or "'] = 'veebimeistri kasutajanimi ei saa sisaldada jutumärke';
-$lang['localhost or other, supplied by your host provider'] = 'localhost või teised, antud teenusepakkuja poolt';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost või teised, antud teenusepakkuja poolt';
\ No newline at end of file
diff --git a/sources/language/et_EE/upgrade.lang.php b/sources/language/et_EE/upgrade.lang.php
index b9c12e6..d142c60 100755
--- a/sources/language/et_EE/upgrade.lang.php
+++ b/sources/language/et_EE/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/eu_ES/common.lang.php b/sources/language/eu_ES/common.lang.php
index fcca4c0..2a94520 100644
--- a/sources/language/eu_ES/common.lang.php
+++ b/sources/language/eu_ES/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Euskara [ES]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=725
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/fa_IR/admin.lang.php b/sources/language/fa_IR/admin.lang.php
index c395c53..1fec7ef 100644
--- a/sources/language/fa_IR/admin.lang.php
+++ b/sources/language/fa_IR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -983,4 +983,13 @@ $lang['file name'] = 'نامِ فایل';
 $lang['width & height'] = 'بلندا و پهنا';
 $lang['Empty caddie'] = 'خالی کردنِ سبد';
 $lang['No and unlock sub-albums'] = 'خیر و زیرآلبوم‌ها را باز کن';
-$lang['The settings for the guest are from the %s user'] = 'تنظیماتِ مهمان‌ها از کاربر %s گرفته می‌شود';
\ No newline at end of file
+$lang['The settings for the guest are from the %s user'] = 'تنظیماتِ مهمان‌ها از کاربر %s گرفته می‌شود';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'هر ایمیلی که فرستاده می‌شود، به طور خودکار دارای یک کلید احراز هویت مخصوص بوده که برای %s معتبر است.';
+$lang['Edit user'] = 'ویرایش کاربر';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'به دلایل امنیتی، کلیدهای احراز هویت برای مدیران فعال نیست.';
+$lang['No recipient selected'] = 'دریافت کننده‌ای انتخاب نشده است';
+$lang['No user is permitted to see this private album'] = 'هیچ کاربری اجازه‌ی دیدن این آلبوم شخصی را ندارد';
+$lang['Recipients'] = 'دریافت کنندگان';
+$lang['Y Repeat'] = 'تکرار در محور Y';
+$lang['Delete %d orphan photos'] = 'پاک کردنِ %d عکس بی‌ریشه';
+$lang['Orphans'] = 'بی‌ریشه‌ها';
\ No newline at end of file
diff --git a/sources/language/fa_IR/common.lang.php b/sources/language/fa_IR/common.lang.php
index 035e450..6b5e403 100644
--- a/sources/language/fa_IR/common.lang.php
+++ b/sources/language/fa_IR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: پارسی [IR]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=419
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -431,4 +431,5 @@ $lang['Photo title'] = 'عنوانِ عکس';
 $lang['Album name, A &rarr; Z'] = 'نام آلبوم، به ترتیب حروف الفبا';
 $lang['Album name, Z &rarr; A'] = 'نام آلبوم، برعکسِ حروف الفبا';
 $lang['Apply on properties'] = 'تایید مشخصات';
-$lang['Link: %s'] = 'لینک: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'لینک: %s';
+$lang['Your authentication key is no longer valid.'] = 'کلید احراز هویت شما نامعتبر بوده و باید دوباره ارسال شود.';
\ No newline at end of file
diff --git a/sources/language/fa_IR/index.php b/sources/language/fa_IR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/fa_IR/index.php
+++ b/sources/language/fa_IR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fa_IR/install.lang.php b/sources/language/fa_IR/install.lang.php
index 26f0aeb..25b0c74 100644
--- a/sources/language/fa_IR/install.lang.php
+++ b/sources/language/fa_IR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "تاييد گذرواژه";
 $lang['verification'] = 'تأیید';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'به کمک نیاز دارید ؟ پرسش خود را در <a href="%s">تالارهای پشتیبانی Piwigo</a> مطرح نمایید.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'بازدیدکنندگان می توانند بوسیله ی این ایمیل با مدیرکل ارتباط برقرار کنند';
-$lang['PHP 5 is required'] = 'نگارش پنجم PHP لازم است';
+$lang['PHP 5 is required'] = 'نگارش پنجم PHP 5.2 لازم است';
 $lang['It appears your webhost is currently running PHP %s.'] = 'به نظر می رسد هاست شما دارای نگارش PHP %s باشد.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo می‌تواند تنظیمات PHP شما را با ایجاد یا ویرایش یک فایل .htaccess به PHP 5 تغییر دهد.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo می‌تواند تنظیمات PHP شما را با ایجاد یا ویرایش یک فایل .htaccess به PHP 5.2 تغییر دهد.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'شما می توانید خودتان تنظیمات را تغییر دهید و Piwigo را دوباره راه اندازی کنید.';
-$lang['Try to configure PHP 5'] = 'در حال تنظیم PHP 5';
+$lang['Try to configure PHP 5'] = 'در حال تنظیم PHP 5.2';
 $lang['Sorry!'] = "شرمنده!";
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo قادر به پیکربندی PHP 5 نیست.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'شما باید با سرویس دهنده ی هاست خود تماس گرفته و از آنها بپرسید که چگونه می توانید تنظیمات خود را به PHP 5 تغییر دهید.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo قادر به پیکربندی PHP 5.2 نیست.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'شما باید با سرویس دهنده ی هاست خود تماس گرفته و از آنها بپرسید که چگونه می توانید تنظیمات خود را به PHP 5.2 تغییر دهید.';
 $lang['Hope to see you back soon.'] = 'به امید دیدار دوباره ی شما.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Piwigo با موفقیت نصب شد';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'یک راه دیگر این است که شما متن بالا را کپی کنید و بدون اضافه یا کم کردن حتی یک حرف ،آن را در آدرس : "local/config/database.inc.php" قرار دهید';
@@ -65,5 +65,4 @@ $lang['Just another Piwigo gallery'] = 'یک گالری دیگر با Piwigo';
 $lang['Password ']['confirm'] = 'تأیید گذرواژه';
 $lang['Welcome to my photo gallery'] = 'به گالری عکس من خوش آمدید';
 $lang['Welcome to your new installation of Piwigo!'] = 'به گالری Piwigo ی خود خوش آمدید!';
-$lang['localhost or other, supplied by your host provider'] = 'localhost یا ادرس دیگر ، این را باید از هاست دریافت نمایید(در حالت معمول localhost میباشد)';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost یا ادرس دیگر ، این را باید از هاست دریافت نمایید(در حالت معمول localhost میباشد)';
\ No newline at end of file
diff --git a/sources/language/fa_IR/upgrade.lang.php b/sources/language/fa_IR/upgrade.lang.php
index 30f67f4..8a5b08b 100644
--- a/sources/language/fa_IR/upgrade.lang.php
+++ b/sources/language/fa_IR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fi_FI/admin.lang.php b/sources/language/fi_FI/admin.lang.php
index d71b408..27d3d86 100755
--- a/sources/language/fi_FI/admin.lang.php
+++ b/sources/language/fi_FI/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -517,4 +517,54 @@ $lang['Language has been successfully installed'] = 'Kielipaketti asennettiin on
 $lang['Hour'] = 'Tunti';
 $lang['Inactive Languages'] = 'Inaktiiviset kielet';
 $lang['Inactive Plugins'] = 'Inaktiiviset liitännäiset';
-$lang['Inactive Themes'] = 'Inaktiiviset teemat';
\ No newline at end of file
+$lang['Inactive Themes'] = 'Inaktiiviset teemat';
+$lang['Failed to write file to disk'] = 'Levylle kirjoittaminen epäonnistui';
+$lang['Features include gallery browsing, album creation and photo upload.'] = 'Toiminnallisuuksiin kuuluu gallerian selaaminen, albumien luominen ja kuvien siirtäminen';
+$lang['File/directory read error'] = 'Tiedoston tai hakemiston lukuvirhe';
+$lang['Following plugins may not be compatible with the new version of Piwigo:'] = 'Seuraavat laajennokset eivät välttämättä ole yhteensopivia uuden Piwigo version kanssa:';
+$lang['Following themes may not be compatible with the new version of Piwigo:'] = 'Seuraavat teemat eivät välttämättä ole yhteensopivia uuden Piwigo version kanssa:';
+$lang['Forbid this theme to users'] = 'Estä tämän teeman käyttö käyttäjiltä';
+$lang['Forbidden'] = 'Estetty';
+$lang['GD library is missing'] = 'GD kirjasto puuttuu';
+$lang['GD version'] = 'GD versio';
+$lang['Gallery unlocked'] = 'Galleria avattu';
+$lang['Get Support on Piwigo Forum'] = 'Hanki tukia Piwigon foorumeilta';
+$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Anna kirjoitus oikeudet (chmod 777) "%s" hakemistolle Piwigo asennuksesi juuressa';
+$lang['Graphics Library'] = 'Grafiikka kirjasto';
+$lang['High definition'] = 'Teräväpiirto';
+$lang['High definition enabled'] = 'Teräväpiirto käytössä';
+$lang['<em>Piwigo for iOS</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = '<em>Piwigo iOS:lle</em> sovellus mahdollistaa yhdistämisen Piwigo galleriaasi iPhone, iPad tai iPod Touch laitettasi käyttäen. Voit luoda albumeja ja jopa siirtää useita kuvia kerralla.';
+$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroom on valokuvausohjelmisto, joka on suunniteltu suuren valokuvamäärän hallinnointii ja jälkiprosessointiin.';
+$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture on tehokas työkalu kuvien parantamiseen ja suurien valokuvakirjastojen hallintaan Mac-laitteilla.';
+$lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture on suunniteltu ammattilaiskuvaajile, ollen samalla yhtä yksinkertainen kuin iPhoto.';
+$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'Arvioitu maksimi tarkkuus: %dM pikseliä (eli %d x %d pikseliä).';
+$lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = 'Oletko varma, että haluat asentaa tämän päivityksen? Sinun täytyy varmistaa, ettei tämä versio vaadi ensin ensin asennuksen poistamista.';
+$lang['Authorize users to add comments on selected albums'] = 'Valtuuta käyttäjät lisäämään kommentteja valikoituihin albumeihin.';
+$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'Oletusarvoisesti Piwigo luo uuden verkko kokoisen kuvan HD (teräväpiirto) versiosta kuvaasi.';
+$lang['By default, the center of interest is placed in the middle of the photo.'] = 'Oletusarvoisesti kiinnostuksen keskipiste on kuvan keskellä.';
+$lang['Complementary mail content'] = 'Täydentävä sähköpostisisältö';
+$lang['Correction applied with error'] = 'Virheeseen tehty korjaus';
+$lang['Correction the anomaly will cancel the fact that it\'s ignored'] = 'Korjattua ilmiötä ei enää ohiteta';
+$lang['Duplicate selected tags'] = 'Monista valitut tagit';
+$lang['Edit ranks'] = 'Muokaa sijoituksia';
+$lang['Error when sending email to %s [%s].'] = 'Virhe lähetettäessä sähköpostia %slle [%s].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Suorituksen aikakatkaisu, käsittelyä täytyy jatkaa [Arvoitu jäljellä oleva aika: %d sekuntia].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Suoritusaika ylitetty, käsittelyä täytyy jatkaa [Arviotu jäljellä oleva aika: %d sekuntia].';
+$lang['Exif extension not available, admin should disable exif use'] = 'Exif laajennos ei ole käytettävissä, ylläpitäjän tulee poistaa exif käytöstä';
+$lang['Level 8'] = 'Ylläpitäjät';
+$lang['Link all album photos to some existing albums'] = 'Linkitä kaikki albumin kuvat johonkin olemassa olevaan albumiin';
+$lang['Mail address is mandatory for registration'] = 'Sähköpostiosoite on pakollinen rekisteröidyttäessä';
+$lang['Impossible to deactivate this language, you need at least one language.'] = 'Mahdotonta poistaa kieltä käytöstä, vähintään yksi kieli täytyy olla käytössä.';
+$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'Mahdotonta poistaa teemaa käytöstä, vähintään yksi teema täytyy olla käytössä.';
+$lang['Invert'] = 'Käännä';
+$lang['Landscape'] = 'Vaaka';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Jokainen lähetetty viesti sisältää linkeissä omat todennusavaimet, jotka ovat voimassa %s.';
+$lang['Edit user'] = 'Muokkaa käyttäjää';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Turvallisuus syistä todennusavaimet eivät toimi ylläpitäjille.';
+$lang['History'] = 'Historia';
+$lang['Hit'] = 'Osuma';
+$lang['Ignore selected anomalies'] = 'Jätä seuraava poikkeamat huomiotta';
+$lang['Impossible automatic correction'] = 'Automaattinen korjaus ei onnistu';
+$lang['Impossible to activate this theme, the parent theme is missing: %s'] = 'Tämän teeman aktivointi ei onnistu, sillä alemman tason teemasta puuttuu: %s';
+$lang['Impossible to deactivate the default theme.'] = 'Oletus teeman poistaminen käytöstä ei onnistu.';
+$lang['Impossible to deactivate this language, first set another language as default.'] = 'Kielen poistaminen käytöstä ei onnistu, valitse ensin toinen kieli oletukseksi.';
\ No newline at end of file
diff --git a/sources/language/fi_FI/common.lang.php b/sources/language/fi_FI/common.lang.php
index 5b007d4..7ebb126 100644
--- a/sources/language/fi_FI/common.lang.php
+++ b/sources/language/fi_FI/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Finnish [FI]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=686
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -427,4 +427,5 @@ $lang['Photo title'] = 'Kuvan otsikko';
 $lang['Album name, A &rarr; Z'] = 'Albumin nimi, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Albumin nimi, Z &rarr; A';
 $lang['Apply on properties'] = 'Käytä asetuksia';
-$lang['Link: %s'] = 'Linkki: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Linkki: %s';
+$lang['Your authentication key is no longer valid.'] = 'Todennusavaimesi ei ole enää voimassa.';
\ No newline at end of file
diff --git a/sources/language/fi_FI/install.lang.php b/sources/language/fi_FI/install.lang.php
index 254dfea..b38ad69 100755
--- a/sources/language/fi_FI/install.lang.php
+++ b/sources/language/fi_FI/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -43,9 +43,9 @@ $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Älä epär
 $lang['It appears your webhost is currently running PHP %s.'] = 'Näyttää että palveluntarjoajasi käyttää PHP %s.';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Tarvitsetko apua? Kysy asiasta <a href="%s">Piwigon keskustelupalstalla</a>';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Voit muokata asetuksia itse ja käynnistää Piwigon uudelleen tämän jälkeen.';
-$lang['PHP 5 is required'] = 'PHP 5 vaaditaan';
+$lang['PHP 5 is required'] = 'PHP 5.2 vaaditaan';
 $lang['Password ']['confirm'] = 'Salasana [hyväksy]';
-$lang['Try to configure PHP 5'] = 'Yritä määrittää PHP 5';
+$lang['Try to configure PHP 5'] = 'Yritä määrittää PHP 5.2';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Vierailijat voivat ottaa yhteyttä sivuston ylläpitäjään tätä sähköpostiosoitetta käyttäen';
 $lang['Welcome to my photo gallery'] = 'Tervetuloa kuvagalleriaani';
 $lang['enter a login for webmaster'] = 'Lisää käyttäjätunnus ylläpitäjälle';
@@ -57,12 +57,11 @@ $lang['Download the config file'] = 'Lataa konfigurointitiedosto';
 $lang['Hope to see you back soon.'] = 'Toivottavasti näemme pian';
 $lang['Just another Piwigo gallery'] = 'Yksi Piwigo -galleria lisää';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Pidä salassa, se mahdollistaa pääsyn pääkäyttäjän paneeliin';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo voi yrittää vaihtaa konfiguraation PHP 5 :seen luomalla tai muuttamalla .htaccess -tiedostoa.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ei pystynyt konfiguroimaan PHP5 :sta.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo voi yrittää vaihtaa konfiguraation PHP 5.2 :seen luomalla tai muuttamalla .htaccess -tiedostoa.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ei pystynyt konfiguroimaan PHP5.2 :sta.';
 $lang['Sorry!'] = 'Anteeksi!';
 $lang['Welcome to your new installation of Piwigo!'] = 'Tervetuloa uuteen Piwigo -asennukseesi!';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Voit ladata konfiguraatiotiedoston ja siirtää sen asennuksesi local/config -hakemistoon. ';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sinun tulee kääntyä hosting -palveluntarjoajasi puoleen ja kysyä kuinka voit vaihtaa PHP 5:seen itse.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sinun tulee kääntyä hosting -palveluntarjoajasi puoleen ja kysyä kuinka voit vaihtaa PHP 5.2 :seen itse.';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'se tulee tietokannan taulun nimen etuliitteeksi (mahdollistaa taulujen helpomman hallinnan)';
-$lang['verification'] = 'vahvistus';
-?>
\ No newline at end of file
+$lang['verification'] = 'vahvistus';
\ No newline at end of file
diff --git a/sources/language/fi_FI/upgrade.lang.php b/sources/language/fi_FI/upgrade.lang.php
index 37112f6..7e03806 100755
--- a/sources/language/fi_FI/upgrade.lang.php
+++ b/sources/language/fi_FI/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fr_CA/admin.lang.php b/sources/language/fr_CA/admin.lang.php
index 166df67..c245d40 100644
--- a/sources/language/fr_CA/admin.lang.php
+++ b/sources/language/fr_CA/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -113,7 +113,6 @@ $lang['New parent album'] = "Nouvelle catégorie parente";
 $lang['New tag'] = "Nouveau mot clé";
 $lang['Number of comments per page'] = "Nombre de commentaires par page";
 $lang['Number of rates'] = "Nombre de notes";
-$lang['Number of thumbnails to create'] = "Nombre de miniatures à créer";
 $lang['Only private albums are listed'] = "Seules les catégories privées sont listées";
 $lang['Operating system'] = "Système d'exploitation";
 $lang['Options'] = "Options";
@@ -336,7 +335,6 @@ $lang['Photo unreachable or no support'] = "Image inaccessible ou format non sup
 $lang['GD version'] = "version de GD";
 $lang['General statistics'] = "Statistiques générales";
 $lang['average time'] = "temps moyen";
-$lang['number of miniaturized photos'] = "nombre de miniatures créées";
 $lang['total time'] = "temps total";
 $lang['for this file format'] = "pour ce format de fichier";
 $lang['unit mode'] = "Mode unitaire";
@@ -455,7 +453,6 @@ $lang['add new photos to caddie'] = "Ajouter les nouveaux éléments au panier";
 $lang['No display'] = "Pas d'affichage";
 $lang['Classic display'] = "Affichage classique";
 $lang['Hoverbox display'] = "Affichage lors du survol";
-$lang['Mail address is obligatory for all users'] = "L'adresse courriel est obligatoire pour tous les utilisateurs";
 $lang['Minimum privacy level'] = "Niveau minimal de confidentialité";
 $lang['Privacy level'] = "Niveau de confidentialité";
 $lang['Level 0'] = "---";
@@ -483,7 +480,6 @@ $lang['Are you sure you want to delete this plugin?'] = "Êtes-vous sûr de voul
 $lang['Are you sure you want to install this plugin?'] = "Êtes-vous sûr de vouloir installer ce plugin?";
 $lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = "Êtes-vous sur de vouloir installer cette mise à jour? Vous devez vérifiez que cette mise à jour ne nécessite pas de désinstallation préalable.";
 $lang['Plugin has been successfully copied'] = "Le plugin a été copié avec succès.";
-$lang['You might go to plugin list to install and activate it.'] = "Rendez-vous dans la liste des plugins pour l'installer et l'activer.";
 $lang['Can\'t create temporary file.'] = "Impossible de créer un fichier temporaire.";
 $lang['Can\'t download archive.'] = "Impossible de télécharger l'archive.";
 $lang['Can\'t read or extract archive.'] = "Impossible de lire ou d'extraire l'archive.";
@@ -982,4 +978,16 @@ $lang['on the %d selected users'] = 'sur les %d utilisateurs sélectionnés';
 $lang['Close user details'] = 'Fermer les détails de l\'utilisateur';
 $lang['Open user details'] = 'Ouvrir les détails de l\'utilisateur';
 $lang['close'] = 'Fermer';
-?>
\ No newline at end of file
+$lang['Activate it now'] = 'L\'activer maintenant';
+$lang['Allow users to add a link to their website'] = 'Autoriser les utilisateurs à donner un lien vers leur site web';
+$lang['Empty caddie'] = 'Vider le panier';
+$lang['Impossible to deactivate the default theme.'] = 'Impossible de désactiver le thème par défaut.';
+$lang['Mail address is mandatory for registration'] = 'L\'adresse de courriel est obligatoire pour l\'enregistrement ';
+$lang['No and unlock sub-albums'] = 'Non, et déverrouiller les sous-albums';
+$lang['The settings for the guest are from the %s user'] = 'Les préféreces des invités sont celles de l\'utilisateur %s';
+$lang['Upload in progress'] = 'Transfert en cours...';
+$lang['based on'] = 'basé sur';
+$lang['between %s and %s MB'] = 'entre %s et %s Mo';
+$lang['date & time'] = 'date et heure';
+$lang['file name'] = 'nom de fichier';
+$lang['width & height'] = 'largeur et hauteur';
\ No newline at end of file
diff --git a/sources/language/fr_CA/common.lang.php b/sources/language/fr_CA/common.lang.php
index a6be5b9..81b77ee 100644
--- a/sources/language/fr_CA/common.lang.php
+++ b/sources/language/fr_CA/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Français [QC]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=420
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -423,4 +423,10 @@ $lang['Password is missing. Please enter the password.'] = "Le mot de passe manq
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = "La confirmation du mot de passe manque. Veuillez confirmer le mot de passe choisi.";
 $lang['%d photos per page'] = '%d photos par page';
 $lang['Theme'] = 'Thème';
-?>
\ No newline at end of file
+$lang['Album name, A &rarr; Z'] = 'Nom de l\'album, A &rarr; Z';
+$lang['Album name, Z &rarr; A'] = 'Nom de l\'album, Z &rarr; A';
+$lang['Apply on properties'] = 'Appliquer sur les propriétés';
+$lang['Link: %s'] = 'Lien: %s';
+$lang['No results for'] = 'Aucun résultat pour';
+$lang['Photo description'] = 'Description de la photo';
+$lang['Photo title'] = 'Titre de la photo';
\ No newline at end of file
diff --git a/sources/language/fr_CA/help/index.php b/sources/language/fr_CA/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/fr_CA/help/index.php
+++ b/sources/language/fr_CA/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fr_CA/help/photos_add_ftp.html b/sources/language/fr_CA/help/photos_add_ftp.html
index e3bfad1..39b4fb3 100644
--- a/sources/language/fr_CA/help/photos_add_ftp.html
+++ b/sources/language/fr_CA/help/photos_add_ftp.html
@@ -4,16 +4,14 @@
 <ol>
   <li>Créez un répertoire sur votre ordinateur.</li>
 
-  <li>Copiez des photos à l'intérieur de ce répertoire, puis redimensionnez-les pour un affichage sur le web. <em>Attention</em> : le nom des répertoires et des fichiers ne doit contenir que des lettres, des chiffres et les caractères  "-", "_" ou ".". Pas d'espace ou de caractères accentués.</li>
+  <li>Copiez des photos à l'intérieur de ce répertoire. <em>Attention</em> : le nom des répertoires et des fichiers ne doit contenir que des lettres, des chiffres et les caractères  "-", "_" ou ".". Pas d'espace ou de caractères accentués.</li>
 
   <li>Avec un client FTP, copiez le répertoire dans le répertoire "galleries" de votre installation de Piwigo.</li>
 
-  <li>Connectez-vous à votre galerie Piwigo et rendez-vous sur <span class="pwgScreen">Administration &raquo; Images &raquo; Miniatures</span> pour créer les miniatures manquantes.</li>
-
-  <li>Rendez-vous sur <span class="pwgScreen">Administration</span> et cliquez sur le gros bouton de synchronisation.</li>
+  <li>Connectez-vous à votre galerie Piwigo, rendez-vous sur <span class="pwgScreen">Administration</span> et cliquez sur le gros bouton de synchronisation.</li>
 </ol>
 
-<p>Bravo ! Vous avez créé avec succès la première catégorie de votre galerie.</p>
+<p>Bravo ! Vous avez créé avec succès le premier album de votre galerie.</p>
 
 </fieldset>
 
@@ -41,81 +39,50 @@ galleries
 |       |-- discours002.jpg
 |       +-- discours003.jpg
 +-- voyage-de-noces
-    |-- hotel.png
-    |-- video-decollage-avion.avi
-    +-- pwg_representative
-        +-- video-decollage-avion.jpg
+|   |-- hotel.png
+|   |-- video-decollage-avion.avi
+|   +-- pwg_representative
+|       +-- video-decollage-avion.jpg
++-- seance-photographe
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>A l'exception de celui appelé "pwg_representative", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.</li>
+  <li>A l'exception de "pwg_representative" et "pwg_format", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.</li>
 
-  <li>Fondamentalement, un élément est représenté par un fichier. Pour Piwigo, un fichier peut être un élément si son extension figure dans la liste du paramètre de configuration <code>file_ext</code> (voir
+  <li>Fondamentalement, une photo est représentée par un fichier. Pour Piwigo, un fichier peut être une photo si son extension figure dans la liste du paramètre de configuration <code>file_ext</code> (voir
 fichier <span class="filename">include/config.inc.php</span>). Un fichier
-peut être une image si son extension figure dans la liste du paramètre de configuration
+peut être une photo si son extension figure dans la liste du paramètre de configuration
 <code>picture_ext</code>.</li>
 
-  <li>Les éléments de type image doivent avoir une miniature associée (voir la
-section suivante à propos des miniatures).</li>
-
-  <li>Les éléments de type image peuvent avoir un image en grand format
-associé. Comme pour le fichier <span class="filename">mariage.jpg</span>
-dans l'exemple ci-dessus. Aucun préfixe n'est nécessaire sur le nom du
-fichier.</li>
-
-  <li>Les éléments autres que les images (vidéos, sons, fichiers texte, tout ce que vous
+  <li>Les éléments autres que les photos (vidéos, sons, fichiers texte, tout ce que vous
 voulez...) sont représentés par défaut par une icône correspondant à
-l'extension du nom du fichier. Optionnellement, une miniature et un
-représentant peuvent être associés (voir le fichier <span
-class="filename">video.avi</span> dans l'exemple).</li>
+l'extension du nom du fichier. Optionnellement, un
+représentant peut être associé (voir le fichier <span
+class="filename">video-decollage-avion.avi</span> dans l'exemple).</li>
+
+  <li>Formats multiples : vous pouvez proposer une photo dans plusieurs formats. Dans cet exemple, il y a 3 formats supplémentaires pour img0001.jpg. Vous pouvez activer cette fonctionnalité en ajoutant <code>$conf['enable_formats'] = true;</code> à votre configuration locale et en définissant une liste de formats, comme <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
 
   <li><em>Attention</em> : le nom d'un répertoire ou d'un fichier ne doit
 être composé que de lettres, de chiffres, de "-", "_" ou ".". Pas d'espace
 ou de caractères accentués.</li>
 
-  <li><em>Conseil</em> : une catégorie peut contenir des éléments et des
-sous-catégories à la fois. Néanmoins, il est fortement conseillé pour chaque
-catégorie de choisir entre contenir des éléments <strong>ou bien</strong>
-des sous-catégories.</li>
+  <li><em>Conseil</em> : un album peut contenir des photos et des
+sous-album à la fois. Néanmoins, il est fortement conseillé pour chaque
+album de choisir entre contenir des photos <strong>ou bien</strong>
+des sous-album.</li>
 
-  <li>Une fois que les fichiers, les miniatures et les représentants sont
+  <li>Une fois que les fichiers sont
 correctement placés dans les répertoires, se rendre sur l'écran <span
-class="pwgScreen">Administration &raquo; Catégories &raquo; Synchroniser</span>.</li>
-
-</ul>
-
-</fieldset>
-
-<fieldset>
-  <legend>Miniatures</legend>
-
-<ul>
-  
-  <li>Comme mentionné précédemment, chaque élément de type image doit être
-associé à une miniature.</li>
-
-  <li>Les miniatures sont stockées dans le sous-répertoire "thumbnail" de
-chaque répertoire représentant une catégorie. Une miniature est un fichier
-de type image (même extension du nom du fichier) dont le nom de fichier est
-préfixé par le paramètre de configuration <code>prefix_thumbnail</code>
-(voir <span class="filename">include/config.inc.php</span>).</li>
-
-  <li>Les miniatures n'ont pas besoin d'avoir la même extension que leur
-image associée (une image avec ".jpg" comme extension peut avoir une
-miniature en ".GIF" par exemple).</li>
-
-  <li>Il est conseillé d'utiliser un outil externe pour la création des
-miniatures.</li>
-
-  <li>Vous pouvez également utiliser l'outil de création de miniatures
-intégré à Piwigo mais cela est déconseillé car la qualité risque
-d'être décevante et cela utilise inutilement les ressources du serveur (ce
-qui peut être un grave problème sur un serveur mutualisé).</li>
-
-  <li>Si vous choisissez d'utiliser le serveur web pour générer les
-miniatures, vous devez donner les droits en écriture sur les
-répertoires.</li>
+class="pwgScreen">Administration &raquo; Outils &raquo; Synchroniser</span>.</li>
 
 </ul>
 
diff --git a/sources/language/fr_CA/index.php b/sources/language/fr_CA/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/fr_CA/index.php
+++ b/sources/language/fr_CA/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fr_CA/install.lang.php b/sources/language/fr_CA/install.lang.php
index 452322e..5a8a4b8 100644
--- a/sources/language/fr_CA/install.lang.php
+++ b/sources/language/fr_CA/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "Mot de passe [Confirmer]";
 $lang['verification'] = "vérification";
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = "Besoin d'aide ? Posez votre question sur le <a href=\"%s\">forum de Piwigo</a>.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "Les visiteurs pourront contacter l'administrateur du site par ce courriel";
-$lang['PHP 5 is required'] = "PHP 5 est requis";
+$lang['PHP 5 is required'] = 'PHP 5.2 est requis';
 $lang['It appears your webhost is currently running PHP %s.'] = "Apparemment, la version PHP de votre hébergeur est PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo va essayer de passer en PHP 5 en créant ou modifiant le fichier .htaccess.";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va essayer de passer en PHP 5.2 en créant ou modifiant le fichier .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Notez que vous pouvez modifier vous-même la configuration PHP et re-lancer Piwigo ensuite.";
-$lang['Try to configure PHP 5'] = "Essayer de configurer PHP 5";
+$lang['Try to configure PHP 5'] = 'Essayer de configurer PHP 5.2';
 $lang['Sorry!'] = "Désolé!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo n'a pas pu configurer PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Il vous faut contacter le support de votre hébergeur pour savoir comment configurer vous-même PHP 5.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'a pas pu configurer PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Il vous faut contacter le support de votre hébergeur pour savoir comment configurer vous-même PHP 5.2';
 $lang['Hope to see you back soon.'] = "En espérant vous revoir très prochainement.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Félicitations, l\'installation de Piwigo est terminée';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Une solution alternative est de copier le texte dans la zone ci-dessous et de le coller dans le fichier "local/config/database.inc.php" (Attention: database.inc.php ne doit contenir que ce qui se trouve dans la zone, pas de retour à la ligne, pas d\'espace)';
@@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Une galerie Piwigo de plus';
 $lang['Welcome to my photo gallery'] = 'Bienvenue sur ma galerie photo';
 $lang['Welcome to your new installation of Piwigo!'] = 'Bienvenue sur votre nouvelle installtion de Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'N\'hésitez pas à consulter bos forums si vous avez le moindre problème : %s';
-$lang['localhost or other, supplied by your host provider'] = 'localhost ou autre, communiqué par votre hébergeur';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost ou autre, communiqué par votre hébergeur';
\ No newline at end of file
diff --git a/sources/language/fr_CA/upgrade.lang.php b/sources/language/fr_CA/upgrade.lang.php
index 00b613a..6c7acc7 100644
--- a/sources/language/fr_CA/upgrade.lang.php
+++ b/sources/language/fr_CA/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fr_FR/admin.lang.php b/sources/language/fr_FR/admin.lang.php
index 801ea77..0036542 100644
--- a/sources/language/fr_FR/admin.lang.php
+++ b/sources/language/fr_FR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -185,7 +185,7 @@ $lang['Lock albums'] = 'Verrouiller les albums';
 $lang['Private'] = 'Album privé';
 $lang['Public'] = 'Album public';
 $lang['Find a new representant by random'] = "Trouver un nouveau représentant au hasard";
-$lang['Public / Private'] = "Publique / Privée";
+$lang['Public / Private'] = 'Public / Privé';
 $lang['Manage authorizations for selected albums'] = 'Gérer le type d\'accès pour les albums sélectionnés';
 $lang['Virtual album added'] = 'Album virtuel ajouté';
 $lang['Virtual album deleted'] = 'Album virtuel supprimé';
@@ -807,8 +807,8 @@ $lang['Send connection settings by email'] = 'Envoyer les identifiants par email
 $lang['Activate comments'] = 'Activer les commentaires';
 $lang['Default comments order'] = 'Ordre par défaut des commentaires';
 $lang['A locked gallery is only visible to administrators'] = 'Une galerie verrouillée n\'est visible que des administrateurs';
-$lang['Unlock gallery'] = 'Déverouiller la galerie';
-$lang['Gallery unlocked'] = 'Galerie déverouillée';
+$lang['Unlock gallery'] = 'Déverrouiller la galerie';
+$lang['Gallery unlocked'] = 'Galerie déverrouillée';
 $lang['Notify administrators when a comment is'] = 'Notifier les administrateurs lorsqu\'un commentaire est';
 $lang['modified'] = 'modifié';
 $lang['deleted'] = 'supprimé';
@@ -982,4 +982,13 @@ $lang['file name'] = 'nom de fichier';
 $lang['date & time'] = 'date et heure';
 $lang['width & height'] = 'largeur et hauteur';
 $lang['No and unlock sub-albums'] = 'Non, et déverrouiller les sous-albums';
-$lang['Upload in progress'] = 'Transfert en cours...';
\ No newline at end of file
+$lang['Upload in progress'] = 'Transfert en cours...';
+$lang['Orphans'] = 'Orphelines';
+$lang['Delete %d orphan photos'] = 'Supprimer les %d photos orphelines';
+$lang['Edit user'] = 'Éditer l\'utilisateur';
+$lang['Recipients'] = 'Destinataires';
+$lang['No recipient selected'] = 'Choisissez un destinataire';
+$lang['No user is permitted to see this private album'] = 'Aucun utilisateur n\'est autorisé à voir cet album privé';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Chaque email envoyé contiendra sa propre clef d\'identification automatique sur les liens, valide %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Par mesure de sécurité les clefs d\'identification ne fonctionnent pas pour les administrateurs.';
+$lang['Y Repeat'] = 'Répétition Y';
\ No newline at end of file
diff --git a/sources/language/fr_FR/common.lang.php b/sources/language/fr_FR/common.lang.php
index 67823ad..89a9e18 100644
--- a/sources/language/fr_FR/common.lang.php
+++ b/sources/language/fr_FR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Français [FR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=421
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -424,4 +424,5 @@ $lang['Photo title'] = 'Titre de la photo';
 $lang['Photo description'] = 'Description de la photo';
 $lang['Album name, A &rarr; Z'] = 'Nom de l\'album, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Nom de l\'album, Z &rarr; A';
-$lang['Link: %s'] = 'Lien: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Lien: %s';
+$lang['Your authentication key is no longer valid.'] = 'Votre clef d\'identification n\'est plus valide.';
\ No newline at end of file
diff --git a/sources/language/fr_FR/help/index.php b/sources/language/fr_FR/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/fr_FR/help/index.php
+++ b/sources/language/fr_FR/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fr_FR/help/photos_add_ftp.html b/sources/language/fr_FR/help/photos_add_ftp.html
index 7ab8e19..39b4fb3 100644
--- a/sources/language/fr_FR/help/photos_add_ftp.html
+++ b/sources/language/fr_FR/help/photos_add_ftp.html
@@ -39,15 +39,24 @@ galleries
 |       |-- discours002.jpg
 |       +-- discours003.jpg
 +-- voyage-de-noces
-    |-- hotel.png
-    |-- video-decollage-avion.avi
-    +-- pwg_representative
-        +-- video-decollage-avion.jpg
+|   |-- hotel.png
+|   |-- video-decollage-avion.avi
+|   +-- pwg_representative
+|       +-- video-decollage-avion.jpg
++-- seance-photographe
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>A l'exception de celui appelé "pwg_representative", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.</li>
+  <li>A l'exception de "pwg_representative" et "pwg_format", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.</li>
 
   <li>Fondamentalement, une photo est représentée par un fichier. Pour Piwigo, un fichier peut être une photo si son extension figure dans la liste du paramètre de configuration <code>file_ext</code> (voir
 fichier <span class="filename">include/config.inc.php</span>). Un fichier
@@ -60,6 +69,8 @@ l'extension du nom du fichier. Optionnellement, un
 représentant peut être associé (voir le fichier <span
 class="filename">video-decollage-avion.avi</span> dans l'exemple).</li>
 
+  <li>Formats multiples : vous pouvez proposer une photo dans plusieurs formats. Dans cet exemple, il y a 3 formats supplémentaires pour img0001.jpg. Vous pouvez activer cette fonctionnalité en ajoutant <code>$conf['enable_formats'] = true;</code> à votre configuration locale et en définissant une liste de formats, comme <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Attention</em> : le nom d'un répertoire ou d'un fichier ne doit
 être composé que de lettres, de chiffres, de "-", "_" ou ".". Pas d'espace
 ou de caractères accentués.</li>
diff --git a/sources/language/fr_FR/index.php b/sources/language/fr_FR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/fr_FR/index.php
+++ b/sources/language/fr_FR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fr_FR/install.lang.php b/sources/language/fr_FR/install.lang.php
index 8143cf8..b21e275 100644
--- a/sources/language/fr_FR/install.lang.php
+++ b/sources/language/fr_FR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -47,14 +47,14 @@ $lang['Password [confirm]'] = "Mot de passe [Confirmer]";
 $lang['verification'] = "vérification";
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = "Besoin d'aide ? Posez votre question sur le <a href=\"%s\">forum de Piwigo</a>.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "Les visiteurs pourront contacter l'administrateur du site par ce mail";
-$lang['PHP 5 is required'] = "PHP 5 est requis";
+$lang['PHP 5 is required'] = 'PHP 5.2 est requis';
 $lang['It appears your webhost is currently running PHP %s.'] = "Apparemment, la version PHP de votre hébergeur est PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo va essayer de passer en PHP 5 en créant ou modifiant le fichier .htaccess.";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va essayer de passer en PHP 5.2 en créant ou modifiant le fichier .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Notez que vous pouvez modifier vous-même la configuration PHP et re-lancer Piwigo ensuite.";
-$lang['Try to configure PHP 5'] = "Essayer de configurer PHP 5";
+$lang['Try to configure PHP 5'] = 'Essayer de configurer PHP 5.2';
 $lang['Sorry!'] = "Désolé!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo n'a pas pu configurer PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Il vous faut contacter le support de votre hébergeur pour savoir comment configurer vous-même PHP 5.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'a pas pu configurer PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Il vous faut contacter le support de votre hébergeur pour savoir comment configurer vous-même PHP 5.2';
 $lang['Hope to see you back soon.'] = "En espérant vous revoir très prochainement.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Félicitations, l\'installation de Piwigo est terminée';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Une solution alternative est de copier le texte dans la zone ci-dessous et de le coller dans le fichier "local/config/database.inc.php" (Attention: database.inc.php ne doit contenir que ce qui se trouve dans la zone, pas de retour à la ligne, pas d\'espace)';
@@ -64,5 +64,4 @@ $lang['You can download the config file and upload it to local/config directory
 $lang['Just another Piwigo gallery'] = 'Une galerie Piwigo de plus';
 $lang['Welcome to my photo gallery'] = 'Bienvenue sur ma galerie photo';
 $lang['Welcome to your new installation of Piwigo!'] = 'Bienvenue sur votre nouvelle installation de Piwigo !';
-$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'N\'hésitez pas à consulter nos forums si vous avez le moindre problème : %s';
-?>
+$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'N\'hésitez pas à consulter nos forums si vous avez le moindre problème : %s';
\ No newline at end of file
diff --git a/sources/language/fr_FR/upgrade.lang.php b/sources/language/fr_FR/upgrade.lang.php
index a99f797..6c2d6b5 100644
--- a/sources/language/fr_FR/upgrade.lang.php
+++ b/sources/language/fr_FR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ga_IE/common.lang.php b/sources/language/ga_IE/common.lang.php
index f0bd62e..84dd8e3 100644
--- a/sources/language/ga_IE/common.lang.php
+++ b/sources/language/ga_IE/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Gaeilge [IE]
-Version: 2.5.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=708
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/gl_ES/admin.lang.php b/sources/language/gl_ES/admin.lang.php
index f6c92a6..9499550 100755
--- a/sources/language/gl_ES/admin.lang.php
+++ b/sources/language/gl_ES/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -976,4 +976,12 @@ $lang['between %s and %s MB'] = 'entre %s e %s MB';
 $lang['date & time'] = 'data & hora';
 $lang['file name'] = 'nome de ficheiro';
 $lang['width & height'] = 'largo & alto';
-$lang['Allow users to add a link to their website'] = 'Permite ós usuarios engadir unha ligazón ó seu sitio web';
\ No newline at end of file
+$lang['Allow users to add a link to their website'] = 'Permite ós usuarios engadir unha ligazón ó seu sitio web';
+$lang['Delete %d orphan photos'] = 'Eliminar %d fotos orfas';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada correo enviado conterá súa propia chave de autenticación automática nas ligazóns, válida para %s.';
+$lang['Edit user'] = 'Modificar usuario';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Por motivos de seguranza, as chaves de autenticación non funcionan para os administradores.';
+$lang['No recipient selected'] = 'Non hai ningún destinatario seleccionado';
+$lang['No user is permitted to see this private album'] = 'O usuario non ten permitido ver este álbum privado';
+$lang['Orphans'] = 'Orfos';
+$lang['Recipients'] = 'Destinatarios';
\ No newline at end of file
diff --git a/sources/language/gl_ES/common.lang.php b/sources/language/gl_ES/common.lang.php
index 3a5ec34..aa8e1dc 100644
--- a/sources/language/gl_ES/common.lang.php
+++ b/sources/language/gl_ES/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Galego [ES]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=681
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -423,4 +423,5 @@ $lang['Link: %s'] = 'Ligazón: %s';
 $lang['Photo description'] = 'Descrición da foto';
 $lang['Photo title'] = 'Título da foto';
 $lang['Album name, A &rarr; Z'] = 'Nome do álbum, A &rarr; Z';
-$lang['Album name, Z &rarr; A'] = 'Nome do álbum, A &rarr; Z';
\ No newline at end of file
+$lang['Album name, Z &rarr; A'] = 'Nome do álbum, A &rarr; Z';
+$lang['Your authentication key is no longer valid.'] = 'A túa chave de autenticación xa non é válida.';
\ No newline at end of file
diff --git a/sources/language/gl_ES/help/photos_add_ftp.html b/sources/language/gl_ES/help/photos_add_ftp.html
index 0d1caf7..046e119 100644
--- a/sources/language/gl_ES/help/photos_add_ftp.html
+++ b/sources/language/gl_ES/help/photos_add_ftp.html
@@ -37,21 +37,32 @@ galleries
 |       |-- dancers002.jpg
 |       +-- dancers003.jpg
 +-- honeymoon
-    |-- hotel.png
-    |-- video-from-plane.avi
-    +-- pwg_representative
-        +-- video-from-plane.jpg
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>A excepción de "pwg_representative" (ver explicación debaixo), cada cartafol dentro de "galleries" produce un álbum. Non hai límite de profundidade.</li>
+  <li>A excepción de "pwg_representative" é "pwg_format (ver explicación debaixo), cada cartafol dentro de "galleries" produce un álbum. Non hai límite de profundidade.</li>
 
   <li>Basicamente, un elemento é representado por un ficheiro. Un ficheiro pode ser un elemento Piwigo se súa extensión está entre as posibles nos parámetros de configuración <code>file_ext</code> (ver o ficheiro <span
   class="filename">include/config_default.inc.php</span>). Un ficheiro pode ser unha imaxe se súa extensión está entre as posibles nos parámetros de configuración <code>picture_ext</code>.</li>
 
   <li>Os elementos que non son fotos (vídeo, sons, ficheiros de texto, calquera outro...) son representados de xeito predeterminado por unha icona correspondente á extensión do ficheiro. Opcionalmente, podes asociar unha miniatura e un ficheiro representativo (ver video.avi no exemplo de arriba).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Aviso</em>: o nome dos cartafoles e ficheiros debe conter só letras, números, "-", "_" ou ".". Sen espazos en branco nin caracteres acentuados.</li>
 
   <li>Unha vez que as imaxes estean correctamente situadas nos cartafoles, vai a: <span class="pwgScreen">Administración &raquo; Ferramentas &raquo; Sincronizar</span></li>
diff --git a/sources/language/gl_ES/install.lang.php b/sources/language/gl_ES/install.lang.php
index 1179cad..7b7bc57 100755
--- a/sources/language/gl_ES/install.lang.php
+++ b/sources/language/gl_ES/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -28,19 +28,19 @@ $lang['user login given by your host provider'] = 'nome de usuario fornecido pol
 $lang['user password given by your host provider'] = 'clave de usuario fornecida polo teu provedor do aloxamento';
 $lang['verification'] = 'verificación';
 $lang['webmaster login can\'t contain characters \' or "'] = 'o nome de usuario do administrador web non pode conter caranteres \' nin "';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Tes que poñerte en contacto co teu fornecedor do aloxamento coa fin de saber como mudar a PHP 5.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Tes que poñerte en contacto co teu fornecedor do aloxamento coa fin de saber como mudar a PHP 5.2';
 $lang['also given by your host provider'] = 'tamén fornecido polo teu provedor do aloxamento';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tratar de mudar a túa configuración PHP 5 a traveso da creación ou modificación dun ficheiro .htaccess.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non foi quen de configurar o PHP 5.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tratar de mudar a túa configuración PHP 5.2 a traveso da creación ou modificación dun ficheiro .htaccess.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non foi quen de configurar o PHP 5.2';
 $lang['Sorry!'] = 'Sentímolo!';
 $lang['Start Install'] = 'Comezar a instalación';
-$lang['Try to configure PHP 5'] = 'Tratar de configurar PHP 5';
+$lang['Try to configure PHP 5'] = 'Tratar de configurar PHP 5.2';
 $lang['User'] = 'Usuario';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Os visitantes poderán empregar este correo electrónico para contactar co administrador do sitio';
 $lang['Welcome to my photo gallery'] = 'Benvido a miña galería de fotos';
 $lang['Welcome to your new installation of Piwigo!'] = 'Benvido a túa nova instalación de piwigo!';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Podes descargar o ficheiro de configuración e subilo a local/config na túa instalación.';
-$lang['PHP 5 is required'] = 'É preciso PHP 5';
+$lang['PHP 5 is required'] = 'É preciso PHP 5.2';
 $lang['Password ']['confirm'] = 'Clave [confirmar]';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Fíxate que podes mudar ti mesmo a túa configuración e reiniciar o Piwigo despois.';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Precisas axuda? Pregunta as túas dúbidas no <a href="%s">panel de mensaxes Piwigo</a>. ';
@@ -64,5 +64,4 @@ $lang['Hope to see you back soon.'] = 'Esperamos verte de volta en breve.';
 $lang['Host'] = 'Servidor';
 $lang['Installation'] = 'Instalación';
 $lang['Admin configuration'] = 'Configuración da adminstración';
-$lang['localhost or other, supplied by your host provider'] = 'aloxamento local ou outro, fornecido polo seu aloxador';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'aloxamento local ou outro, fornecido polo seu aloxador';
\ No newline at end of file
diff --git a/sources/language/gl_ES/upgrade.lang.php b/sources/language/gl_ES/upgrade.lang.php
index 5e59031..b665881 100755
--- a/sources/language/gl_ES/upgrade.lang.php
+++ b/sources/language/gl_ES/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/gu_IN/common.lang.php b/sources/language/gu_IN/common.lang.php
index 8953cdc..42d67cc 100644
--- a/sources/language/gu_IN/common.lang.php
+++ b/sources/language/gu_IN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: ગુજરાતી[IN]
-Version: 2.6.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=767
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -82,4 +82,14 @@ $lang['the beginning'] = 'શુરુઆત';
 $lang['this email address is already in use'] = 'આ ઈમેલ અડ્રેસ પેહલા થી વપરાશ મા છે';
 $lang['this login is already used'] = 'આ લોગિન પેહલા થી વપરાશ મા છે';
 $lang['today'] = 'આજે';
-$lang['wrong date'] = 'ખોટી તારીખ';
\ No newline at end of file
+$lang['wrong date'] = 'ખોટી તારીખ';
+$lang['set as album representative'] = 'થંબનેલ ની જેમ મુકો ';
+$lang['thumb'] = 'થંબનેલ';
+$lang['slideshow'] = 'સ્લાઇડ શો';
+$lang['small'] = 'નાનું';
+$lang['stop the slideshow'] = 'સ્લાઇડ શો બંધ કરો';
+$lang['xsmall'] = 'વધારે નાનું';
+$lang['xxlarge'] = 'વિશાળ';
+$lang['xlarge'] = 'વધારે મોટું';
+$lang['useful when password forgotten'] = 'કામ નુ અગર પાસવર્ડ ભૂલી ગયા હોઇ તો';
+$lang['the username must be given'] = 'યૂજ઼ર નેમ નાખવુ જરૂરી છે';
\ No newline at end of file
diff --git a/sources/language/he_IL/admin.lang.php b/sources/language/he_IL/admin.lang.php
index 76c1bab..149bfab 100644
--- a/sources/language/he_IL/admin.lang.php
+++ b/sources/language/he_IL/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -21,768 +21,768 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-$lang['%d association'] = 'סך הכול %d';
-$lang['%d associations'] = 'סך הכול %d';
-$lang['%d album including'] = 'כולל הקטגוריה %d';
-$lang['%d albums including'] = 'כולל הקטגוריות %d';
+$lang['%d association'] = '%d שיוך';
+$lang['%d associations'] = '%d שיוכים';
+$lang['%d album including'] = '%d אלבום כולל';
+$lang['%d albums including'] = '%d אלבומים כולל';
 $lang['%d physical'] = 'פיזי %d';
 $lang[' and %d virtual'] = 'ו %d וירטואלי';
-$lang['%d album moved'] = '%d קטגוריה עברה';
-$lang['%d albums moved'] = '%d קטגוריות עברו';
+$lang['%d album moved'] = '%d אלבום שינה מקום';
+$lang['%d albums moved'] = '%d אלבומים שינו מקום';
 $lang['%d group'] = '%d קבוצה';
 $lang['%d groups'] = '%d קבוצות';
 $lang['%d member'] = '%d חבר';
 $lang['%d members'] = '%d חברים';
-$lang['%d tag'] = '%d תג';
+$lang['%d tag'] = '%d תגית';
 $lang['%d tags'] = '%d תגיות';
 $lang['%d user comment rejected'] = '%d תגובת המשתמש נדחתה';
 $lang['%d user comments rejected'] = '%d תגובות המשתמש נדחו';
 $lang['%d user comment validated'] = '%d תגובת המשתמש אושרה';
 $lang['%d user comments validated'] = '%d תגובות המשתמש אושרו';
-$lang['%d user deleted'] = '%d המשתמש נמחק';
-$lang['%d users deleted'] = '%d המשתמשים נמחקו';
+$lang['%d user deleted'] = '%d משתמש נמחק';
+$lang['%d users deleted'] = '%d משתמשים נמחקו';
 $lang['%d user'] = '%d משתמש';
 $lang['%d users'] = '%d משתמשים';
 $lang['%d waiting for validation'] = '%d מחכה לאימות';
 $lang['Actions'] = 'פעולות';
-$lang['Activate'] = 'להפעיל';
-$lang['Add/delete a permalink'] = 'הוספה / מחיקה של קישורית';
+$lang['Activate'] = 'הפעל';
+$lang['Add/delete a permalink'] = 'הוספה/מחיקה של קישור קבוע';
 $lang['Add a tag'] = 'הוסף תגית';
 $lang['Add a user'] = 'הוסף משתמש';
 $lang['Add group'] = 'הוסף קבוצה';
 $lang['Add'] = 'הוסף';
 $lang['Allow user registration'] = 'אפשר רישום משתמשים';
-$lang['Apply to sub-albums'] = 'החל על קטגוריות משניות';
-$lang['Associated'] = 'שייך';
+$lang['Apply to sub-albums'] = 'החל על אלבומי משנה';
+$lang['Associated'] = 'משוייך';
 $lang['Caddie management'] = 'ניהול סל';
 $lang['Caddie'] = 'סל';
-$lang['Albums authorized thanks to group associations'] = 'הקטגוריה מאושרת אודות לקבוצת האסוציאציות';
-$lang['Album manual order was saved'] = 'סדר הקטגוריות נשמר';
-$lang['Check for upgrade failed for unknown reasons.'] = 'בדוק אם השדרוג נכשל מסיבות לא ידועות.';
-$lang['Check for upgrade'] = 'חפש עדכונים שדרוגים';
+$lang['Albums authorized thanks to group associations'] = 'האלבום אושר הודות לשיוכי הקבוצה';
+$lang['Album manual order was saved'] = 'סדר אלבומים ידני נשמר';
+$lang['Check for upgrade failed for unknown reasons.'] = 'חיפוש אחר שידרוג נכשל מסיבות לא ברורות.';
+$lang['Check for upgrade'] = 'חפש שדרוגים';
 $lang['Comments for all'] = 'תגובות עבור כל';
 $lang['Current name'] = 'השם הנוכחי';
 $lang['Database'] = 'מסד נתונים';
-$lang['Deactivate'] = 'לא פעיל';
-$lang['Delete Representant'] = 'מחק הצגה';
-$lang['Delete selected tags'] = 'מחק את התגים שנבחרו';
+$lang['Deactivate'] = 'כבה';
+$lang['Delete Representant'] = 'מחק צלמית אלבום';
+$lang['Delete selected tags'] = 'מחק את התגיות שנבחרו';
 $lang['Delete selected users'] = 'מחק את המשתמשים שנבחרו';
 $lang['Deletions'] = 'מחיקות';
-$lang['Deny selected groups'] = 'אסור קבוצות שנבחרו';
-$lang['Deny selected users'] = 'אסור משתמשים שנבחרו';
+$lang['Deny selected groups'] = 'מנע קבוצות שנבחרו';
+$lang['Deny selected users'] = 'מנע משתמשים שנבחרו';
 $lang['Description'] = 'תיאור';
-$lang['Display options'] = 'הצגת אפשרויות';
+$lang['Display options'] = 'הצג אפשרויות';
 $lang['Dissociated'] = 'מנותק';
-$lang['Does not represent'] = 'האם לא מייצג';
-$lang['Edit selected tags'] = 'ערוך את התגים הנבחרים';
+$lang['Does not represent'] = 'לא צלמית עבור';
+$lang['Edit selected tags'] = 'ערוך תגיות נבחרות';
 $lang['Edit tags'] = 'ערוך תגיות';
-$lang['Email admins when a new user registers'] = 'שלח מייל למנהל כאשר נרשם משתמש חדש';
-$lang['Email admins when a valid comment is entered'] = 'שלח מייל למנהל כאשר נרשמת תגובה';
-$lang['Email admins when a comment requires validation'] = 'שלח מייל למנהל כאשר נדרש אימות לתגובה';
+$lang['Email admins when a new user registers'] = 'שלח מייל לאדמינים כאשר נרשם משתמש חדש';
+$lang['Email admins when a valid comment is entered'] = 'שלח מייל לאדמינים כאשר מתווספת תגובה';
+$lang['Email admins when a comment requires validation'] = 'שלח מייל לאדמינים כאשר נדרש אימות לתגובה';
 $lang['Environment'] = 'סביבה';
 $lang['Form'] = 'טופס';
 $lang['Gallery title'] = 'כותרת הגלריה';
-$lang['Grant selected groups'] = 'להעניק לקבוצות שנבחרו';
-$lang['Grant selected users'] = 'להענית למשתמשים שנבחרו';
+$lang['Grant selected groups'] = 'אשר לקבוצות שנבחרו';
+$lang['Grant selected users'] = 'אשר למשתמשים שנבחרו';
 $lang['Group name'] = 'שם הקבוצה';
 $lang['Groups'] = 'קבוצות';
-$lang['Guests'] = 'האורחים';
+$lang['Guests'] = 'אורחים';
 $lang['History'] = 'היסטוריה';
 $lang['Informations'] = 'מידע';
 $lang['Install'] = 'התקן';
-$lang['Link all album photos to a new album'] = 'קישור כל הפריטים בקטגוריה לקטגוריה חדשה';
-$lang['Link all album photos to some existing albums'] = 'קישור כל הפריטים בקטגוריה לקטגוריה קיימת';
-$lang['Linked albums'] = 'קטגוריות מקושרות';
-$lang['Lock gallery'] = 'גלריה נעולה';
+$lang['Link all album photos to a new album'] = 'קישור כל התמונות באלבום לאלבום חדש';
+$lang['Link all album photos to some existing albums'] = 'קישור כל התמונות באלבום לאלבומים קיימים';
+$lang['Linked albums'] = 'אלבומים מקושרים';
+$lang['Lock gallery'] = 'נעל גלריה';
 $lang['Maintenance'] = 'תחזוקה';
-$lang['Edit album permissions'] = 'ניהול הרשאות עבור קטגוריה';
+$lang['Edit album permissions'] = 'ניהול הרשאות עבור אלבום';
 $lang['Manage permissions for group "%s"'] = 'ניהול הרשאות עבור קבוצה "%s"';
 $lang['Manage permissions for user "%s"'] = 'ניהול הרשאות עבור המשתמש "%s"';
-$lang['Manage tags'] = 'ניהול תגים';
+$lang['Manage tags'] = 'נהל תגיות';
 $lang['Members'] = 'חברים';
-$lang['Metadata synchronized from file'] = 'סנכרון מידע מקובץ';
-$lang['Move albums'] = 'העבר הקטגוריות';
-$lang['Move'] = 'העבר';
+$lang['Metadata synchronized from file'] = 'Metadata סונכרן מקובץ';
+$lang['Move albums'] = 'הזז אלבומים';
+$lang['Move'] = 'הזז';
 $lang['Name'] = 'שם';
 $lang['New name'] = 'שם חדש';
-$lang['New parent album'] = 'קטגורית אם חדשה';
-$lang['New tag'] = 'תג חדש';
+$lang['New parent album'] = 'אלבום הורה חדש';
+$lang['New tag'] = 'תגית חדשה';
 $lang['Number of comments per page'] = 'מספר תגובות בעמוד';
-$lang['Number of rates'] = 'מספר שיעורי';
-$lang['Only private albums are listed'] = 'קטגוריה פרטים לרשומים בלבד';
+$lang['Number of rates'] = 'מספר דירוגים';
+$lang['Only private albums are listed'] = 'רק אלבומים פרטיים מופיעים ברשימה';
 $lang['Operating system'] = 'מערכת הפעלה';
 $lang['Options'] = 'אפשרויות';
-$lang['Other private albums'] = 'קטגוריות פרטיות אחרות';
+$lang['Other private albums'] = 'אלבומים פרטיים אחרים';
 $lang['Page banner'] = 'באנר הדף';
-$lang['Parent album'] = 'קטגורית אם';
-$lang['Path'] = 'נתיב';
-$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'השתמשו בעבר ב Permalink "%s" "זה עבור הקטגוריה "%s". מחק אותו ההסטוריה של permalink';
-$lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'השם Permalink חייב להיות מורכב a-z, A-Z, 0-9, "-", "_" או "/".הוא חייב לא להיות מספרי או להתחיל עם מספר "-"';
-$lang['Permalink %s is already used by album %s'] = 'Permalink "%s" "נמצא כבר בשימוש על ידי הקטגוריה "%s"';
-$lang['Permalink history'] = 'ההיסטוריה Permalinks';
-$lang['Permalinks'] = 'קישורים מפנים';
-$lang['Permission denied'] = 'ההרשאה נדחתה';
-$lang['Permission granted thanks to a group'] = 'ההרשאה ניתנה בזכות הקבוצה';
-$lang['Permission granted'] = 'ניתנה הרשאה';
-$lang['Photo informations updated'] = 'מידע עבור התמונות הועלה';
+$lang['Parent album'] = 'אלבום הורה';
+$lang['Path'] = 'מסלול';
+$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'השתמשו בעבר בקישור קבוע %s זה עבור אלבום %s. ראשית מחוק אותו מהיסטורית הקישורים הקבועים';
+$lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'שם הקישור הקבוע חייב להיות מורכב a-z, A-Z, 0-9, "-", "_" או "/".הוא חייב לא להיות מספרי או להתחיל עם מספר "-"';
+$lang['Permalink %s is already used by album %s'] = 'קישור קבוע %s נמצא כבר בשימוש על ידי אלבום %s';
+$lang['Permalink history'] = 'היסטורית קישורים קבועים';
+$lang['Permalinks'] = 'קישורים קבועים';
+$lang['Permission denied'] = 'הרשאה נדחתה';
+$lang['Permission granted thanks to a group'] = 'הרשאה ניתנה בזכות קבוצה';
+$lang['Permission granted'] = 'הרשאה ניתנה';
+$lang['Photo informations updated'] = 'מידע עבור התמונה עודכן';
 $lang['Plugins'] = 'תוספים';
 $lang['Position'] = 'מיקום';
 $lang['Preferences'] = 'העדפות';
-$lang['Properties'] = 'נכסים';
+$lang['Properties'] = 'תכונות';
 $lang['Random photo'] = 'תמונה אקראית';
 $lang['Rate date'] = 'תאריך דירוג';
 $lang['Rating by guests'] = 'דירוג על ידי אורחים';
 $lang['Rating'] = 'דירוג';
 $lang['Reject'] = 'דחה';
-$lang['Representant'] = 'נציג';
-$lang['Representation of albums'] = 'ייצוג קטגוריות';
-$lang['Representative'] = 'הנציג';
-$lang['Represents'] = 'מייצג';
+$lang['Representant'] = 'צלמית אלבום';
+$lang['Representation of albums'] = 'צלמית אלבום';
+$lang['Representative'] = 'צלמית אלבום';
+$lang['Represents'] = 'צלמית עבור';
 $lang['Save order'] = 'שמור סדר';
-$lang['Save to permalink history'] = 'שמור להיסטורית Permalinks';
-$lang['Select at least one album'] = 'בחר לפחות בקטגוריה אחת';
+$lang['Save to permalink history'] = 'שמור להיסטורית קישורים קבועים';
+$lang['Select at least one album'] = 'בחר לפחות אלבום אחד';
 $lang['Select at least one photo'] = 'בחר לפחות תמונה אחת';
 $lang['Select at least one user'] = 'בחר לפחות משתמש אחד';
 $lang['Show info'] = 'הצג מידע';
 $lang['Site manager'] = 'מנהל אתר';
 $lang['Status'] = 'סטטוס';
-$lang['Statistics'] = 'סטטיסטיקה';
-$lang['Storage album'] = 'מחסן קטגוריות';
-$lang['Sum of rates'] = 'סכום של דירוג';
-$lang['Tag "%s" already exists'] = 'התג "%s"" כבר קיים';
-$lang['Tag "%s" was added'] = 'התג "%s"" נוסף';
-$lang['Tag selection'] = 'בחירת תגית';
+$lang['Statistics'] = 'סטטיסטיקות';
+$lang['Storage album'] = 'אלבום אחסון';
+$lang['Sum of rates'] = 'סכום של דירוגים';
+$lang['Tag "%s" already exists'] = 'התגית "%s" כבר קיימת';
+$lang['Tag "%s" was added'] = 'התגית "%s" התווספה';
+$lang['Tag selection'] = 'בחירת תגיות';
 $lang['The %d following tags were deleted'] = 'התגיות הבאות %d נמחקו';
-$lang['Unable to check for upgrade.'] = 'אין אפשרות לבדוק אם קיימים שדרוגים.';
-$lang['Uninstall'] = 'הסר';
-$lang['Use the default photo sort order'] = 'השתמש תמונת ברירת המחדל להרשמה קצרה';
-$lang['User comments validation'] = 'תגובות מאושרות של המשתמש';
+$lang['Unable to check for upgrade.'] = 'לא מצליח לבדוק אם קיימים שדרוגים.';
+$lang['Uninstall'] = 'הסר התקנה';
+$lang['Use the default photo sort order'] = 'השתמש בברירת המחדל למיון תמונות';
+$lang['User comments validation'] = 'אישור תגובות משתמש';
 $lang['Users'] = 'משתמשים';
-$lang['Validate'] = 'אמת';
-$lang['Validation'] = 'אימות';
+$lang['Validate'] = 'אשר';
+$lang['Validation'] = 'אישור';
 $lang['Version'] = 'גרסה';
-$lang['Virtual albums to move'] = 'הקטגוריות וירטואליות להעברה';
-$lang['Virtual album name'] = 'שם קטגוריה וירטואלית';
-$lang['Webmaster cannot be deleted'] = 'לא ניתן למחוק את מנהל האתר';
+$lang['Virtual albums to move'] = 'אלבומים וירטואלים להזזה';
+$lang['Virtual album name'] = 'שם אלבום וירטואלי';
+$lang['Webmaster cannot be deleted'] = 'לא ניתן למחוק מנהל אתר';
 $lang['You are running on development sources, no check possible.'] = 'אתה פועל על מקורות בפיתוח, לא ניתן לבדוק.';
 $lang['You cannot delete your account'] = 'אתה לא יכול למחוק את החשבון שלך';
-$lang['You cannot move an album in its own sub album'] = 'אתה לא יכול להעביר קטגוריה לתוך התת קטגוריה שלה';
-$lang['You need to confirm deletion'] = 'אתה חייב לאשר את המחיקה';
-$lang['Associate to album'] = 'לשייך לקטגוריה';
+$lang['You cannot move an album in its own sub album'] = 'אתה לא יכול להעביר אלבום לתוך אלבום המשנה שלו עצמו';
+$lang['You need to confirm deletion'] = 'אתה צריך לאשר את המחיקה';
+$lang['Associate to album'] = 'שייך לאבלום';
 $lang['associate to group'] = 'לשייך לקבוצה';
 $lang['Authorized'] = 'מורשה';
-$lang['Add a virtual album'] = 'הוספת קטגוריה וירטואלית';
-$lang['Authorize users to add comments on selected albums'] = 'הרשה למשתמשים להוסיף תגובות לקטגוריות שנבחרו';
-$lang['The name of an album must not be empty'] = 'השם של הקטגוריה לא יכול להיות ריק';
-$lang['Lock albums'] = 'נעל קטגוריות';
-$lang['Private'] = 'קטגוריה פרטית';
-$lang['Public'] = 'קטגוריה ציבורית';
-$lang['Find a new representant by random'] = 'מצא ייצוג אקראי חדש';
-$lang['Public / Private'] = 'ציבורי / פרטי';
-$lang['Manage authorizations for selected albums'] = 'נהל הרשאות עבור הקטגוריות שנבחרו';
-$lang['Virtual album added'] = 'קטגוריה וירטואלית נוספה';
-$lang['Virtual album deleted'] = 'קטגוריה וירטואלית נמחקה';
+$lang['Add a virtual album'] = 'הוסף אלבום וירטואלי';
+$lang['Authorize users to add comments on selected albums'] = 'הרשה למשתמשים להוסיף תגובות לאלבומים שנבחרו';
+$lang['The name of an album must not be empty'] = 'שם האלבום לא יכול להיות ריק';
+$lang['Lock albums'] = 'נעל אלבומים';
+$lang['Private'] = 'פרטי';
+$lang['Public'] = 'פומבי';
+$lang['Find a new representant by random'] = 'מצא צלמית אלבום אקראי חדש';
+$lang['Public / Private'] = 'פומבי / פרטי';
+$lang['Manage authorizations for selected albums'] = 'נהל הרשאות עבור האלבומים שנבחרו';
+$lang['Virtual album added'] = 'אלבום וירטואלי התווסף';
+$lang['Virtual album deleted'] = 'אלבום וירטואלי נמחק';
 $lang['Access type'] = 'סוג גישה';
-$lang['Information data registered in database'] = 'מידע הנתונים רשום במאגר נתונים';
+$lang['Information data registered in database'] = 'נתוני המידע רשומים במסד הנתונים';
 $lang['Default display'] = 'תצוגת ברירת המחדל';
-$lang['The gallery URL is not valid.'] = 'ה-URL בגלריה אינו חוקי.';
-$lang['The number of comments a page must be between 5 and 50 included.'] = 'מספר הערות בדף חייב להיות בין 5 ל 50 כולל.';
+$lang['The gallery URL is not valid.'] = 'URL הגלריה אינו חוקי.';
+$lang['The number of comments a page must be between 5 and 50 included.'] = 'מספר הערות בדף חייב להיות בין 5 ל-50 כולל.';
 $lang['Configuration'] = 'תצורה';
-$lang['confirm'] = 'לאשר';
+$lang['confirm'] = 'אשר';
 $lang['Date'] = 'תאריך';
-$lang['delete album'] = 'למחוק את הקטגוריה';
-$lang['Dissociate from album'] = 'נתק מהקטגוריה';
-$lang['dissociate from group'] = 'נתק מהקבוצה';
-$lang['Album updated successfully'] = 'מידע על הקטגוריה עודכן בהצלחה.';
-$lang['photos per page'] = 'פריטים בעמוד';
-$lang['High definition enabled'] = 'איכות גבוהה מופעלת';
+$lang['delete album'] = 'מחק אלבום';
+$lang['Dissociate from album'] = 'נתק מאלבום';
+$lang['dissociate from group'] = 'נתק מקבוצה';
+$lang['Album updated successfully'] = 'אלבום עודכן בהצלחה.';
+$lang['photos per page'] = 'תמונות בעמוד';
+$lang['High definition enabled'] = 'חדות גבוהה מופעלת';
 $lang['File'] = 'קובץ';
-$lang['first photo added on %s'] = 'הפריט הראשון התווסף ב"%s "';
+$lang['first photo added on %s'] = 'תמונה ראשונה התווספה ל %s ';
 $lang['Forbidden'] = 'אסורה';
 $lang['global mode'] = 'מצב גלובלי';
-$lang['group "%s" added'] = 'הקבוצה "%s"" נוספה';
-$lang['group "%s" deleted'] = 'הקבוצה "%s"" נמחקה';
-$lang['group "%s" updated'] = 'הקבוצה "%s"" הועלתה';
-$lang['The name of a group must not contain " or \' or be empty.'] = "שם של קבוצה לא יכול להכיל מרחאות או ' או להיות ריק";
+$lang['group "%s" added'] = 'הקבוצה "%s" התווספה';
+$lang['group "%s" deleted'] = 'הקבוצה "%s" נמחקה';
+$lang['group "%s" updated'] = 'הקבוצה "%s" עודכנה';
+$lang['The name of a group must not contain " or \' or be empty.'] = 'שם קבוצה לא יכול להכיל ״ או \' או להיות ריק';
 $lang['This name is already used by another group.'] = 'שם זה נמצא כבר בשימוש על ידי קבוצה אחרת.'; 
 
-$lang['High definition'] = 'בחדות גבוהה';
-$lang['jump to album'] = 'לקפוץ לקטגוריה';
-$lang['jump to photo'] = 'קפיצה אל התמונה';
-$lang['leave'] = 'לעזוב';
+$lang['High definition'] = 'חדות גבוהה';
+$lang['jump to album'] = 'קפוץ לאלבום';
+$lang['jump to photo'] = 'קפוץ לתמונה';
+$lang['leave'] = 'עזוב';
 $lang['Lock'] = 'נעל';
 $lang['Locked'] = 'נעול';
-$lang['manage album photos'] = 'ניהול פריטים בקטגוריה';
-$lang['manage sub-albums'] = 'ניהול קטגוריות משנה';
-$lang['Manage'] = 'ניהול';
-$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'זמן ביצוע יוצא, הטיפול חייב להיות המשך [זמן משוער:% השני ד].';
-$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'זמן ביצוע חריגה, הטיפול חייב להמשיך [זמן משוער:% d שניות].';
-$lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'הגיע הזמן להכין את רשימת המשתמשים אשר יישלח בדואר מוגבל למשתמשים אחרים אינם מפורטים..';
-$lang['Time to send mail is limited. Others mails are skipped.'] = 'הזמן כדי לשלוח דואר אלקטרוני מוגבל אחרים כבר דילג..';
-$lang['To send ?'] = 'כדי לשלוח?';
-$lang['Last send'] = 'לאחרונה שלחה';
+$lang['manage album photos'] = 'ניהול תמונות באלבום';
+$lang['manage sub-albums'] = 'ניהול אלבומי משנה';
+$lang['Manage'] = 'נהל';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'הסתיים זמן ריצה, הטיפול חייב להמשך [זמן מוערך: %d שניות]';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'חריגה מזמן ריצה, הטיפול חייב להמשך [זמן מוערך: %d שניות]';
+$lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'הזמן להכין את רשימת המשתמשים אליהם יישלח דואר מוגבל. משתמשים אחרים אינם מפורטים.';
+$lang['Time to send mail is limited. Others mails are skipped.'] = 'הזמן לשליחת דואר מוגבל. מדלגים על דואר לאחרים.';
+$lang['To send ?'] = 'לשלוח?';
+$lang['Last send'] = 'נשלח לאחרונה';
 $lang['User'] = 'משתמש';
-$lang['See you soon,'] = 'נתראה בקרוב';
-$lang['Go to'] = 'עבור';
+$lang['See you soon,'] = 'נתראה בקרוב,';
+$lang['Go to'] = 'עבור אל';
 $lang['Hello'] = 'שלום';
-$lang['New photos were added'] = 'אלמנטים חדשים נוספו';
-$lang['on'] = 'על  Piwigo';
+$lang['New photos were added'] = 'תמונות חדשות התווספו';
+$lang['on'] = 'על';
 $lang['between'] = 'בין';
 $lang['and'] = 'ו';
-$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'שמנהל האתר רשום לך לקבל הודעות בדואר.';
-$lang['You have subscribed to receiving notifications by mail.'] = 'יש לך מנוי כדי לקבל הודעות בדואר.';
-$lang['To subscribe'] = 'כדי להירשם';
-$lang['If you encounter problems or have any question, please send a message to'] = 'אם אתה נתקל בבעיות או יש לך שאלה, שילחו הודעה ל';
+$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'מנהל האתר רשם אותך לקבלת הודעות בדואר.';
+$lang['You have subscribed to receiving notifications by mail.'] = 'נרשמת לקבלת התראות בדואר.';
+$lang['To subscribe'] = 'להירשם';
+$lang['If you encounter problems or have any question, please send a message to'] = 'אם אתה נתקל בבעיות או יש לך שאלה, אנא שלח הודעה אל';
 $lang['[NBM] Problems or questions'] = '[NBM] בעיות או שאלות';
-$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'שמנהל האתר הרשמתך ממך לקבל הודעות בדואר.';
-$lang['You have unsubscribed from receiving notifications by mail.'] = 'ביטלת את המנוי מלהיות הודעה בדואר.';
+$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'מנהל האתר ביטל את הרשמתך לקבלת הודעות בדואר.';
+$lang['You have unsubscribed from receiving notifications by mail.'] = 'ביטלת את ההרשמה לקבלת התראות בדואר.';
 $lang[', click on'] = ', לחץ על';
-$lang['To unsubscribe'] = 'כדי לבטל את המינוי';
-$lang['With blank value, gallery title will be used'] = 'אם ריק, הכותרת בגלריה ישמש';
-$lang['Notification'] = 'עידכוני RSS';
-$lang['Error when sending email to %s [%s].'] = 'שגיאה בעת שליחת דוא"ל אל""%s" "["%s"].';
-$lang['Mail sent to %s [%s].'] = 'דואר שנשלח""%s" "["%s"].';
-$lang['%d mail was sent.'] = 'ד הדואר% נשלחה.';
-$lang['%d mails were sent.'] = 'ד אלקטרוני% נשלחו.';
-$lang['%d mail was not sent.'] = 'ד הדואר% לא נשלחה.';
-$lang['%d mails were not sent.'] = 'ד אלקטרוני% לא נשלחו.';
-$lang['No mail to send.'] = 'דואר לא יישלחו.';
-$lang['There is no available subscribers to mail.'] = 'אין נרשמים כדי לקבל הודעה בדואר.';
-$lang['Subscribers could be listed (available) only if there is new elements to notify.'] = 'המנויים יכולים להיות רשומים (כניסה) רק אם יש אלמנטים חדשים כדי להודיע.';
-$lang['Anyway only webmasters can see this tab and never administrators.'] = 'מנהלי אתרים רק בכל אופן ניתן לראות את הכרטיסייה, לא מנהלים.';
-$lang['No user to send notifications by mail.'] = 'המשתמש לא כדי לקבל הודעה בדואר.';
-$lang['New photos added'] = 'אלמנטים חדשים שנוספו';
-$lang['Subscribe to notification by mail'] = 'מודלים הודעה בדואר';
-$lang['Unsubscribe from notification by mail'] = 'הסרה מרשימת הודעה בדואר';
+$lang['To unsubscribe'] = 'לבטל הרשמה';
+$lang['With blank value, gallery title will be used'] = 'אם ריק, הכותרת בגלריה תהיה בשימוש';
+$lang['Notification'] = 'עדכון';
+$lang['Error when sending email to %s [%s].'] = 'שגיאה בעת שליחת דואל אל %s [%s].';
+$lang['Mail sent to %s [%s].'] = 'דואר נשלח אל %s [%s].';
+$lang['%d mail was sent.'] = '%d דואר נשלח.';
+$lang['%d mails were sent.'] = '%d דואר נשלח.';
+$lang['%d mail was not sent.'] = '%d דואר לא נשלח.';
+$lang['%d mails were not sent.'] = '%d דואר לא נשלח.';
+$lang['No mail to send.'] = 'אין דואר לשליחה.';
+$lang['There is no available subscribers to mail.'] = 'אין נרשמים לקבלת הודעה בדואר.';
+$lang['Subscribers could be listed (available) only if there is new elements to notify.'] = 'המנויים יכולים להיות רשומים (זמינים) רק אם יש אלמנטים חדשים כדי להודיע.';
+$lang['Anyway only webmasters can see this tab and never administrators.'] = 'רק מנהלי אתרים יכולים לראות את כרטיסיה זו, לא אדמינים.';
+$lang['No user to send notifications by mail.'] = 'אין אף משתמש לעדכון בדואר.';
+$lang['New photos added'] = 'תמונות חדשות התווספו';
+$lang['Subscribe to notification by mail'] = 'הרשם להתראות בדואר';
+$lang['Unsubscribe from notification by mail'] = 'בטל הרשמה לקבלת התראות בדואר';
 $lang['Parameter'] = 'הגדרות';
-$lang['Operation in progress'] = 'הטיפול מתבצעת.';
+$lang['Operation in progress'] = 'הטיפול בתהליך.';
 $lang['Continue processing treatment'] = 'המשך הטיפול השוטף';
-$lang['Complementary mail content'] = 'דואר תוכן משלימים';
-$lang['Add detailed content'] = 'מוסיפים קצת תוכן מפורט';
+$lang['Complementary mail content'] = 'תוכן דואר משני';
+$lang['Add detailed content'] = 'הוסף קצת תוכן מפורט';
 $lang['Send mail as'] = 'שלח דואר כ';
 $lang['Send mail to users'] = 'שלח דואר למשתמשים';
 $lang['Send'] = 'שלח';
 $lang['Options'] = 'אפשרויות';
-$lang['Subscribed'] = 'מנויים';
+$lang['Subscribed'] = 'רשום';
 $lang['Subscribe'] = 'הרשם';
 $lang['Parameters'] = 'פרמטרים';
-$lang['Select recipients'] = 'בחירת נמענים';
-$lang['Subscribe/unsubscribe users'] = 'להירשם / לבטל את המנוי משתמשים';
-$lang['Unsubscribed'] = 'המינוי';
-$lang['%d parameter was updated.'] = 'ד פרמטר% המעודכן.';
-$lang['%d parameters were updated.'] = 'ד הפרמטרים% המעודכן.';
-$lang['%d user was not updated.'] = 'המשתמש% d לא מעודכן.';
-$lang['%d users were not updated.'] = 'ד למשתמשים% לא מעודכן.';
-$lang['User %s [%s] was removed from the subscription list.'] = 'המשתמש""%s" "["%s"] מרשימת המנויים.';
-$lang['User %s [%s] was added to the subscription list.'] = 'המשתמש""%s" "["%s"] לרשימת המנויים.';
-$lang['%d user was updated.'] = 'ד המשתמש% המעודכן.';
-$lang['%d users were updated.'] = 'ד למשתמשים% המעודכן.';
-$lang['User %s [%s] was not removed from the subscription list.'] = 'המשתמש""%s" "["%s"] לא יוסר מרשימת המנויים.';
-$lang['User %s [%s] was not added to the subscription list.'] = 'המשתמש""%s" "["%s"] לא הוסיף לרשימה המנוי.';
-$lang['User %s [%s] added.'] = 'המשתמש""%s" "["%s"] הוסיף.';
-$lang['Warning: subscribing or unsubscribing will send mails to users'] = 'אזהרה: מנוי או ביטול המנוי תשלח מיילים למשתמשים';
+$lang['Select recipients'] = 'בחר נמענים';
+$lang['Subscribe/unsubscribe users'] = 'להירשם/לבטל את המנוי של המשתמשים';
+$lang['Unsubscribed'] = 'בוטלה הרשמה';
+$lang['%d parameter was updated.'] = '%d פרמטר עודכן.';
+$lang['%d parameters were updated.'] = '%d פרמטרים עודכנו.';
+$lang['%d user was not updated.'] = '%d משתמש לא עודכן.';
+$lang['%d users were not updated.'] = '%d משתמשים לא עודכנו.';
+$lang['User %s [%s] was removed from the subscription list.'] = 'משתמש %s [%s] הוסר מרשימת המנויים';
+$lang['User %s [%s] was added to the subscription list.'] = 'משתמש %s [%s] התווסף לרשימת המנויים.';
+$lang['%d user was updated.'] = '%d משתמש עודכן.';
+$lang['%d users were updated.'] = '%d משתמשים עודכנו.';
+$lang['User %s [%s] was not removed from the subscription list.'] = 'משתמש %s [%s] לא הוסר מרשימת המנויים';
+$lang['User %s [%s] was not added to the subscription list.'] = 'משתמש %s [%s] לא התווסף לרשימת המנויים';
+$lang['User %s [%s] added.'] = 'משתמש %s [%s] התווסף.';
+$lang['Warning: subscribing or unsubscribing will send mails to users'] = 'אזהרה: מנוי או ביטול המנוי יגרמו לשליחת מיילים למשתמשים';
 $lang['Send mail on HTML format'] = 'שלח דואר בתבנית HTML';
-$lang['Include display of recent photos grouped by dates'] = 'להציג כלול התמונות האחרונות מקובצים לפי תאריכים';
-$lang['Available only with HTML format'] = 'ניתן להשיג רק עם פורמט HTML';
-$lang['no write access'] = 'אין גישה לכתוב';
+$lang['Include display of recent photos grouped by dates'] = 'כלול תצוגה של התמונות האחרונות מאוגדות לפי תאריכים';
+$lang['Available only with HTML format'] = 'זמין רק בפורמט HTML';
+$lang['no write access'] = 'אין גישה לכתיבה';
 $lang['Permissions'] = 'הרשאות';
-$lang['private'] = 'פרטית';
-$lang['public'] = 'הציבור';
-$lang['Purge never used notification feeds'] = 'הטיהור מעולם ההודעה בשימוש הזנות';
-$lang['Purge sessions'] = 'מפגשים הטיהור';
-$lang['randomly represented'] = 'נציג אקראי';
+$lang['private'] = 'פרטי';
+$lang['public'] = 'פומבי';
+$lang['Purge never used notification feeds'] = 'נקה פידים של התראות ללא שימוש';
+$lang['Purge sessions'] = 'נקה סשנים';
+$lang['randomly represented'] = 'צלמית אלבום אקראית';
 $lang['registration date'] = 'תאריך רישום';
-$lang['clean'] = 'לנקות';
+$lang['clean'] = 'ניקוי';
 $lang['Create this site'] = 'צור את האתר הזה';
-$lang['test'] = 'מבחן';
-$lang['test this remote site'] = 'מבחן זה באתר מרוחק'; 
-$lang['remove tags'] = 'להסיר את תגי';
-$lang['Repair and optimize database'] = 'תיקון מסד אופטימיזציה';
-$lang['selection'] = 'הבחירה';
-$lang['set to'] = 'מוגדר';
-$lang['singly represented'] = 'נציג קבוע';
+$lang['test'] = 'בדיקה';
+$lang['test this remote site'] = 'בדוק אתר מרוחק זה';
+$lang['remove tags'] = 'הסר תגיות';
+$lang['Repair and optimize database'] = 'תקן ובצע אופטימיזצית מסד נתונים';
+$lang['selection'] = 'בחירה';
+$lang['set to'] = 'שנה ל';
+$lang['singly represented'] = 'צלמית אלבום קבועה';
 $lang['This site already exists'] = 'אתר זה כבר קיים';
-$lang['created'] = 'יצר';
-$lang['delete'] = 'למחוק';
-$lang['delete this site and all its attached elements'] = 'למחוק את האתר הזה ואת כל המידע בנושא';
+$lang['created'] = 'נוצר';
+$lang['delete'] = 'מחק';
+$lang['delete this site and all its attached elements'] = 'מחק אתר הזה ואת כל המידע הקשור אליו';
 $lang['an error happened'] = 'אירעה שגיאה';
-$lang['Local'] = 'מקומית';
-$lang['Remote'] = 'מרחוק';
-$lang['update the database from files'] = 'לעדכן את מסד הנתונים עם קבצים';
+$lang['Local'] = 'מקומי';
+$lang['Remote'] = 'מרוחק';
+$lang['update the database from files'] = 'עדכן את מסד הנתונים עם קבצים';
 $lang['status'] = 'מעמד';
-$lang['Directory'] = 'מדריך';
-$lang['sub-albums'] = 'קטגוריות משנה';
-$lang['Synchronize metadata'] = 'לסנכרן מטה';
-$lang['target'] = 'המטרה';
+$lang['Directory'] = 'ספריה';
+$lang['sub-albums'] = 'אלבומי משנה';
+$lang['Synchronize metadata'] = 'לסנכרן metadata';
+$lang['target'] = 'מטרה';
 $lang['Title'] = 'כותרת';
-$lang['Album list management'] = 'ניהול קטגוריות';
-$lang['Piwigo configuration'] = 'תצורה Piwigo';
-$lang['Edit album'] = 'ערוך קטגוריה';
+$lang['Album list management'] = 'ניהול רשימת אלבומים';
+$lang['Piwigo configuration'] = 'תצורת Piwigo';
+$lang['Edit album'] = 'ערוך אלבום';
 $lang['Group management'] = 'ניהול קבוצות';
 $lang['User list'] = 'רשימת משתמשים';
-$lang['Database synchronization with files'] = 'מסד נתונים לסינכרון עם קבצים';
+$lang['Database synchronization with files'] = 'סינכרון מסד הנתונים עם קבצים';
 $lang['all'] = 'כל';
-$lang['height must be a number superior to'] = 'גובה חייב להיות מספר גדול יותר';
-$lang['width must be a number superior to'] = 'רוחב חייב להיות מספר גדול יותר';
+$lang['height must be a number superior to'] = 'גובה חייב להיות מספר גבוה יותר מאשר';
+$lang['width must be a number superior to'] = 'רוחב חייב להיות מספר גבוה יותר מאשר';
 $lang['for the file format'] = 'עבור פורמט קובץ';
-$lang['Photo unreachable or no support'] = 'תמונה בפורמט נגיש או נתמך';
-$lang['GD version'] = 'גרסת ה ';
-$lang['General statistics'] = 'סטטיסטיקה';
-$lang['average time'] = 'הזמן הממוצע';
-$lang['total time'] = 'זמן מסך';
+$lang['Photo unreachable or no support'] = 'תמונה לא נגישה או בפורמט לא נתמך';
+$lang['GD version'] = 'גרסת GD ';
+$lang['General statistics'] = 'סטטיסטיקה כללית';
+$lang['average time'] = 'זמן ממוצע';
+$lang['total time'] = 'זמן כולל';
 $lang['for this file format'] = 'עבור פורמט קובץ זה';
 $lang['unit mode'] = 'מצב יחיד';
-$lang['Unlocked'] = 'נעולים';
-$lang['unset'] = 'Unset';
-$lang['Update albums informations'] = 'עדכון פרטים הקטגוריות';
-$lang['Update photos information'] = 'עדכון פרטים תמונות';
+$lang['Unlocked'] = 'לא נעולים';
+$lang['unset'] = 'לא מופעל';
+$lang['Update albums informations'] = 'עדכן פרטי אלבומים';
+$lang['Update photos information'] = 'עדכון פרטי תמונות';
 $lang['Synchronize'] = 'סנכרן';
-$lang['reduce to single existing albums'] = 'כדי לצמצם את הקטגוריות הקיימות יחיד';
+$lang['reduce to single existing albums'] = 'צמצם אלבומים קיימים לאחד';
 $lang['Choose an option'] = 'בחר באפשרות';
-$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'מקסימום מידע לתצוגה (קטגוריות הוסיף אלמנטים, קטגוריות שנמחקו אלמנטים)';
+$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'הצג מידע מירבי (אלבומים ותמונות שהתווספו, אלבומים ותמונות שנמחקו)';
 $lang['Error list'] = 'רשימת שגיאות';
-$lang['Errors caption'] = 'שגיאות אגדות';
-$lang['Detailed informations'] = 'ידיעות מפורט';
-$lang['File/directory read error'] = 'קובץ / ספרייה לקרוא שגיאה';
-$lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'הקובץ או הספרייה לא ניתן לגשת (או שזה לא קיים או הגישה נדחתה)';
-$lang['albums deleted in the database'] = 'קטגוריות שנמחקו באתר';
-$lang['photos deleted from the database'] = 'אלמנטים שנמחקו באתר';
-$lang['photos candidates for metadata synchronization'] = 'תמונות המועמדים לסינכרון מטה';
-$lang['photos informations synchronized with files metadata'] = 'אלמנטים ידיעות מסונכרן עם metadata קבצים';
-$lang['errors during synchronization'] = 'טעויות במהלך הסנכרון';
-$lang['albums added in the database'] = 'הקטגוריות הוסיף באתר';
-$lang['photos added in the database'] = 'רכיבים נוספים באתר';
-$lang['photos updated in the database'] = 'אלמנטים עודכן באתר';
-$lang['Search for new images in the directories'] = 'מחפש תמונות חדשות של ספריות';
-$lang['added'] = 'מוסף';
+$lang['Errors caption'] = 'מקראי שגיאות';
+$lang['Detailed informations'] = 'מידע מפורט';
+$lang['File/directory read error'] = 'שגיאה בקריאת קובץ/ספריה';
+$lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'לא ניתן לגשת לקובץ או לספריה (אינם קיימים או שהגישה נדחתה)';
+$lang['albums deleted in the database'] = 'אלבומים נמחקו ממסד הנתונים';
+$lang['photos deleted from the database'] = 'תמונות נמחקו ממסד הנתונים';
+$lang['photos candidates for metadata synchronization'] = 'תמונות המועמדות לסינכרון metadata';
+$lang['photos informations synchronized with files metadata'] = ' מידע תמונות מסונכרן עם metadata של קבצים';
+$lang['errors during synchronization'] = 'שגיאות במהלך הסנכרון';
+$lang['albums added in the database'] = 'אלבומים התווספו למסד הנתונים';
+$lang['photos added in the database'] = 'תמונות התווספו למסד הנתונים';
+$lang['photos updated in the database'] = 'תמונות עודכנו במסד הנתונים';
+$lang['Search for new images in the directories'] = 'חיפוש אחר תמונות חדשות בספריות';
+$lang['added'] = 'התווסף';
 $lang['deleted'] = 'נמחק';
-$lang['Metadata synchronization results'] = 'Metadata תוצאות סינכרון';
-$lang['only perform a simulation (no change in database will be made)'] = 'רק לבצע סימולציה (דבר יהיה שונה במסד הנתונים)';
-$lang['Simulation'] = 'הדמיה';
-$lang['directories + files'] = 'תמונות + תקיות';
-$lang['only directories'] = 'תקיות בלבד';
-$lang['synchronize files structure with database'] = 'לסנכרן מבנה קבצים עם מסד נתונים';
-$lang['synchronize files metadata with database photos informations'] = 'לסנכרן אלמנטים מסד נתונים עם metadata קבצים';
-$lang['even already synchronized photos'] = 'אפילו פריטים שסונכרנו כבר';
+$lang['Metadata synchronization results'] = 'תוצאות סינכרון Metadata';
+$lang['only perform a simulation (no change in database will be made)'] = 'רק בצע סימולציה (דבר לא ישתנה במסד הנתונים)';
+$lang['Simulation'] = 'סימולציה';
+$lang['directories + files'] = 'קבצים + ספריות';
+$lang['only directories'] = 'ספריות בלבד';
+$lang['synchronize files structure with database'] = 'סנכרן מבנה קבצים עם מסד הנתונים';
+$lang['synchronize files metadata with database photos informations'] = 'סנכרן תמונות ממסד נתונים עם metadata קבצים';
+$lang['even already synchronized photos'] = 'אפילו תמונות שסונכרנו כבר';
 $lang['Used metadata'] = 'Metadata בשימוש';
-$lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = 'השם של תיקיות וקבצים חייב לכלול רק אותיות, מספרים, " -  ", " _  "או "  "';
+$lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = 'השם של תיקיות וקבצים חייב לכלול רק אותיות, מספרים, "-", ״_" או ״.״';
 $lang['wrong filename'] = 'שם קובץ שגוי';
-$lang['Upload'] = 'העלה';
-$lang['user "%s" added'] = 'המשתמש "%s" נוסף';
+$lang['Upload'] = 'טעינה';
+$lang['user "%s" added'] = 'המשתמש "%s" התווסף';
 $lang['User status'] = 'מצב משתמש';
-$lang['user_status_admin'] = 'מחובר כמשתמש כמנהל';
-$lang['user_status_generic'] = 'מחובר כמשתמש כללי';
-$lang['user_status_guest'] = 'מחובר כמשתמש אורח';
-$lang['user_status_normal'] = 'מחובר כמשתמש רגיל';
-$lang['user_status_webmaster'] = 'מחובר כמשתמש מנהל האתר';
-$lang['Virtual album'] = 'הקטגוריה וירטואלית';
+$lang['user_status_admin'] = 'אדמין';
+$lang['user_status_generic'] = 'כללי';
+$lang['user_status_guest'] = 'אורח';
+$lang['user_status_normal'] = 'משתמש';
+$lang['user_status_webmaster'] = 'מנהל האתר';
+$lang['Virtual album'] = 'אלבום וירטואלי';
 $lang['Waiting'] = 'בהמתנה';
-$lang['default'] = 'ברירת המחדל';
-$lang['Toggle \'default group\' property'] = "תייג 'קבוצת ברירת מחדל' ערך";
+$lang['default'] = 'ברירת מחדל';
+$lang['Toggle \'default group\' property'] = 'הפוך תכונת \'קבוצת ברירת מחדל׳';
 $lang['Advanced features'] = 'תכונות מתקדמות';
-$lang['Overall'] = 'מבט';
+$lang['Overall'] = 'סקירה';
 $lang['Year'] = 'שנה';
 $lang['Month'] = 'חודש';
 $lang['Day'] = 'יום';
 $lang['Pages seen'] = 'דפים שניצפו';
 $lang['Time'] = 'זמן';
-$lang['IP'] = 'אי פי';
+$lang['IP'] = 'IP';
 $lang['Element'] = 'מרכיב';
-$lang['Section'] = 'סעיף';
-$lang['An information email was sent to group "%s"'] = 'דואר אלקטרוני נשלח לקבוצה "%s"';
-$lang['Send an information email to group members'] = 'שלח הודעת דואר אלקטרוני מידע על חברי הקבוצה';
-$lang['Group'] = 'הקבוצה';
-$lang['%s value is not correct file because exif are not supported'] = '%s התמונה לא הועלתה כיוון שהאתר לא תומך בפורמט תמונה זה';
+$lang['Section'] = 'קטע';
+$lang['An information email was sent to group "%s"'] = 'דואל מידע נשלח לקבוצה "%s"';
+$lang['Send an information email to group members'] = 'שלח מידעון דואר לחברי הקבוצה';
+$lang['Group'] = 'קבוצה';
+$lang['%s value is not correct file because exif are not supported'] = '%s value is incorrect because exif are not supported';
 $lang['Hello,'] = 'שלום,';
 $lang['See you soon.'] = 'נתראה בקרוב.';
-$lang['Discover album:'] = 'גלה את הקטגוריה:';
-$lang['Mail content'] = 'דואר תוכן';
-$lang['none'] = 'אף אחד';
-$lang['high'] = 'גבוהה';
-$lang['other'] = 'אחרים';
+$lang['Discover album:'] = 'גלה אלבום:';
+$lang['Mail content'] = 'תוכן דואר';
+$lang['none'] = 'כלום';
+$lang['high'] = 'גבוה';
+$lang['other'] = 'אחר';
 $lang['Element type'] = 'סוג מרכיב';
 $lang['Image id'] = 'מזהה תמונה';
 $lang['Summary'] = 'סיכום';
-$lang['%d line filtered'] = '%d שורה מסומנת';
-$lang['%d lines filtered'] = '%d שורות מסומנות';
+$lang['%d line filtered'] = '%d שורה מסוננת';
+$lang['%d lines filtered'] = '%d שורות מסוננות';
 $lang['%d guest'] = '%d אורח';
 $lang['%d guests'] = '%d אורחים';
 $lang['Hour'] = 'שעה';
-$lang['guest'] = 'האורח';
+$lang['guest'] = 'אורח';
 $lang['default values'] = 'ערכי ברירת המחדל';
-$lang['Guest cannot be deleted'] = 'חוות דעת לא ניתן למחוק';
-$lang['Default user cannot be deleted'] = 'המשתמש ברירת מחדל ולא ניתן למחוק';
-$lang['Purge history detail'] = 'ההיסטוריה פרטים הטיהור';
-$lang['Purge history summary'] = 'ההיסטוריה סיכום הטיהור';
-$lang['Check integrity'] = 'בדיקת תקינות';
+$lang['Guest cannot be deleted'] = 'לא ניתן למחוק אורח';
+$lang['Default user cannot be deleted'] = 'לא ניתן למחוק את משתמש ברירת המחדל';
+$lang['Purge history detail'] = 'נקה פרטי הסטוריה';
+$lang['Purge history summary'] = 'נקה סיכום הסטוריה';
+$lang['Check integrity'] = 'בדיקת תקינות.';
 $lang['Anomaly'] = 'אנומליה';
 $lang['Correction'] = 'תיקון';
 $lang['Automatic correction'] = 'תיקון אוטומטי';
-$lang['Impossible automatic correction'] = 'אוטומטיים impossibl תיקון';
-$lang['Correction applied with success'] = 'תיקון מיושם בהצלחה';
-$lang['Correction applied with error'] = 'תיקון להחיל עם שגיאה';
+$lang['Impossible automatic correction'] = 'תיקון אוטומטי בלתי אפשרי';
+$lang['Correction applied with success'] = 'תיקון הוחל בהצלחה';
+$lang['Correction applied with error'] = 'תיקון הוחל עם שגיאה';
 $lang['%d anomaly has been detected.'] = '%d חריגה זוהתה.';
 $lang['%d anomalies have been detected.'] = '%d חריגות זוהו.';
 $lang['%d anomaly has been corrected.'] = '%d חריגה תוקנה.';
-$lang['%d anomalies have been detected corrected.'] = '%d חריגות תוקנו.';
-$lang['%d anomaly has not been corrected.'] = '%d תריגה לא תוקנה.';
+$lang['%d anomalies have been detected corrected.'] = '%d חריגות זוהו ותוקנו.';
+$lang['%d anomaly has not been corrected.'] = '%d חריגה לא תוקנה.';
 $lang['%d anomalies have not been corrected.'] = '%d חריגות לא תוקנו.';
-$lang['[%s] Visit album %s'] = 'עבור אל "%s" או "%s" למידע';
+$lang['[%s] Visit album %s'] = '[%s] בקר אלבום %s';
 $lang['the forum'] = 'הפורום';
-$lang['the wiki'] = 'המילון';
-$lang['Go to %s or %s for more informations'] = 'הערך "%s" חייב להיות מדוייק כיוון שלא ניתן להשתמש ב exif';
-$lang['%s must be to set to false in your local/config/config.inc.php file'] = '"%s" "חייב להיות מוגדר שווא בקובץ המקומי שלך / / config config.inc.php';
-$lang['Main "guest" user does not exist'] = 'המשתמש "אורח" לא קיים';
-$lang['Main "guest" user status is incorrect'] = 'הסטטוס של ה"אורח" לא נכון';
-$lang['Default user does not exist'] = 'המשתמש של ברירת המחדל אינה קיימת';
-$lang['Main "webmaster" user does not exist'] = 'המשתמש "מנהל האתר" לא קיים';
-$lang['Main "webmaster" user status is incorrect'] = 'המשתמש "מנהל האתר" לא נכון';
-$lang['User "%s" created with "%s" like password'] = 'המשתמש "%s" נוצר עם "%s" ואותה סיסמה';
+$lang['the wiki'] = 'הוויקי';
+$lang['Go to %s or %s for more informations'] = 'עבור אל %s או %s לעוד מידע';
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = '%s must be set to false in your local/config/config.inc.php file';
+$lang['Main "guest" user does not exist'] = 'משתמש "אורח" הראשי לא קיים';
+$lang['Main "guest" user status is incorrect'] = 'הסטטוס של משתמש "אורח" הראשי לא נכון';
+$lang['Default user does not exist'] = 'משתמש ברירת המחדל לא קיים';
+$lang['Main "webmaster" user does not exist'] = 'משתמש "מנהל האתר" הראשי לא קיים';
+$lang['Main "webmaster" user status is incorrect'] = 'משתמש "מנהל האתר" הראשי לא נכון';
+$lang['User "%s" created with "%s" like password'] = 'משתמש "%s" נוצר עם "%s" כסיסמה';
 $lang['Status of user "%s" updated'] = 'הסטטוס של המשתמש "%s" עודכן';
-$lang['add new photos to caddie'] = 'הוסף פריט חדש לסל';
-$lang['No display'] = 'לא להציג';
+$lang['add new photos to caddie'] = 'הוסף תמונות חדשות לסל';
+$lang['No display'] = 'ללא תצוגה';
 $lang['Classic display'] = 'תצוגה קלאסית';
-$lang['Hoverbox display'] = 'להציג Hoverbox';
-$lang['Minimum privacy level'] = 'מינימום רמת הפרטיות';
-$lang['Privacy level'] = 'פרטיות ברמה';
+$lang['Hoverbox display'] = 'תצוגת Hoverbox';
+$lang['Minimum privacy level'] = 'רמת פרטיות מינימלית';
+$lang['Privacy level'] = 'רמת פרטיות';
 $lang['Level 0'] = '---';
 $lang['Level 1'] = 'אנשי קשר';
-$lang['Level 2'] = 'החברים';
+$lang['Level 2'] = 'חברים';
 $lang['Level 4'] = 'משפחה';
-$lang['Level 8'] = 'מנהלים';
-$lang['Reinitialize check integrity'] = 'Reinitialize בדיקת תקינות';
-$lang['Check all'] = 'בדוק את כל';
-$lang['Uncheck all'] = 'בטל את כל';
+$lang['Level 8'] = 'אדמינים';
+$lang['Reinitialize check integrity'] = 'אתחל מחדש בדיקת תקינות';
+$lang['Check all'] = 'בדוק הכל';
+$lang['Uncheck all'] = 'בטל את כל הסימונים';
 $lang['Check automatic corrections'] = 'בדוק תיקונים אוטומטיים';
-$lang['Apply selected corrections'] = 'תיקונים שנבחר החל';
-$lang['Ignore selected anomalies'] = 'התעלם אנומליות נבחר';
-$lang['Refresh'] = 'רענון';
-$lang['The anomaly will be ignored until next application version'] = 'האנומליה תתעלם עד לגרסה הבאה הבקשה';
+$lang['Apply selected corrections'] = 'החל תיקונים שנבחרו';
+$lang['Ignore selected anomalies'] = 'התעלם מאנומליות שנבחרו';
+$lang['Refresh'] = 'רענן';
+$lang['The anomaly will be ignored until next application version'] = 'נתעלם מהאנומליה עד לגרסה הבאה של היישום';
 $lang["Correction the anomaly will cancel the fact that it's ignored"] = 'תיקן האנומליה לא יהיה עוד להתעלם ממנו';
-$lang['%d anomaly has been ignored.'] = '%d חריגה שהתעלמתה ממנה.';
-$lang['%d anomalies have been ignored.'] = '%d חריגות שהתעלמה מהן.';
-$lang['Plugins which need upgrade'] = 'תוספים שיש לעדכן';
+$lang['%d anomaly has been ignored.'] = '%d חריגה שהתעלמו ממנה.';
+$lang['%d anomalies have been ignored.'] = '%d חריגות שהתעלמו מהם.';
+$lang['Plugins which need upgrade'] = 'תוספים לשדרוג';
 $lang['Plugin list'] = 'רשימת תוספים';
-$lang['Check for updates'] = 'בדוק עדכונים';
-$lang['Other plugins'] = 'תוספים נוספים זמינים';
-$lang['Last revisions'] = 'התיקונים האחרונים';
+$lang['Check for updates'] = 'חפש עדכונים';
+$lang['Other plugins'] = 'תוספים אחרים זמינים';
+$lang['Last revisions'] = 'גירסאות אחרונות';
 $lang['Are you sure you want to delete this plugin?'] = 'האם אתה בטוח שאתה רוצה למחוק את התוסף הזה?';
 $lang['Are you sure you want to install this plugin?'] = 'האם אתה בטוח שאתה רוצה להתקין את התוסף הזה?';
-$lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = 'האם אתה בטוח שאתה רוצה להתקין את השדרוג, עליך לוודא אם הגרסה הזאת לא צריך ההסרה לפני?.';
-$lang['Plugin has been successfully copied'] = 'תוסף הועתקה בהצלחה';
+$lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = 'האם אתה בטוח שאתה רוצה להתקין את השדרוג? עליך לוודא אם הגרסה הזאת לא צריכה הסרה לפני הפעולה.';
+$lang['Plugin has been successfully copied'] = 'התוסף הועתק בהצלחה';
 $lang["Can't create temporary file."] = 'קובץ זמני אינו יכול להיווצר.';
 $lang["Can't download archive."] = 'ארכיון לא ניתן להוריד.';
 $lang["Can't read or extract archive."] = 'ארכיון לא ניתן לקרוא או חילוץ.';
-$lang['An error occured during extraction (%s).'] = 'אירעה שגיאה במהלך קבצים ("%s") החילוץ.';
-$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'בבקשה בדוק את ההרשאות לתיקיה "plugins" ולתת תיקיות שלה (CHMOD)';
+$lang['An error occured during extraction (%s).'] = 'אירעה שגיאה במהלך ייצוא קבצים ("%s").';
+$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'אנא בדוק את ההרשאות לתיקית "plugins" ולתת התיקיות שלה (CHMOD)';
 $lang["Can't connect to server."] = 'החיבור לשרת בלתי אפשרי.';
-$lang['Purge compiled templates'] = 'הידור הטיהור תבניות';
+$lang['Purge compiled templates'] = 'נקה תבניות מקומפלות';
 $lang['ACCESS_0'] = 'גישה חופשית';
-$lang['ACCESS_1'] = 'גישה לכל';
+$lang['ACCESS_1'] = 'גישה לכולם';
 $lang['ACCESS_2'] = 'גישה למשתמשים רשומים';
-$lang['ACCESS_3'] = 'גישה למנהלים';
-$lang['ACCESS_4'] = 'גישה למנהל האתר';
+$lang['ACCESS_3'] = 'גישה לאדמינים';
+$lang['ACCESS_4'] = 'גישה למנהלי האתר';
 $lang['ACCESS_5'] = 'אין גישה';
 $lang['Support'] = 'תמיכה';
 $lang['Documentation'] = 'תיעוד';
-$lang['A new version of Piwigo is available.'] = 'הגרסה החדשה של Piwigo זמין.';
-$lang['Piwigo Administration'] = 'המינהל Piwigo';
-$lang['Piwigo version'] = 'הגרסה Piwigo';
-$lang['You are running the latest version of Piwigo.'] = 'אתה מפעיל את הגירסה העדכנית Piwigo.';
+$lang['A new version of Piwigo is available.'] = 'גרסה חדשה של Piwigo זמינה.';
+$lang['Piwigo Administration'] = 'ניהול Piwigo';
+$lang['Piwigo version'] = 'גרסת Piwigo';
+$lang['You are running the latest version of Piwigo.'] = 'אתה מריץ את הגירסה העדכנית ביותר של Piwigo.';
 $lang['The version of %s [%s] installed is not compatible with the version required [%s]'] = 'הגרסה של""%s" "["%s"] התקנת אינו תואם לגרסה הנדרש ["%s"]';
-$lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = 'אתה צריך לשדרג את המערכת שלך כדי לנצל את מלוא היתרונות של הבקשה, אחרת הבקשה יכול לעבוד כראוי, או בכלל לא';
+$lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = 'אתה צריך לשדרג את המערכת שלך כדי לנצל את מלוא היכולות של היישום, אחרת היישום יכול לעבוד לא כראוי, או בכלל לא';
 $lang['Deleted on'] = 'נמחק על';
-$lang['Last hit'] = 'מכה אחרונה';
-$lang['GD library is missing'] = 'ספריית GD חסר';
+$lang['Last hit'] = 'פגיעה אחרונה';
+$lang['GD library is missing'] = 'ספריית GD חסרה';
 $lang['Templates'] = 'תבניות';
 $lang['Extend for templates'] = 'הרחב תבניות';
-$lang['Replacement of original templates by customized templates from template-extension subfolder'] = 'החלפת המקורי תבניות ידי אישית תבניות מ-תיקיית משנה סיומת התבנית';
-$lang['Replacers (customized templates)'] = 'ותחליפיו (אישית תבניות)';
-$lang['Original templates'] = 'מקורי תבניות';
-$lang['Optional URL keyword'] = 'מילת המפתח תכנית אופציונלית';
-$lang['Templates configuration has been recorded.'] = 'תצורה תבניות נרשמה.';
-$lang['All optimizations have been successfully completed.'] = 'אופטימיזציות כל הושלמו בהצלחה.';
-$lang['Optimizations have been completed with some errors.'] = 'אופטימיזציות הושלמו עם שגיאות כמה.';
-$lang['Modify information'] = 'שינוי פרטים';
+$lang['Replacement of original templates by customized templates from template-extension subfolder'] = 'החלפת תבניות מקוריות בתבניות מותאמות אישית מתת-תיקיית הרחבות התבניות';
+$lang['Replacers (customized templates)'] = 'תחליפים (תבניות מותאמות אישית)';
+$lang['Original templates'] = 'תבניות מקוריות';
+$lang['Optional URL keyword'] = 'מילת מפתח של URL אופציונלית';
+$lang['Templates configuration has been recorded.'] = 'תועדה תצורת התבניות.';
+$lang['All optimizations have been successfully completed.'] = 'כל האופטימיזציות הושלמו בהצלחה.';
+$lang['Optimizations have been completed with some errors.'] = 'האופטימיזציות הסתיימו עם מספר שגיאות.';
+$lang['Modify information'] = 'עדכן מידע';
 $lang['nothing'] = 'שום דבר';
-$lang['overrides existing values with empty ones'] = 'מלא ערכים קיימים עם ערכים ריקים';
-$lang['Manage photo ranks'] = 'נהל את דירוג התמונות';
+$lang['overrides existing values with empty ones'] = 'דרוס ערכים קיימים עם ערכים ריקים';
+$lang['Manage photo ranks'] = 'סדר מיון תמונות';
 $lang['Edit ranks'] = 'ערוך דירוג';
-$lang['No photo in this album'] = 'אין פריט בקטגוריה זו';
-$lang['Images manual order was saved'] = 'סדר התמונות נשמה';
+$lang['No photo in this album'] = 'אין תמונה באלבום זה';
+$lang['Images manual order was saved'] = 'סדר תמונות ידני נשמר';
 $lang['ranks'] = 'דירוגים';
 $lang['By rank'] = 'לפי דירוג';
 $lang['Manual order'] = 'סדר ידני ';
 $lang['Drag to re-order'] = 'גרור כדי לסדר מחדש';
 $lang['Quick Local Synchronization'] = 'סנכרון מקומי מהיר';
-$lang['No photo can be deleted'] = 'לא ניתן למחוק את התמונה';
-$lang['Delete selected photos'] = 'מחק רת בתמונות שנבחרו';
+$lang['No photo can be deleted'] = 'לא ניתן למחוק אף תמונה';
+$lang['Delete selected photos'] = 'מחק את התמונות שנבחרו';
 $lang['%d photo was deleted'] = '%d תמונה נמחקה';
 $lang['%d photos were deleted'] = '%d תמונות נמחקו';
 $lang['Downloads'] = 'הורדות';
-$lang['Released on'] = 'יצא';
+$lang['Released on'] = 'שוחרר ב';
 $lang['Number of downloads'] = 'מספר הורדות';
 $lang['Piwigo Announcements Newsletter'] = 'עלון Piwigo';
 $lang["Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it's important to know and upgrade) and when major events happen to the project. Only a few emails a year."] = 'שמור על קשר עם פרויקט Piwigo, ההירשם לעלון של Piwigo. תישלח אליך הודעות דוא"ל כאשר מהדורה חדשה תיהיה זמינה (לפעמים כולל תיקון באג אבטחה, חשוב לדעת ולשדרג) וכאשר ישנם אירועים מרכזיים הפרויקט. רק כמה הודעות דוא"ל בשנה ';
-$lang['Subscribe %s'] = 'הירשם "%s"';
-$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'הרשם""%s" "כדי Piwigo עלון הכרזות';
+$lang['Subscribe %s'] = 'הירשם %s';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'הרשם %s למידעון הכרזות של Piwigo';
 $lang['Purge search history'] = 'נקה את היסטורית החיפוש';
 $lang['Hide'] = 'הסתר';
-$lang['Password is missing. Please enter the password.'] = 'סיסמה חסרה, נה להזין סיסמה..';
-$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'אישור סיסמה חסר, נה להזיר אישור סיסמה..';
-$lang['Allow users to edit their own comments'] = 'אפשר למשתמשים לערוך הערות משלהם';
+$lang['Password is missing. Please enter the password.'] = 'סיסמא חסרה, נא להזין סיסמא.';
+$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'אישור סיסמא חסר, נא לאשר את הסיסמא שנבחרה.';
+$lang['Allow users to edit their own comments'] = 'אפשר למשתמשים לערוך את ההערות שלהם';
 $lang['Allow users to delete their own comments'] = 'אפשר למשתמשים למחוק את התגובות שלהם';
-$lang['Email administrators when a comment is modified'] = 'שלח מייל למנהלים כאשר תגובה שונתה';
-$lang['Email administrators when a comment is deleted'] = 'שלח מייל למנהלים כאשר תגובה נמחקה';
-$lang['Cannot delete the old permalink !'] = 'אל תמחק את הPermalink הישן';
-$lang['Hit'] = 'לחיצה'; 
+$lang['Email administrators when a comment is modified'] = 'שלח מייל לאדמינים כאשר תגובה שונתה';
+$lang['Email administrators when a comment is deleted'] = 'שלח מייל לאדמינים כאשר תגובה נמחקה';
+$lang['Cannot delete the old permalink !'] = 'לא ניתן למחוק את הקישור הקבוע הישן!';
+$lang['Hit'] = 'פגיעה';
 $lang['Tools'] = 'כלים';
 $lang['Photos'] = 'תמונות';
 $lang['Themes'] = 'ערכות נושא';
 $lang['Instructions to use Piwigo'] = 'הוראות שימוש Piwigo';
 $lang['Installed Themes'] = 'ערכות נושא מותקנות';
-$lang['Add New Theme'] = 'הוסף נושא חדש';
-$lang['Forbid this theme to users'] = 'לאסור על הנושא הזה למשתמשים';
-$lang['Set as default theme for unregistered and new users'] = 'Set as הנושא ברירת המחדל עבור משתמשים רשומים ו החדש';
+$lang['Add New Theme'] = 'הוסף ערכת נושא חדשה';
+$lang['Forbid this theme to users'] = 'אסור על ערכת נושא זו למשתמשים';
+$lang['Set as default theme for unregistered and new users'] = 'הגדר כערכת נושא ברירת מחדל עבור משתמשים לא רשומים וחדשים';
 $lang['unknown'] = 'לא ידוע';
-$lang['Upload Photos'] = 'העלאת תמונות';
-$lang['Drop into album'] = 'צניחה לתוך הקטגוריה';
-$lang['+ Add an upload box'] = '+ הוספת להעלות תיבת ';
-$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'יצירת"%s "ספרייה בשורש של ההתקנה שלך Piwigo ';
-$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'תן הרשאות (chmod 777) ל"%s" בתקיית שורש איפה שההתקנה שלך נמצאת';
-$lang['existing album'] = 'הקטגוריה הקיימת';
-$lang['create a new album'] = 'ליצור קטגוריה חדשה ';
-$lang['Album name'] = 'שם קטגוריה ';
-$lang['Album "%s" has been added'] = 'הקטגוריה "%s" נוספה';
-$lang['Uploaded Photos'] = 'התמונות העלאה ';
-$lang['%d photos uploaded'] = '%d תמונות הועלו';
+$lang['Upload Photos'] = 'טען תמונות';
+$lang['Drop into album'] = 'בחר אלבום';
+$lang['+ Add an upload box'] = '+ הוסף תיבת טעינה';
+$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'צור ספריית ״%s״ בספריה הראשית של התקנת ה-Piwigo שלך';
+$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'תן הרשאות כתיבה (chmod 777) לספריית "%s" בראש התקנת Piwigo שלך';
+$lang['existing album'] = 'אלבום קיים';
+$lang['create a new album'] = 'צור אלבום חדש';
+$lang['Album name'] = 'שם אלבום ';
+$lang['Album "%s" has been added'] = 'אלבום "%s" התווסף';
+$lang['Uploaded Photos'] = 'התמונות נטענו ';
+$lang['%d photos uploaded'] = '%d תמונות נטענו';
 $lang['Privacy level set to "%s"'] = 'רמת פרטיות מוגדרת ל "%s"';
-$lang['Album "%s" now contains %d photos'] = 'הקטגוריה "%s" מכילה כעט %d תמונות';
+$lang['Album "%s" now contains %d photos'] = 'אלבום "%s" מכיל כעת %d תמונות';
 $lang['Manage this set of %d photos'] = 'נהל את קבוצת התמונות הזאת (%d תמונות)';
 $lang['Select files'] = 'בחר קבצים';
 $lang['Everybody'] = 'כולם';
-$lang['Who can see these photos?'] = 'מי יכול לראות את התמונות?';
-$lang['Who can see this photo?'] = 'מי יכול לראות את התמונה?';
+$lang['Who can see these photos?'] = 'מי יכול לראות את תמונות אלה?';
+$lang['Who can see this photo?'] = 'מי יכול לראות את התמונה הזו?';
 $lang['Settings'] = 'הגדרות';
-$lang['Resize'] = 'גודל';
+$lang['Resize'] = 'שנה גודל';
 $lang['Maximum width'] = 'רוחב מרבי';
 $lang['pixels'] = 'פיקסלים';
 $lang['Maximum height'] = 'גובה מרבי';
 $lang['Image Quality'] = 'איכות תמונה';
-$lang['Thumbnail'] = 'תמונה';
+$lang['Thumbnail'] = 'צלמית';
 $lang['Save Settings'] = 'שמור הגדרות';
 $lang['Your configuration settings are saved'] = 'הגדרות התצורה שלך נשמרות ';
-$lang['Active Themes'] = 'רקעים פעילים ';
-$lang['Add write access to the "%s" directory'] = 'הוסף הרשאת כתיבה לתיקית "%s"';
-$lang['Administration Home'] = 'ממשק ניהול';
+$lang['Active Themes'] = 'ערכות נושא פעילות ';
+$lang['Add write access to the "%s" directory'] = 'הוסף הרשאת כתיבה לתיקיית "%s"';
+$lang['Administration Home'] = 'ממשק ניהול אדמינים';
 $lang['Change Admin Colors'] = 'שנה צבעים לתפריט הניהול';
-$lang['Delete this theme'] = 'מחק את הנושא הזה';
-$lang['Directory does not exist'] = 'הספרייה לא קיימת';
+$lang['Delete this theme'] = 'מחק את ערכת הנושא הזאת';
+$lang['Directory does not exist'] = 'הספריה לא קיימת';
 $lang['Download,'] = 'הורדה,';
 $lang['FTP + Synchronization'] = 'סנכרון + FTP';
 $lang['Get Support on Piwigo Forum'] = 'קבל תמיכה בפורום Piwigo ';
 $lang['Help Me'] = 'עזור לי';
-$lang['Impossible to activate this theme, the parent theme is missing: %s'] = 'נושא זה לא יכול להיות מופעל, כפי הנושא הורה חסר:"%s" "';
-$lang['Impossible to delete this theme. Other themes depends on it: %s'] = 'נושא זה לא ניתן למחוק, כי נושאים אחרים תלוי בו:"%s" "';
-$lang['Inactive Themes'] = 'נושאים פעילים';
-$lang['Install on your computer,'] = 'להתקין במחשב שלך,';
-$lang['Make this theme available to users'] = 'הפוך את הנושא הזה לזמין למשתמשים';
+$lang['Impossible to activate this theme, the parent theme is missing: %s'] = 'לא ניתן להפעיל ערכת נושא זו מכיוון שערכת הנושא שמעליה חסרה: %s';
+$lang['Impossible to delete this theme. Other themes depends on it: %s'] = 'לא ניתן למחוק ערכת נושא זו כי ערכות נושא אחרות תלויות בה: %s';
+$lang['Inactive Themes'] = 'ערכות נושא לא פעילות';
+$lang['Install on your computer,'] = 'התקן במחשב שלך,';
+$lang['Make this theme available to users'] = 'הפוך את ערכת הנושא הזו לזמינה למשתמשים';
 $lang['Page end'] = 'סוף עמוד ';
-$lang['Piwigo Uploader'] = 'מעלה Piwigo';
+$lang['Piwigo Uploader'] = 'טוען Piwigo';
 $lang['Operation in progress'] = 'הטיפול עיבוד.';
 $lang['Please wait...'] = 'אנא המתן ...';
 $lang['Read Piwigo Documentation'] = 'קרא את התיעוד של Piwigo';
 $lang['Start pLoader and add your photos.'] = 'התחל להוסיף תמונות שלך.';
 $lang['Switch to clear or dark colors for administration'] = 'מעבר צבעים בהיר או כהה עבור ממשק ניהול';
-$lang['Theme has been successfully installed'] = 'נושאים הותקן בהצלחה ';
-$lang['Visit Gallery'] = 'לבקר בגלריה';
-$lang['Visit Piwigo project website'] = 'בקר באתר Piwigo פרוייקט';
+$lang['Theme has been successfully installed'] = 'ערכת הנושא הותקנה בהצלחה.';
+$lang['Visit Gallery'] = 'בקר בגלריה';
+$lang['Visit Piwigo project website'] = 'בקר באתר פרוייקט Piwigo';
 $lang['pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'PLoader יטען <em> Piwigo Uploader </em>. מהמחשב שלך, pLoader יכין את התמונות שלך ןיעביר אותם אל גלרית ה Piwigo שלך';
 $lang['Guest Settings'] = 'הגדרות אורחים';
 $lang['Main Page'] = 'דף ראשי';
-$lang['Photo Page'] = 'מקור תמונה';
-$lang['Activate Navigation Bar'] = 'להפעיל את סרגל הניווט';
-$lang['Activate Navigation Thumbnails'] = 'הפעל ממוזערות ניווט';
-$lang['Activate icon "%s"'] = 'להפעיל את סמל"%s "';
+$lang['Photo Page'] = 'דף תמונה';
+$lang['Activate Navigation Bar'] = 'הפעל סרגל ניווט';
+$lang['Activate Navigation Thumbnails'] = 'הפעל צלמיות ניווט';
+$lang['Activate icon "%s"'] = 'הפעל סמליל ״%s״';
 $lang['Photo Properties'] = 'מאפייני תמונה';
-$lang['Allow user customization'] = 'לאפשר התאמה אישית למשתמש';
+$lang['Allow user customization'] = 'אפשר התאמה אישית למשתמש';
 $lang['Languages'] = 'שפות';
-$lang['Installed Languages'] = 'מהשפות המותקנות';
-$lang['Add New Language'] = 'הוספת שפה חדשה';
-$lang['Language has been successfully installed'] = 'שפה הותקן בהצלחה';
+$lang['Installed Languages'] = 'שפות מותקנות';
+$lang['Add New Language'] = 'הוסף שפה חדשה';
+$lang['Language has been successfully installed'] = 'שפה הותקנה בהצלחה';
 $lang['Select:'] = 'בחר:';
-$lang['None'] = 'אף אחד';
-$lang['Invert'] = 'מרחב';
-$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'אי אפשר לנטרל את הנושא הזה, אתה צריך לפחות נושא אחד.';
-$lang['Webmaster status is required.'] = 'מצב Webmaster נדרשת.';
-$lang['Bound Theme'] = 'נושאים Bound';
+$lang['None'] = 'כלום';
+$lang['Invert'] = 'היפוך';
+$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'אי אפשר לכבות ערכת נושא זו, יש צורך לפחות בערכת נושא אחת.';
+$lang['Webmaster status is required.'] = 'נדרש סטטוס מנהל האתר.';
+$lang['Bound Theme'] = 'ערכת נושא Bound';
 $lang['Allow rating'] = 'אפשר דירוג';
-$lang['Select at least one comment'] = 'בחר אחת לפחות להגיב';
+$lang['Select at least one comment'] = 'בחר לפחות תגובה אחת';
 $lang['Active Plugins'] = 'תוספים פעילים';
-$lang['Inactive Plugins'] = 'תוספים פעילים';
+$lang['Inactive Plugins'] = 'תוספים לא פעילים';
 $lang['Missing Plugins'] = 'תוספים חסרים';
-$lang['Uninstalled Plugins'] = 'תוספים הוסר';
-$lang['By %s'] = 'הועלה ע"י "%s"';
-$lang['Visit plugin site'] = 'בקר תוסף האתר';
-$lang['Active Languages'] = 'שפות פעילים';
+$lang['Uninstalled Plugins'] = 'תוספים הוסרו';
+$lang['By %s'] = 'על-ידי %s';
+$lang['Visit plugin site'] = 'בקר באתר התוסף';
+$lang['Active Languages'] = 'שפות פעילות';
 $lang['Delete this language'] = 'מחק את השפה הזאת';
-$lang['Forbid this language to users'] = 'לאסור על השפה הזו למשתמשים';
-$lang['Impossible to deactivate this language, first set another language as default.'] = 'אי אפשר לבטל את השפה הזו, הראשון להגדיר שפה אחרת כברירת המחדל.';
-$lang['Impossible to deactivate this language, you need at least one language.'] = 'אי אפשר לבטל את השפה הזאת, אתה צריך לפחות שפה אחת.';
-$lang['Inactive Languages'] = 'שפות לא פעילה';
-$lang['Make this language available to users'] = 'הפוך את השפה הזו זמינה למשתמשים';
-$lang['Set as default language for unregistered and new users'] = 'הפוך שפת ברירת מחדל עבור משתמשים רשומים ו החדש';
-$lang['Add Photos'] = 'הוספת תמונות';
-$lang['The following tag was deleted'] = 'התווית הבאה נמחקה';
+$lang['Forbid this language to users'] = 'אסור על שפה זו למשתמשים';
+$lang['Impossible to deactivate this language, first set another language as default.'] = 'לא ניתן לכבות שפה זו, ראשית הגדר שפה אחרת כברירת המחדל.';
+$lang['Impossible to deactivate this language, you need at least one language.'] = 'לא ניתן לכבות שפה זו, יש צורך לפחות בשפה אחת.';
+$lang['Inactive Languages'] = 'שפות לא פעילות';
+$lang['Make this language available to users'] = 'הפוך את השפה הזו לזמינה למשתמשים';
+$lang['Set as default language for unregistered and new users'] = 'הגדר כשפת ברירת מחדל עבור משתמשים לא רשומים וחדשים';
+$lang['Add Photos'] = 'הוסף תמונות';
+$lang['The following tag was deleted'] = 'התגית הבאה נמחקה';
 $lang['Miscellaneous'] = 'שונות';
-$lang['Virtual Links'] = 'קישורים וירטואלית';
+$lang['Virtual Links'] = 'קישורים וירטואלים';
 $lang['There is no other language available.'] = 'אין שפה אחרת זמינה.';
 $lang['There is no other plugin available.'] = 'אין שום תוספים אחרים זמינים.';
-$lang['There is no other theme available.'] = 'אין שום נושא אחר זמין.';
-$lang['Add another set of photos'] = 'הוספת קבוצה נוספת של אוהדים';
-$lang['Order of menubar items has been updated successfully.'] = 'סדר הפריטים Menubar עודכנו בהצלחה.';
-$lang['This theme was not designed to be directly activated'] = 'הנושא הזה לא נועד להיות מופעל באופן ישיר';
-$lang['Pending Comments'] = 'תגובות בהמתנה';
-$lang['In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'] = 'בקובץ php.ini שלך, upload_max_filesize (SB%) הוא גדול יותר post_max_size (SB%), עליך לשנות הגדרה זו';
-$lang['Exif extension not available, admin should disable exif use'] = 'סיומת Exif לא נתמכת, פנה למנהל על מנת שיאשר שימוש בסיומת Exif';
+$lang['There is no other theme available.'] = 'אין שום ערכת נושא אחרת זמינה.';
+$lang['Add another set of photos'] = 'הוסף מקבץ אחר של תמונות';
+$lang['Order of menubar items has been updated successfully.'] = 'סדר פריטי שורת התפריטים עודכן בהצלחה.';
+$lang['This theme was not designed to be directly activated'] = 'ערכת נושא זו לא נועדה להיות מופעלת באופן ישיר';
+$lang['Pending Comments'] = 'תגובות ממתינות';
+$lang['In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'] = 'In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting';
+$lang['Exif extension not available, admin should disable exif use'] = 'סיומת Exif לא קיימת, פנה לאדמין על מנת שיבטל שימוש בסיומת Exif';
 $lang['The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'] = 'The uploaded file exceeds the upload_max_filesize directive in php.ini: "%s "B';
 $lang['The uploaded files exceed the post_max_size directive in php.ini: %sB'] = 'The uploaded files exceed the post_max_size directive in php.ini: "%s "B';
-$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'הקובץ שבועלה חורג מה MAX_FILE_SIZE האפשרי שצויין בקובץ html';
-$lang['The uploaded file was only partially uploaded'] = 'הקובץ הועלה חלקית';
-$lang['No file was uploaded'] = 'לא הועלה קובץ';
-$lang['Missing a temporary folder'] = 'חסר תיקיה זמנית';
-$lang['Failed to write file to disk'] = 'נכשל בכתיבת הקובץ בדיסק';
-$lang['File upload stopped by extension'] = 'העלאת קובץ נכשלה ובמשתמע';
-$lang['Unknown upload error'] = 'שגיאה בהעלאה לא ידועה';
+$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'הקובץ שנטען חורג מה MAX_FILE_SIZE שצויין בטופס ה-html';
+$lang['The uploaded file was only partially uploaded'] = 'הקובץ נטען חלקית בלבד';
+$lang['No file was uploaded'] = 'לא נטען קובץ';
+$lang['Missing a temporary folder'] = 'חסרה תיקיה זמנית';
+$lang['Failed to write file to disk'] = 'נכשל בכתיבת הקובץ לדיסק';
+$lang['File upload stopped by extension'] = 'טעינת קובץ נעצרה בעקיפין';
+$lang['Unknown upload error'] = 'שגיאה לא ידועה בטעינה';
 $lang['Error on file "%s" : %s'] = 'שגיאה בקובץ "%s" : %s';
-$lang['Menu Management'] = 'נהל תפריטים';
+$lang['Menu Management'] = 'תפריטים';
 $lang['automatic order'] = 'סדר אוטומטי';
-$lang['manual order'] = 'סדר ידני';
-$lang['Albums automatically sorted'] = 'מיון אלבומים אוטומטי';
-$lang['Batch Manager'] = 'מנהל קבוצה';
-$lang['include child albums'] = 'כולל אלבום ילד';
-$lang['Selection'] = 'מבחר';
+$lang['manual order'] = 'סידור ידני';
+$lang['Albums automatically sorted'] = 'אלבומים מויינו אוטומטית';
+$lang['Batch Manager'] = 'מנהל אצווה';
+$lang['include child albums'] = 'כולל אלבומים ילדים';
+$lang['Selection'] = 'בחירה';
 $lang['Action'] = 'פעולה';
-$lang['Set author'] = 'הגדר מחבר';
+$lang['Set author'] = 'הגדר יוצר';
 $lang['Set title'] = 'הגדר כותרת';
 $lang['Set creation date'] = 'הגדר תאריך יצירה';
 $lang['Apply action'] = 'החל';
-$lang['on the %d selected photos'] = 'ב %d תמונות נבחרות';
+$lang['on the %d selected photos'] = 'על %d תמונות נבחרות';
 $lang['%d of %d photos selected'] = '%d מ %d תמונות נבחרו';
 $lang['No photo selected, %d photos in current set'] = 'לא נבחרו תמונות, %d תמונות בסט הנוכחי';
 $lang['All %d photos are selected'] = 'כל %d התמונות נבחרו';
 $lang['remove this filter'] = 'הסר מסנן זה';
 $lang['Duplicates'] = 'כפילויות';
 $lang['Add a filter'] = 'הוסף מסנן';
-$lang['Remove all filters'] = 'מחק את כל המסננים';
+$lang['Remove all filters'] = 'מחק את כל הסינונים';
 $lang['Refresh photo set'] = 'רענן את סט התמונות';
 $lang['The whole page'] = 'העמוד המלא';
 $lang['The whole set'] = 'הסט המלא';
 $lang['No photo in the current set.'] = 'אין תמונות בסט הנוכחי.';
-$lang['No photo selected, no action possible.'] = 'לא נבחרו תמונות, אין פעולות אפשריות.';
+$lang['No photo selected, no action possible.'] = 'אף תמונה לא נבחרה, אין פעולות אפשריות.';
 $lang['Choose an action'] = 'בחר פעולה';
-$lang['remove author'] = 'הסר מחבר';
-$lang['Type here the author name'] = 'כתוב כאן את שם המחבר';
+$lang['remove author'] = 'הסר יוצר';
+$lang['Type here the author name'] = 'כתוב כאן את שם היוצר';
 $lang['remove title'] = 'הסר כותרת';
 $lang['Type here the title'] = 'כתוב כאן את הכותרת';
 $lang['remove creation date'] = 'הסר את תאריך היצירה';
-$lang['Album photos associated to the following albums: %s'] = 'אלבום תמונות משוייך לאלבום הבא: %s';
-$lang['Delete orphan tags'] = 'מחק תגים יתומים';
+$lang['Album photos associated to the following albums: %s'] = 'תמונות האלבום משוייכות לאלבומים הבאים: %s';
+$lang['Delete orphan tags'] = 'מחק תגיות יתומות';
 $lang['delete photo'] = 'מחק תמונה';
 $lang['new'] = 'חדש';
 $lang['No results'] = 'אין תוצאות';
-$lang['Orphan tags deleted'] = 'תגים יתומים נמחקו';
-$lang['Remove from caddie'] = 'הוסר מהנושא';
+$lang['Orphan tags deleted'] = 'תגיות יתומות נמחקו';
+$lang['Remove from caddie'] = 'הסר מהסל';
 $lang['Searching...'] = 'מחפש...';
 $lang['Type in a search term'] = 'הקלד את ערך החיפוש';
-$lang['Week starts on'] = 'שבוע מתחיל';
-$lang['You have %d orphan tags: %s.'] = 'יש לך %d תגים יתומים: %s.';
+$lang['Week starts on'] = 'שבוע מתחיל ביום';
+$lang['You have %d orphan tags: %s.'] = 'יש לך %d תגיות יתומות: %s.';
 $lang['Themes which need upgrade'] = 'ערכות נושא שצריכות שידרוג';
-$lang['Languages which need upgrade'] = 'שפות שצריכות שידרוג';
-$lang['All themes are up to date.'] = 'כל ערכות הנושא מעודכנות';
+$lang['Languages which need upgrade'] = 'שפות הזקוקות לשידרוג';
+$lang['All themes are up to date.'] = 'כל ערכות הנושא מעודכנות.';
 $lang['All plugins are up to date.'] = 'כל התוספים מעודכנים.';
 $lang['All languages are up to date.'] = 'כל השפות מעודכנות.';
 $lang['Visit theme site'] = 'בקר באתר ערכת הנושא';
 $lang['Visit language site'] = 'בקר באתר השפה';
 $lang['New Version'] = 'גרסה חדשה';
-$lang['Obsolete Plugins'] = 'תוסף מיושן';
-$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = 'אזהרה! נראה כי תוסף זה לא מתאים ל Piwigo.';
+$lang['Obsolete Plugins'] = 'תוספים מיושנים';
+$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = 'אזהרה! נראה כי תוסף זה לא מתאים לגירסא זו של Piwigo.';
 $lang['Do you want to activate anyway?'] = 'אתה רוצה להפעיל בכל מיקרה?';
 $lang['THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'] = 'תוסף זה הוא לא חלק מליבת PIWIGO ! הסר אותו מייד!';
-$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'שגיאה: תוסף זה נראה חסר אבל מותקן! הסר אותו מייד.';
+$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = '*שגיאה*: תוסף זה נראה חסר אבל מותקן! הסר אותו מייד.';
 $lang['display'] = 'הצג';
 $lang['You can update to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'אתה יכול לעדכן ל Piwigo %s ישירות, מבלי לשדרג ל Piwigo %s (מומלץ).';
-$lang['Save Template Directory'] = 'שמור בספרייה תבנית';
-$lang['Dump Database'] = 'זרוק מסד נתונים';
-$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'כלול נתוני היסטוריה אזהרה:עלולה להיות חריגת זיכרון השרת';
-$lang['Unable to dump database.'] = 'אין אפשרות לזרות מסד נתונים.';
-$lang['Some upgrades are available for extensions.'] = 'כמה שידרוגים זמינים להרחבות.';
+$lang['Save Template Directory'] = 'שמור ספריית תבנית';
+$lang['Dump Database'] = 'השלך מסד נתונים';
+$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'כלול נתוני היסטוריה (אזהרה: עלולה להיות חריגה ממגבלת זיכרון השרת)';
+$lang['Unable to dump database.'] = 'אין אפשרות לזרוק מסד נתונים.';
+$lang['Some upgrades are available for extensions.'] = 'מספר שידרוגים זמינים להרחבות.';
 $lang['Ignore All'] = 'התעלם מהכל';
-$lang['Crop'] = 'להניב';
+$lang['Crop'] = 'חיתוך';
 $lang['Width'] = 'רוחב';
 $lang['Height'] = 'גובה';
-$lang['Follow Orientation'] = 'עקוב אחר ההדרכה';
+$lang['Follow Orientation'] = 'עקוב אחר האוריינטציה';
 $lang['Graphics Library'] = 'ספריית גרפיקה';
-$lang['Activate icon "new" next to albums and pictures'] = 'הפעל כפתו "חדש" ליד אלבומים';
-$lang['Deactivate all'] = 'בטל פעולה להכל';
-$lang['Default photos order'] = 'סדר ברירת מחדל לתמונות';
+$lang['Activate icon "new" next to albums and pictures'] = ' הפעל סמליל "חדש" ליד אלבומים ותמונות';
+$lang['Deactivate all'] = 'כבה הכל';
+$lang['Default photos order'] = 'ברירת מחדל של סדר התמונות';
 $lang['Restore'] = 'שחזר';
-$lang['Restore default configuration. You will lose your plugin settings!'] = 'שחזר להגדרות ברירת מחדל. הגדרות ההתקן יאבדו!';
-$lang['Show menubar'] = 'הצג תפריט';
-$lang['Thumbnails generation in progress...'] = 'חידוש תמונות ממוזערות בתהליך...';
-$lang['Photos generation in progress...'] = 'חידוש תמונות בתהליך...';
-$lang['%s photos have been regenerated'] = '%s תמונות חודשו';
-$lang['%s photos can not be regenerated'] = '%s תמונות לא יכלו להתחדש';
+$lang['Restore default configuration. You will lose your plugin settings!'] = 'שחזר הגדרות ברירת מחדל. הגדרות התוסף יאבדו!';
+$lang['Show menubar'] = 'הצג שורת תפריט';
+$lang['Thumbnails generation in progress...'] = 'יצירת צלמיות בתהליך...';
+$lang['Photos generation in progress...'] = 'ייצור תמונות בתהליך...';
+$lang['%s photos have been regenerated'] = '%s תמונות נוצרו מחדש';
+$lang['%s photos can not be regenerated'] = '%s תמונות לא יכלו להיווצר מחדש';
 $lang['Updates'] = 'עדכונים';
-$lang['Update in progress... Please wait.'] = 'עדכון בתהליך... המתן.';
+$lang['Update in progress... Please wait.'] = 'עדכון בתהליך... אנא המתן.';
 $lang['Ignore this update'] = 'התעלם מעידכון זה';
 $lang['Reset ignored updates'] = 'אפס התעלמות מעידכונים';
 $lang['Update All'] = 'עדכן הכל';
-$lang['ERROR'] = 'שגיאה';
+$lang['ERROR'] = '*שגיאה*';
 $lang['Update Complete'] = 'עידכון הושלם';
-$lang['Piwigo Update'] = 'Piwigo עדכון';
-$lang['Extensions Update'] = 'עדכון הרחבה';
+$lang['Piwigo Update'] = 'עדכון Piwigo';
+$lang['Extensions Update'] = 'עדכון נרחבות';
 $lang['All extensions are up to date.'] = 'כל ההרחבות מעודכנות.';
-$lang['Following plugins may not be compatible with the new version of Piwigo:'] = 'יכול להיות שההתקן לא תואם לגירסה החדשה של Piwigo:';
-$lang['Following themes may not be compatible with the new version of Piwigo:'] = 'יכול להיות שהערכת הנושא לא תואמת לגירסה החדשה של Piwigo:';
-$lang['I decide to update anyway'] = 'החלתי לעדכן בכל מיקרה';
+$lang['Following plugins may not be compatible with the new version of Piwigo:'] = 'ההתקנים הבאים כנראה לא תואמים לגירסה החדשה של Piwigo:';
+$lang['Following themes may not be compatible with the new version of Piwigo:'] = 'ערכות הנושא כנראה לא תואמות לגירסה החדשה של Piwigo:';
+$lang['I decide to update anyway'] = 'אני מחליט לעדכן בכל מיקרה';
 $lang['Update to Piwigo %s'] = 'עדכן ל Piwigo %s';
 $lang['Two updates are available'] = 'שני עידכונים זמינים';
-$lang['This is a minor update, with only bug corrections.'] = 'זהו עידכון שולי, תיקון באגים שנמצאו.';
-$lang['This is a major update, with <a href="%s">new exciting features</a>.'] = 'עדכון חשוב, עם <a href="%s">מאפיינים חדשים ומלהיבים</a>.';
-$lang['Some themes and plugins may be not available yet.'] = 'יכול להיות שחלק מההתקנים וערכות הנושא לא זמינים עדיין .';
+$lang['This is a minor update, with only bug corrections.'] = 'זהו עידכון שולי, רק עם תיקוני באגים.';
+$lang['This is a major update, with <a href="%s">new exciting features</a>.'] = 'זה עדכון משמעותי, עם <a href="%s">מאפיינים חדשים ומלהיבים</a>.';
+$lang['Some themes and plugins may be not available yet.'] = 'יכול להיות שחלק מהתוספים וערכות הנושא לא זמינים עדיין.';
 $lang['Learn more'] = 'למד עוד';
-$lang['Rate'] = "דרג";
+$lang['Rate'] = 'דירוג';
 $lang['Average rate'] = "דירוג ממוצע";
-$lang['(this tag will be deleted)'] = ')התג הזה ימחק(';
+$lang['(this tag will be deleted)'] = '(התגית הזאת תמחק)';
 $lang['... or '] = 'או ...';
 $lang['Add a criteria'] = 'הוסף קריטריון';
 $lang['Allowed file types: %s.'] = 'סוגי קבצים מותרים:%s';
-$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'רזולוציה מקסימלית: %dM פקסלים(שזה %dx%d פקסלים).';
+$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'רזולוציה מקסימלית: %dM פיקסלים(שזה %dx%d פיקסלים).';
 $lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'כברירת מחדל, Piwigo יצור גודל חדש לתמונות ה HD שלך.';
-$lang['Confirm merge'] = 'אשר איחוד';
+$lang['Confirm merge'] = 'אשר מיזוג';
 $lang['Create'] = 'צור';
 $lang['hide details'] = 'הסתר פרטים';
-$lang['Manage Permissions'] = 'ניהול הרשאות';
+$lang['Manage Permissions'] = 'נהל הרשאות';
 $lang['Maximum file size: %sB.'] = 'גודל קובץ מקסימאלי: %sB.';
-$lang['Merge selected tags'] = 'אחד תגים מסומנים';
-$lang['Merge tags'] = 'איחוד תגים';
-$lang['No destination tag selected'] = 'לא ניבחרו תגי יעד';
-$lang['Photo %s of %s'] = 'תמונה %s מ %s';
+$lang['Merge selected tags'] = 'מזג את התגיות שנבחרו';
+$lang['Merge tags'] = 'מיזוג תגיות';
+$lang['No destination tag selected'] = 'לא ניבחרה תגית יעד';
+$lang['Photo %s of %s'] = 'תמונה %s מתוך %s';
 $lang['Select an album'] = 'בחר אלבום';
-$lang['Select at least two tags for merging'] = 'בחר לפחות שני תגים לאיחוד';
-$lang['Select the destination tag'] = 'בחר תגים ביעד';
+$lang['Select at least two tags for merging'] = 'בחר לפחות שתי תגיות למיזוג';
+$lang['Select the destination tag'] = 'בחר את תגית היעד';
 $lang['show details'] = 'הצג פרטים';
-$lang['Start Upload'] = 'התחל העלאה';
-$lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = 'התג <em>%s</em> אוחד כעם תג <em>%s</em>';
-$lang['You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'] = 'אתה משתמש בהעלאה מהדפדפן. נסה <a href="%s">העלאת פלאש</a> במקום.';
-$lang['You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'] = 'אתה משתמש בהעלאת פלאש. ישנה בעיה? נסה <a href="%s">העלאה מהדפדפן</a> במקום.';
+$lang['Start Upload'] = 'התחל טעינה';
+$lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = 'התגיות <em>%s</em> מוזגו לתוך תגית <em>%s</em>';
+$lang['You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'] = 'אתה משתמש בטעינה מהדפדפן. נסה <a href="%s">טעינת פלאש</a> במקום.';
+$lang['You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'] = 'אתה משתמש בטעינת פלאש. ישנה בעיה? נסה <a href="%s">טעינה מהדפדפן</a> במקום.';
 $lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'אין באפשרותך לקבוע סדר תמונות ברירת מחדל מכיוון שאתה משתמש בהגדרות מותאמות אישית';
 $lang['Add to caddie'] = 'הוסף לסל';
-$lang['Permalink'] = 'קישורית';
+$lang['Permalink'] = 'קישור קבוע';
 $lang[' and %d virtuals'] = 'ו %d וירטואלים';
 $lang['%d day'] = '%d יום';
-$lang['%d days'] = '%d ימיםחודשים';
+$lang['%d days'] = '%d ימים';
 $lang['%d hour'] = '%d שעה';
 $lang['%d hours'] = '%d שעות';
 $lang['%d minute'] = '%d דקה';
@@ -795,191 +795,194 @@ $lang['%d week'] = '%d שבוע';
 $lang['%d weeks'] = '%d שבועות';
 $lang['%d year'] = '%d שנה';
 $lang['%d years'] = '%d שנים';
-$lang['%s has been successfully updated.'] = '%s הועלובהצלחה';
+$lang['%s has been successfully updated.'] = '%s עודכנו בהצלחה.';
 $lang['%s in the future'] = '%s בעתיד';
-$lang['A locked gallery is only visible to administrators'] = 'גלריות נעולות זמינות רק למנהלים';
-$lang['Activate comments'] = 'הפעל תגובה';
-$lang['Add tags'] = 'הוסף תיוג';
-$lang['Added by %s'] = 'הוסף על ידי %s';
-$lang['An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'] = 'ארעה שגיאה במהלך היצוא. בדוק את הרשאות קבצי התקנת piwigo.<br><a href="%s">לחץ כאן לראות את יומן השגיאות</a>.';
-$lang['An error has occured during upgrade.'] = 'ארעה שגיאה במהלך העלאה';
+$lang['A locked gallery is only visible to administrators'] = 'גלריה נעולה נראית רק על ידי האדמינים';
+$lang['Activate comments'] = 'הפעל תגובות';
+$lang['Add tags'] = 'הוסף תגיות';
+$lang['Added by %s'] = 'התווסף על-ידי %s';
+$lang['An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'] = 'ארעה שגיאה במהלך הייצוא. בדוק את הרשאות קבצי התקנת piwigo.<br><a href="%s">לחץ כאן לראות את לוג השגיאות</a>.';
+$lang['An error has occured during upgrade.'] = 'ארעה שגיאה במהלך שידרוג.';
 $lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture הוא כלי רב עוצמה לחדד תמונות ולנהל סיפריות ענק ב-mac';
 $lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture עוצב עבור גרפיקאים מקצועיים עם הפשטות של iphoto';
-$lang['Applications'] = 'אפליקציות';
-$lang['Apply watermark if height is bigger than'] = 'החל חותמת מים(watermark) אם הגובה גדול מ';
-$lang['Apply watermark if width is bigger than'] = 'החל חותמת מים(watermark) אם הרוחב גדול מ';
-$lang['Automatic sort order'] = 'סדר אוטומטי';
-$lang['Available on'] = 'זמין ב';
-$lang['Available versions for'] = 'גרסאות זמינות ל';
-$lang['%d physicals'] = ' %d פיזית';
+$lang['Applications'] = 'יישומים';
+$lang['Apply watermark if height is bigger than'] = 'הוסף חותמת מים(watermark) אם הגובה גדול מ';
+$lang['Apply watermark if width is bigger than'] = 'הוסף חותמת מים(watermark) אם הרוחב גדול מ';
+$lang['Automatic sort order'] = 'מיון אוטומטי';
+$lang['Available on'] = 'זמין על';
+$lang['Available versions for'] = 'גרסאות זמינות עבור';
+$lang['%d physicals'] = '%d פיזי';
 $lang['Piwigo for Android'] = 'piwigo לאנדרואיד';
 $lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'piwigo לios (איפון, איפד, איפוד ואיפוד טאצ)';
 $lang['Posted %s on %s'] = 'פורסם %s ב %s';
-$lang['Resize after upload'] = 'שנה גודל אחרי העלאה';
+$lang['Resize after upload'] = 'שנה גודל אחרי טעינה';
 $lang['Save manual order'] = 'שמור סדר ידני';
-$lang['Save visits in history for'] = 'שמור מבקרים בהיסטוריה ל';
+$lang['Save visits in history for'] = 'שמור ביקורים בהיסטוריה עבור';
 $lang['Select a file'] = 'בחר קובץ';
-$lang['Select a zone with your mouse to define a new center of interest.'] = 'בחר איזור עם העכבר כדי להגדיר את מרכז העניין בתמונה';
+$lang['Select a zone with your mouse to define a new center of interest.'] = 'בחר איזור עם העכבר כדי להגדיר מוקד עניין חדש.';
 $lang['Select groups...'] = 'בחר קבוצות...';
 $lang['Select users...'] = 'בחר משתמשים...';
-$lang['Send connection settings by email'] = 'שלח פרטי התחברות באימייל';
-$lang['Source tag'] = 'מקור תג';
+$lang['Send connection settings by email'] = 'שלח פרטי התחברות בדואר';
+$lang['Source tag'] = 'תגית מקור';
 $lang['There is no group in this gallery.'] = 'אין קבוצות בגלריה הזו';
 $lang['This album contains %d photos, added between %s and %s.'] = 'האלבום הזה מכיל %s תמונות, שנוספו בין ה %s ל %s';
 $lang['This album contains %d photos, added on %s.'] = 'האלבום הזה מכיל %s תמונות, נוספו ב %s';
-$lang['This album contains no photo.'] = 'האלבום הזה לא מכיל תמונות';
-$lang['Unlock gallery'] = 'גלריה פתוחה';
-$lang['Visited %d times'] = 'בוקר %d פעמים';
+$lang['This album contains no photo.'] = 'האלבום הזה לא מכיל תמונות.';
+$lang['Unlock gallery'] = 'בטל נעילת גלריה';
+$lang['Visited %d times'] = 'ביקרו בו %d פעמים';
 $lang['Watermark'] = 'סימן מים';
 $lang['With no album'] = 'ללא אלבום';
-$lang['middle'] = 'באמצע';
-$lang['modified'] = 'שינוי';
+$lang['middle'] = 'אמצעי';
+$lang['modified'] = 'עודכן';
 $lang['registered users'] = 'משתמשים רשומים';
-$lang['top left corner'] = 'בפינה השמאלית העליונה';
-$lang['top right corner'] = 'בפינה הימנית העליונה';
-$lang['visitors need to login and have the appropriate permissions to see this album'] = 'מבקרים צריכים להתחבר ולהיות בעלי הרשאות מסויימות כדי לראות את האלבום הזה';
-$lang['With no tag'] = 'ללא תגים';
+$lang['top left corner'] = 'פינה שמאלית עליונה';
+$lang['top right corner'] = 'פינה ימנית עליונה';
+$lang['visitors need to login and have the appropriate permissions to see this album'] = 'מבקרים צריכים להתחבר ולהיות בעלי הרשאות מתאימות כדי לראות את האלבום הזה';
+$lang['With no tag'] = 'ללא תגית';
 $lang['With no virtual album'] = 'ללא אלבום ורטואלי';
-$lang['X Position'] = 'x מיקום';
-$lang['X Repeat'] = 'x חזרות';
-$lang['Y Position'] = 'y מיקום';
+$lang['X Position'] = 'X מיקום';
+$lang['X Repeat'] = 'X חזרות';
+$lang['Y Position'] = 'Y מיקום';
 $lang['Zoom'] = 'זום';
-$lang['add a new watermark'] = 'הוסף קו מים חדש';
-$lang['administrators'] = 'מנהל ראשי';
-$lang['any visitor can see this album'] = 'כל מבקר יכול לראות את אלבום זה';
-$lang['apply automatic sort order'] = 'החל סדר אוטומטי';
-$lang['bottom left corner'] = 'בפינה השמאלית התחתונה';
-$lang['bottom right corner'] = 'בפינה הימנית התחתונה';
-$lang['cancel manual order'] = 'ביטול סדר ידני';
+$lang['add a new watermark'] = 'הוסף סימן מים חדש';
+$lang['administrators'] = 'אדמינים';
+$lang['any visitor can see this album'] = 'כל מבקר יכול לראות את האלבום הזה';
+$lang['apply automatic sort order'] = 'החל סדר מיון אוטומטי';
+$lang['bottom left corner'] = 'פינה שמאלית תחתונה';
+$lang['bottom right corner'] = 'פינה ימנית תחתונה';
+$lang['cancel manual order'] = 'בטל סידור ידני';
 $lang['create a new site'] = 'צור אתר חדש';
 $lang['custom'] = 'מותאם אישית';
 $lang['Photo name'] = 'שם התמונה';
-$lang['Move to album'] = 'העבר לאלבום';
+$lang['Move to album'] = 'הזז לאלבום';
 $lang['Multiple Size'] = 'מספר גדלים';
-$lang['Name of the duplicate'] = 'שם של שכפול';
+$lang['Name of the duplicate'] = 'שם של השכפול';
 $lang['No group is permitted to see this private album'] = 'לאף קבוצה אין הרשאה לראות את האלבום הפרטי הזה';
 $lang['Original Size'] = 'גודל מקורי';
 $lang['Cancel'] = 'ביטול';
-$lang['Center of interest'] = 'מרכז העניין';
-$lang['Default comments order'] = 'סדר תגובות ברירת מחדל';
-$lang['Duplicate selected tags'] = 'שכפל תגים מסומנים';
+$lang['Center of interest'] = 'מוקד העניין';
+$lang['Default comments order'] = 'ברירת מחדל של סדר התגובות';
+$lang['Duplicate selected tags'] = 'שכפל תגיות מסומנות';
 $lang['Edit photo'] = 'ערוך תמונה';
-$lang['Gallery unlocked'] = 'גלריה פתוחה';
+$lang['Gallery unlocked'] = 'גלריה ללא נעילה';
 $lang['Groups and users'] = 'קבוצות ומשתמשים';
-$lang['Last import'] = 'יבוא אחרון';
+$lang['Last import'] = 'ייבוא אחרון';
 $lang['List'] = 'רשימה';
-$lang['%s ago'] = '%s לפני';
-$lang['%u users have automatic permission because they belong to a granted group.'] = '%u משתמשים יש הרשאות אוטומטית בגלל שהם שייכים לקבוצה מאושרת';
-$lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = '
-digiKam מיועד לצלמים שרוצים להציג, לנהל, לערוך, לשפר, לארגן, לתייג, ולשתף תצלומים.';
+$lang['%s ago'] = 'לפני %s';
+$lang['%u users have automatic permission because they belong to a granted group.'] = '%u משתמשים יש הרשאה אוטומטית בגלל שהם שייכים לקבוצה מאושרת.';
+$lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = 'digiKam מיועד לצלמים שרוצים להציג, לנהל, לערוך, לשפר, לארגן, לתייג, ולשתף תצלומים.';
 $lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto הוא מנהל התמונת הברירת המחדל בMacOSX.תוסף יצוא Piwigo מאפשר לך ליצור אלבומים חדשים ולייצא את תמונות ישירות מ-iPhoto לגלריית תמונות Piwigo.';
 $lang['digiKam is an advanced digital photo management free software for Linux, Windows, and MacOSX.'] = 'digiKam היא תוכנה מתקדמת לניהול תמונות דיגיטלית חופשיה עבור לינוקס, Windows ו MacOSX.';
-$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = '
-כדי לייצא את התמונות שלך מ-digiKam ל-Piwigo, פשוט התקן digiKam ו-kipi-plugins';
-$lang['Web Form'] = 'טופס אינטרנט';
+$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'כדי לייצא את התמונות שלך מ-digiKam ל-Piwigo, פשוט התקן digiKam ו-kipi-plugins';
+$lang['Web Form'] = 'טופס רשת';
 $lang['Piwigo Publish plugin for Lightroom'] = 'תוסף פירסום Piwigo עבור Lightroom';
 $lang['Piwigo export plugin for Aperture'] = 'תוסף יצוא Piwigo עבור Aperture';
 $lang['Piwigo export plugin for iPhoto'] = 'תוסף יצוא Piwigo עבור iPhoto';
 $lang['Piwigo publish plugin for Shotwell'] = 'תוסף פירסום Piwigo עבור Shotwell';
 $lang['Piwigo publish plugin for digiKam'] = 'תוסף פירסום Piwigo עבור digiKam';
 $lang['Predefined filter'] = 'מסנן מוגדר מראש';
-$lang['Sharpen'] = 'חידוד';
-$lang['Portrait'] = 'דיוקן';
-$lang['Rated %d times, score : %.2f'] = 'דורג %d פעמים, ציון : %.2f';
-$lang['Ratio'] = 'דירוג';
+$lang['Sharpen'] = 'חדד';
+$lang['Portrait'] = 'אנכי';
+$lang['Rated %d times, score : %.2f'] = 'דורג %d פעמים, ציון: %.2f';
+$lang['Ratio'] = 'יחס';
 $lang['View in gallery'] = 'צפה בגלריה';
 $lang['You can activate only one mobile theme.'] = 'אתה יכול להפעיל רק ערכת נושא אחת לסלולרי';
 $lang['between %.2f and %.2f'] = 'בין %.2f ו %.2f';
 $lang['between %d and %d pixels'] = 'בין %d ו %d פיקסלים';
 $lang['include photos with lower privacy level'] = 'כולל תמונות עם רמת פרטיות נמוכה';
-$lang['pending validation'] = 'ממתין לאימות';
+$lang['pending validation'] = 'ממתין לאישור';
 $lang['simple visitors'] = 'מבקרים פשוטים';
 $lang['Photo sizes with crop'] = 'גדלי תמונות עם חיתוך';
-$lang['Landscape'] = 'תמונת נוף';
+$lang['Landscape'] = 'אופקי';
 $lang['Not cropped correctly?'] = 'לא נחתך בצורה נכונה?';
-$lang['Original file : %s'] = 'קובץ מקורי : %';
+$lang['Original file : %s'] = 'קובץ מקורי: %s';
 $lang['Panorama'] = 'פנורמה';
-$lang['Permission granted for groups'] = 'ליצור הרשאות לקבוצות';
-$lang['Permission granted for users'] = 'ליצור הרשאות למשתמשים';
+$lang['Permission granted for groups'] = 'הרשאה ניתנה לקבוצות';
+$lang['Permission granted for users'] = 'הרשה ניתנה למשתמשים';
 $lang['Permission management'] = 'ניהול הרשאות';
 $lang['Delete multiple size images'] = 'מחק גדלים מרובים של תמונות';
 $lang['Generate multiple size images'] = 'צור גדלים מרובים לתמונות';
-$lang['No order field selected'] = 'לא נבחר סדר';
-$lang['Manage photos'] = 'ניהול תמונות';
+$lang['No order field selected'] = 'לא נבחר שדה סדר';
+$lang['Manage photos'] = 'נהל תמונות';
 $lang['Minimum height'] = 'גובה מינימלי';
 $lang['Minimum width'] = 'רוחב מינימלי';
 $lang['Number of albums per page'] = 'מספר אלבומים בעמוד';
 $lang['Opacity'] = 'אטימות';
 $lang['Rename'] = 'שנה שם';
-$lang['Duplicate'] = 'כפילות';
+$lang['Duplicate'] = 'שכפל';
 $lang['Manage the members'] = 'נהל את החברים';
 $lang['Merge selected groups'] = 'מזג את הקבוצות שנבחרו';
-$lang['No group selected, no action possible.'] = 'אף קבוצה לא נבחרה,אף שינוי לא בוצע.';
+$lang['No group selected, no action possible.'] = 'אף קבוצה לא נבחרה, אין פעולות אפשריות.';
 $lang['No members to manage'] = 'אין חברים לנהל';
-$lang['Notify administrators when a comment is'] = 'עדכן מנהלים כאשר נכתבת תגובה';
-$lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo לא יכולה להוציא את קבצי העדכון מהשרת';
-$lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'הגדרת  <i>$conf[\'order_by\']</i>  בקובץ ההגדרות המקומי. הפרמטר הזה פגום. אנא הסר אותו או שנה את שמו ל-   <i>$conf[\'order_by_custom\']</i> !';
-$lang['This group will be set to default'] = 'יעשה שימוש בקבוצה זו כברירת מחדל';
+$lang['Notify administrators when a comment is'] = 'עדכן אדמינים כאשר תגובה היא';
+$lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo לא יכולה לטעון את קבצי השדרוג מהשרת';
+$lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !';
+$lang['This group will be set to default'] = 'קבוצה זו תשמש כברירת מחדל';
 $lang['This group will be unset to default'] = 'קבוצה זו לא תשמש יותר כברירת מחדל';
-$lang['Type here the name of the new group'] = 'הקלד את שם הקבוצה החדשה כאן';
+$lang['Type here the name of the new group'] = 'כתוב את שם הקבוצה החדשה כאן';
 $lang['Update user'] = 'עדכן משתמש';
-$lang['User %s added'] = 'משתמש  %s  נוסף';
-$lang['User %s updated'] = 'משתמש  %s  עודכן';
-$lang['on the %d selected users'] = 'על  %d  משתמשים נבחרו';
-$lang['The original maximum height must be a number between %d and %d'] = 'הגובה המקסימאלי המקורי צריך להיות מספר בין  %d   ו-  %d ';
-$lang['The original maximum width must be a number between %d and %d'] = 'הרוחב המקסימאלי המקורי צריך להיות מספר בין  %d   ו-  %d ';
-$lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'מימדי התמונה יוקטנו ל-   %dx%d   פיקסלים';
-$lang['The center of interest is the most meaningful zone in the photo.'] = 'מרכז העניין הוא האזור המשמעותי ביותר של התמונה ';
-$lang['The original image quality must be a number between %d and %d'] = 'האיכות המקורית של התמונה צריכה להיות מספר בין  %d  ו- %d ';
+$lang['User %s added'] = 'משתמש %s התווסף';
+$lang['User %s updated'] = 'משתמש %s עודכן';
+$lang['on the %d selected users'] = 'על %d המשתמשים שנבחרו';
+$lang['The original maximum height must be a number between %d and %d'] = 'הגובה המקסימאלי המקורי צריך להיות מספר בין %d ו-%d ';
+$lang['The original maximum width must be a number between %d and %d'] = 'הרוחב המקסימאלי המקורי צריך להיות מספר בין %d ו-%d ';
+$lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'מימדי התמונה יוקטנו ל-%dx%d פיקסלים.';
+$lang['The center of interest is the most meaningful zone in the photo.'] = 'מוקד העניין הוא האזור המשמעותי ביותר של התמונה.';
+$lang['The original image quality must be a number between %d and %d'] = 'האיכות המקורית של התמונה צריכה להיות מספר בין %d ו-%d ';
 $lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'פלאגין הפרסום של Piwigo מאפשר לייצא ולבצע סינכרון של תמונות מתוך אדובי לייטרום ישירות לגלריית התמונות של Piwigo';
-$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'פלאגין היצוא של Piwigo מאפשר ליצור אלבומים ולייצא תמונות';
+$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'פלאגין הייצוא של Piwigo מאפשר ליצור אלבומים ולייצא תמונות.';
 $lang['Users modified'] = 'משתמשים עודכנו';
 $lang['close'] = 'סגור';
-$lang['Tag "%s" is now a duplicate of "%s"'] = 'התוית  "%s" היא כעת שכפול של  "%s"';
+$lang['Tag "%s" is now a duplicate of "%s"'] = 'התגית "%s" היא כעת שכפול של "%s"';
 $lang['Showing %s to %s of %s users'] = 'מציג %s עד %s מתוך %s משתמשים';
 $lang['Show %s users'] = 'הצג %s משתמשים';
 $lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwell הוא מנהל תמונות קוד פתוח שרץ על לינוקס. הוא ברירת המחדל של מנהל התמונות ב- Ubuntu וב- Fedora';
-$lang['Select at least one tag'] = 'בחר לפחות תוית אחת';
+$lang['Select at least one tag'] = 'בחר לפחות תגית אחת';
 $lang['Resize after upload disabled due to the use of GD as graphic library'] = 'שינוי גודל אחרי העלאת תמונה נוטרל עקב שימוש ב- GD כספריית גרפיקה';
 $lang['Registered on %s, %s.'] = 'נרשם ב-  %s, %s';
 $lang['ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform.'] = 'ReGalAndroid (RemoteGallery client for Android) זהו קליינט קוד פתוח  (GPL v3) של Piwigo עבור פלטפורמת אנדרואיד';
-$lang['Purge user cache'] = 'נקה את ה- cache של המשתמש';
+$lang['Purge user cache'] = 'נקה את המטמון של המשתמש';
 $lang['Please select at least two groups'] = 'אנא בחר לפחות שתי קבוצות';
-$lang['Password updated'] = 'ססמה עודכנה';
+$lang['Password updated'] = 'סיסמא עודכנה';
 $lang['Open user details'] = 'פתח פרטי משתמש';
-$lang['Numeric identifier : %d'] = 'מזהה מספרי:  %d';
+$lang['Numeric identifier : %d'] = 'מזהה מספרי: %d';
 $lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'במערכת הלינוקס שלך, פשוט התקן Shotwell עם מנהל החבילות ואז את הפעל את אפשרות הפרסום של Piwigo.';
 $lang['No user selected of %d users'] = 'לא נבחר משתמש מתוך %d משתמשים';
-$lang['No user selected, no action possible.'] = 'לא נבחר משתמש, אין אפשרות לבצע פעולה.';
+$lang['No user selected, no action possible.'] = 'לא נבחר משתמש, אין אפשרות לבצע אף פעולה.';
 $lang['<em>Piwigo for Android</em> application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = '<em> אפליקציית Piwigo עבור אנדרואיד</em>  מאפשרת לך להתחבר מטלפון האנדרואיד או הטאבלט שלך לגלריית Piwigo, ליצור אלבומים ולהעלות מספר תמונות בו זמנית ';
 $lang['Last visit on %s, %s.'] = 'ביקור אחרון ב- %s, %s.';
-$lang['Mail theme'] = 'נושא מייל';
-$lang['No matching user found'] = 'לא נמצאו משתמשים מתאימים';
+$lang['Mail theme'] = 'ערכת נושא דואר';
+$lang['No matching user found'] = 'לא נמצא משתמש מתאים';
 $lang['Loading...'] = 'טוען...';
 $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'אם אין גודל HD ואם הגודל הנוכחי גדול ממימדי השינוי, Piwigo יזיז זאת כ-HD ויצור תמונה מוקטנת ';
 $lang['General'] = 'כללי';
-$lang['For photo sizes with crop, such as "Square", Piwigo will do its best to include the center of interest.'] = 'עבור גדלי תמונה עם חיתוך, כמו "ריבוע", Piwigo יעשה כמידת יכולתו לכלול את מרכז העניין';
+$lang['For photo sizes with crop, such as "Square", Piwigo will do its best to include the center of interest.'] = 'עבור גדלי תמונה עם חיתוך, כמו "ריבוע", Piwigo יעשה כמיטב יכולתו לכלול את מוקד העניין';
 $lang['Features include gallery browsing, album creation and photo upload.'] = 'התכונות כוללות עיון בגלרייה, יצירת אלבום והעלאת תמונה';
 $lang['Close user details'] = 'סגור פרטי משתמש';
 $lang['Change username'] = 'שנה שם משתמש';
 $lang['Change password'] = 'שנה ססמה';
 $lang['By default, the center of interest is placed in the middle of the photo.'] = 'כברירת מחדל, מרכז העניין ממוקם במרכז התמונה';
 $lang['Basic settings'] = 'הגדרות בסיסיות';
-$lang['All %d users are selected'] = 'כל  %d המשתמשים נבחרו';
-$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'אדובי פוטושופ לייטרום היא תכנת עיבוד צילום המתוכננת לנהל כמויות גדולות של צילומים ולבצע עבודת עיבוד ';
-$lang['Activate it now'] = 'הפעל כעת';
-$lang['<em>Piwigo for iOS</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = '<em> אפליקציית Piwigo עבור iOS</em>  מאפשרת לך להתחבר ממכשירי iPhone, iPad או Ipod Touch שלך לגלריית Piwigo, ליצור אלבומים ולהעלות מספר תמונות בו זמנית ';
-$lang['(filtered from %s total users)'] = 'מסונן מתוך  %s סך הכל משתמשים';
-$lang['%d of %d users selected'] = '%d מתוך %d מתשמשים נבחרו';
+$lang['All %d users are selected'] = 'כל %d המשתמשים נבחרו';
+$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'אדובי פוטושופ לייטרום היא תכנת עיבוד צילום המתוכננת לנהל כמויות גדולות של צילומים ולבצע עבודת עיבוד פוסט ';
+$lang['Activate it now'] = 'הפעל זאת כעת';
+$lang['<em>Piwigo for iOS</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = '<em> אפליקציית Piwigo עבור iOS</em>  מאפשרת לך להתחבר ממכשירי iPhone, iPad או Ipod Touch שלך לגלריית Piwigo, ליצור אלבומים ולהעלות מספר תמונות בו זמנית.';
+$lang['(filtered from %s total users)'] = '(מסונן מתוך %s סך הכל משתמשים)';
+$lang['%d of %d users selected'] = '%d מתוך %d משתמשים נבחרו';
 $lang['Allow users to add a link to their website'] = 'אפשר למשתמשים להוסיף קישור לאתר שלהם';
-$lang['Empty caddie'] = 'עגלה ריקה';
-$lang['Impossible to deactivate the default theme.'] = 'אין אפשרות לבטל הפעלת תבנית ברירת מחדל';
-$lang['Mail address is mandatory for registration'] = 'כתובת מייל היא חובה על מנת להירשם';
-$lang['No and unlock sub-albums'] = 'לא ואפשר תת-אלבומים';
-$lang['The settings for the guest are from the %s user'] = 'ההגדרות עבור אורח הם מ %s משתמש';
+$lang['Empty caddie'] = 'סל ריק';
+$lang['Impossible to deactivate the default theme.'] = 'לא ניתן לכבות את ערכת נושא ברירת המחדל.';
+$lang['Mail address is mandatory for registration'] = 'חובה להזין כתובת דואר כדי להירשם';
+$lang['No and unlock sub-albums'] = 'לא ובטל נעילת אלבומי משנה';
+$lang['The settings for the guest are from the %s user'] = 'ההגדרות עבור האורח הם ממשתמש %s';
 $lang['based on'] = 'מבוסס על';
-$lang['between %s and %s MB'] = 'בין %s עד %s מב';
+$lang['between %s and %s MB'] = 'בין %s ו %s MB';
 $lang['date & time'] = 'תאריך ושעה';
 $lang['file name'] = 'שם קובץ';
 $lang['width & height'] = 'רוחב וגובה';
-$lang['Upload in progress'] = 'העלאה בתהליך';
\ No newline at end of file
+$lang['Upload in progress'] = 'טעינה בתהליך';
+$lang['Correction the anomaly will cancel the fact that it\'s ignored'] = 'לא תהיה התעלמות יותר מהאנומליה המתוקנת';
+$lang['Can\'t connect to server.'] = 'לא ניתן להתחבר לשרת.';
+$lang['Can\'t create temporary file.'] = 'לא ניתן ליצור קובץ זמני.';
+$lang['Can\'t download archive.'] = 'לא ניתן להוריד את הארכיון.';
+$lang['Can\'t read or extract archive.'] = 'לא ניתן לקרוא או לחלץ את הארכיון.';
\ No newline at end of file
diff --git a/sources/language/he_IL/common.lang.php b/sources/language/he_IL/common.lang.php
index 107449d..908b370 100644
--- a/sources/language/he_IL/common.lang.php
+++ b/sources/language/he_IL/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: עברית [IL]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=457
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -34,41 +34,41 @@ $lang_info['direction'] = "rtl";
 $lang_info['code'] = "he";
 $lang_info['zero_plural'] = true;
 
-$lang['%d Kb'] = '%d קילובייט';
-$lang['%d album updated'] = "%d קטגוריה מעודכנת";
-$lang['%d albums updated'] = "%d קטגוריות מעודכנות";
-$lang['%d comment to validate'] = "%d תגובה לאמת";
-$lang['%d comments to validate'] = "%d תגובות לאמת";
+$lang['%d Kb'] = '%d KB';
+$lang['%d album updated'] = '%d אלבום עודכן';
+$lang['%d albums updated'] = '%d אלבומים עודכנו';
+$lang['%d comment to validate'] = '%d תגובה לאישור';
+$lang['%d comments to validate'] = '%d תגובות לאישור';
 $lang['%d new comment'] = "%d תגובה חדשה";
 $lang['%d new comments'] = "%d תגובות חדשות";
 $lang['%d comment'] = "%d תגובה";
 $lang['%d comments'] = "%d תגובות";
-$lang['%d hit'] = "%d לחיצה";
-$lang['%d hits'] = "%d לחיצות";
+$lang['%d hit'] = '%d פגיעה';
+$lang['%d hits'] = '%d פגיעות';
 $lang['%d new photo'] = "%d תמונה חדשה";
 $lang['%d new photos'] = "%d תמונות חדשות";
 $lang['%d new user'] = "%d משתמש חדש";
 $lang['%d new users'] = "%d משתמשים חדשים";
-$lang['About'] = "על";
-$lang['All tags'] = "כל התוויות";
-$lang['Any tag'] = "כל תווית";
-$lang['At least one listed rule must be satisfied.'] = "חייב להיות לפחות קריטריון אחד ברשימה .";
-$lang['Author'] = "מחבר";
-$lang['Albums'] = "קטגוריות";
-$lang['Album'] = "קטגוריה";
+$lang['About'] = 'אודות';
+$lang['All tags'] = 'כל התגיות';
+$lang['Any tag'] = 'תגית כלשהי';
+$lang['At least one listed rule must be satisfied.'] = 'לפחות קריטריון אחד מצויין פה חייב להתקיים.';
+$lang['Author'] = 'יוצר';
+$lang['Albums'] = 'אלבומים';
+$lang['Album'] = 'אלבום';
 $lang['Close this window'] = "סגור חלון זה";
-$lang['Complete RSS feed (photos, comments)'] = "עדכון RSS (תמונות, הערות)";
-$lang['Confirm Password'] = "אשר סיסמה";
+$lang['Complete RSS feed (photos, comments)'] = 'עדכון RSS מלא (תמונות, הערות)';
+$lang['Confirm Password'] = 'אשר סיסמא';
 $lang['Connection settings'] = "הגדרות חיבור";
 $lang['Login'] = "התחברות";
 $lang['Contact webmaster'] = "צור קשר עם מנהל האתר";
 $lang['Create a new account'] = "צור חשבון חדש";
 $lang['Created on'] = 'נוצר ב';
 $lang['Creation date'] = "תאריך יצירה";
-$lang['Current password is wrong'] = "הסיסמה שגויה";
+$lang['Current password is wrong'] = 'סיסמא שגויה';
 $lang['Dimensions'] = "מימדים";
-$lang['Display'] = "להציג";
-$lang['Each listed rule must be satisfied.'] = "כל רשימת קריטריונים חייבת להיות שלמה.";
+$lang['Display'] = 'תצוגה';
+$lang['Each listed rule must be satisfied.'] = 'כל קריטריון ברשימה חייב להתמלא.';
 $lang['Email address'] = "כתובת דואר אלקטרוני";
 $lang['Enter your personnal informations'] = "הזן את הנתונים האישיים שלך";
 $lang['Error sending email'] = "שגיאה בעת שליחת דואר אלקטרוני";
@@ -77,75 +77,75 @@ $lang['File'] = "קובץ";
 $lang['Filesize'] = "גודל הקובץ";
 $lang['Filter and display'] = "סנן והצג";
 $lang['Filter'] = "מסנן";
-$lang['Forgot your password?'] = "שכחת את הסיסמה?";
+$lang['Forgot your password?'] = 'שכחת את הסיסמא?';
 $lang['Go through the gallery as a visitor'] = "נווט בגלריה כמבקר";
 $lang['Help'] = "עזרה";
-$lang['Identification'] = "הזדהות";
+$lang['Identification'] = 'זיהוי';
 $lang['Photos only RSS feed'] = "תמונות בלבד RSS ";
-$lang['Keyword'] = "מילות מפתח";
+$lang['Keyword'] = 'מילת מפתח';
 $lang['Links'] = "קישורים";
-$lang['N/A'] = "N/A לא ידוע";
+$lang['N/A'] = 'N/A';
 $lang['New on %s'] = "חדש ב %s";
 $lang['Notification'] = "הודעה";
 $lang['Number of items'] = "מספר הפריטים";
 $lang['Original dimensions'] = "מידות מקוריות";
-$lang['Password forgotten'] = "שכחתי את הסיסמה";
-$lang['Password'] = "סיסמה";
+$lang['Password forgotten'] = 'שכחתי את הסיסמא';
+$lang['Password'] = 'סיסמא';
 $lang['Post date'] = "תאריך פרסום";
 $lang['Posted on'] = "פורסם ב";
 $lang['Profile'] = "פרופיל";
-$lang['Quick connect'] = "גישה מהירה";
+$lang['Quick connect'] = 'חיבור מהיר';
 $lang['RSS feed'] = 'הזנות (RSS)';
 $lang['Register'] = "הירשם";
 $lang['Registration'] = "הרשמה";
-$lang['Related tags'] = "תוויות קשורות";
-$lang['Reset'] = "איפוס";
-$lang['Retrieve password'] = "לאחזר את הסיסמה";
-$lang['Search rules'] = "חיפוש קריטריונים";
-$lang['Search tags'] = "חיפוש תוויות";
+$lang['Related tags'] = 'תגיות קשורות';
+$lang['Reset'] = 'אפס';
+$lang['Retrieve password'] = 'שחזר את הסיסמא';
+$lang['Search rules'] = 'קריטריוני חיפוש';
+$lang['Search tags'] = 'חפש תגיות';
 $lang['Search'] = "חיפוש";
-$lang['display available tags'] = "ראה תוויות אפשריות";
-$lang['Since'] = "מ";
+$lang['display available tags'] = 'הצג תגיות קיימות';
+$lang['Since'] = 'מאז';
 $lang['Sort by'] = "מיין לפי";
-$lang['Sort order'] = "לפי הסדר";
-$lang['Tag'] = "תווית";
-$lang['Tags'] = "תוויות";
+$lang['Sort order'] = 'סדר מיון';
+$lang['Tag'] = 'תגית';
+$lang['Tags'] = 'תגיות';
 $lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = "ה-RSS מספק התראה על אירועים חדשים מאתר זה: תמונות חדשות, קטגוריות מעודכן, הערות חדשות. כדי להשתמש עם קורא RSS.";
 $lang['Unknown feed identifier'] = 'מזהה לא ידוע';
 $lang['User comments'] = 'תגובות משתמש';
 $lang['Username'] = 'שם משתמש';
-$lang['Visits'] = 'מבקר';
+$lang['Visits'] = 'ביקורים';
 $lang['Webmaster'] = 'מנהל אתר';
 $lang['Week %d'] = 'שבוע %d';
 $lang['About Piwigo'] = 'אודות Piwigo';
 $lang['You are not authorized to access the requested page'] = 'אינך מורשה לגשת לדף זה';
 $lang['add this photo to your favorites'] = 'הוסף תמונה זאת למועדפים שלך';
-$lang['Administration'] = 'מנהל ראשי';
+$lang['Administration'] = 'ניהול אדמינים';
 $lang['all'] = 'הכול';
 $lang['ascending'] = 'עולה';
-$lang['author(s) : %s'] = 'מחבר/ים : %';
-$lang['Expand all albums'] = 'הרחב את כל הקטגוריות';
+$lang['author(s) : %s'] = 'יוצר/ים: %s';
+$lang['Expand all albums'] = 'הרחב את כל האלבומים';
 $lang['posted after %s (%s)'] = 'פורסם אחרי %s (%s)';
 $lang['posted before %s (%s)'] = 'פורסם לפני %s (%s)';
 $lang['posted between %s (%s) and %s (%s)'] = 'פורסם בין %s (%s) ו %s (%s)';
 $lang['posted on %s'] = 'פורסם ב %';
-$lang['Best rated'] = 'מדורג הכי גבוהה';
-$lang['display best rated photos'] = 'הצג את התמונה המדורגת הכי גבוהה';
+$lang['Best rated'] = 'מדורג במקום הגבוה ביותר';
+$lang['display best rated photos'] = 'הצג את התמונות בדירוגים הגבוהים ביותר';
 $lang['Calendar'] = 'לוח שנה';
 $lang['All'] = 'הכול';
-$lang['display each day with photos, month per month'] = 'הצג כל יום עם תמונה, חודש אחרי חודש';
+$lang['display each day with photos, month per month'] = 'הצג כל יום עם תמונות, חודש אחרי חודש';
 $lang['View'] = 'צפה';
-$lang['chronology_monthly_calendar'] = 'חודשי לוח שנה';
-$lang['chronology_monthly_list'] = 'רשימת חודשים';
-$lang['chronology_weekly_list'] = 'רשימת שבועות';
+$lang['chronology_monthly_calendar'] = 'לוח שנה חודשי';
+$lang['chronology_monthly_list'] = 'רשימה חודשית';
+$lang['chronology_weekly_list'] = 'רשימה שבועית';
 $lang['Click here if your browser does not automatically forward you'] = 'לחץ כאן אם הדפדפן לא העביר אותך אוטומטית';
 $lang['comment date'] = 'תאריך תגובה';
 $lang['Comment'] = 'תגובה';
 $lang['Your comment has been registered'] = 'התגובה שלך נרשמה';
-$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'מערכת למניעת קריסה : המתן מספר שניות בין תגובה לתגובה';
-$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'התגובה שלך לא נרשמה כיוון שלא עמדה באחד הכללים';
-$lang['An administrator must authorize your comment before it is visible.'] = 'המנהל הראשי חייב לאשר את התגובה שלך לפני שהיא תופיעה.';
-$lang['This login is already used by another user'] = 'אתה מחובר כבר על משתמש אחר';
+$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'מערכת למניעת הצפה: אנא המתן רגע לפני שליחת התגובה הבאה';
+$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'התגובה שלך לא נרשמה כיוון שלא עמדה בכללי האישור';
+$lang['An administrator must authorize your comment before it is visible.'] = 'אדמין חייב לאשר את התגובה שלך לפני שהיא תופיע.';
+$lang['This login is already used by another user'] = 'חיבור זה בשימוש כבר על ידי משתמש אחר';
 $lang['Comments'] = 'תגובות';
 $lang['Add a comment'] = 'הוסף תגובה';
 $lang['created after %s (%s)'] = 'נוצר אחרי %s (%s)';
@@ -153,7 +153,7 @@ $lang['created before %s (%s)'] = 'נוצר לפני %s (%s)';
 $lang['created between %s (%s) and %s (%s)'] = 'נוצר בין %s (%s) ל %s (%s)';
 $lang['created on %s'] = 'נוצר ב %s';
 $lang['Customize'] = 'התאמה אישית';
-$lang['Your Gallery Customization'] = 'הגלריה האישית שלך';
+$lang['Your Gallery Customization'] = 'התאמה אישית של הגלריה שלך';
 $lang['day'][0] = "יום ראשון";
 $lang['day'][1] = "יום שני";
 $lang['day'][2] = "יום שלישי";
@@ -162,42 +162,42 @@ $lang['day'][4] = "יום חמישי";
 $lang['day'][5] = "יום שישי";
 $lang['day'][6] = "יום שבת";
 $lang['Default'] = 'ברירת מחדל';
-$lang['delete this photo from your favorites'] = 'מחק את התמונה מהמועדפים שלך';
+$lang['delete this photo from your favorites'] = 'מחק תמונה זו מהמועדפים שלך';
 $lang['Delete'] = 'מחק';
 $lang['descending'] = 'יורד';
 $lang['Download'] = 'הורד';
 $lang['Download this file'] = 'הורד את הקובץ';
 $lang['edit'] = 'ערוך';
-$lang['wrong date'] = 'תאריך לא נכון';
-$lang['excluded'] = 'נשלל';
-$lang['Your favorites'] = 'המועדפים שלי';
+$lang['wrong date'] = 'תאריך שגוי';
+$lang['excluded'] = 'לא כולל';
+$lang['Your favorites'] = 'המועדפים שלך';
 $lang['display your favorites photos'] = 'הצג את התמונות המועדפות שלך';
 $lang['Favorites'] = 'מועדפים';
 $lang['First'] = 'ראשון';
-$lang['The gallery is locked for maintenance. Please, come back later.'] = 'הגלריה סגורה לצורכי תחזוקה. בבקשהה, תחזור מאוחר יותר.';
+$lang['The gallery is locked for maintenance. Please, come back later.'] = 'הגלריה נעולה לצורכי תחזוקה. אנא חזור מאוחר יותר.';
 $lang['Page generated in'] = 'הדף נוצר ב';
 $lang['guest'] = 'אורח';
 $lang['Hello'] = 'שלום';
-$lang['available for administrators only'] = 'זמין למנהל ראשי בלבד';
-$lang['display this album'] = 'הצג תמונות בשורש הקטגוריה';
-$lang['display last user comments'] = 'ראה את התגובות האחרונות של המשתמשים';
-$lang['customize the appareance of the gallery'] = 'התאם אישית את מראה הקטגוריה';
+$lang['available for administrators only'] = 'זמין לאדמינים בלבד';
+$lang['display this album'] = 'הצג אלבום זה';
+$lang['display last user comments'] = 'הצג את תגובות המשתמשים האחרונות';
+$lang['customize the appareance of the gallery'] = 'התאם אישית את מראה הגלריה';
 $lang['search'] = 'חפש';
 $lang['Home'] = 'בית';
 $lang['Identification'] = "הזדהה";
-$lang['in this album'] = "בקטגוריה הזאת";
-$lang['in %d sub-album'] = "ב %d תת קטגוריה";
-$lang['in %d sub-albums'] = "ב %d תת קטגוריות";
+$lang['in this album'] = 'באלבום זה';
+$lang['in %d sub-album'] = 'ב %d אלבום משנה';
+$lang['in %d sub-albums'] = 'ב %d אלבומי משנה';
 $lang['included'] = "כולל";
-$lang['Invalid password!'] = "סיסמה לא חוקית!";
+$lang['Invalid password!'] = 'סיסמא שגויה!';
 $lang['Language'] = "שפה";
-$lang['last %d days'] = "ה %d ימים אחרונים";
+$lang['last %d days'] = '%d ימים אחרונים';
 $lang['Last'] = "אחרון";
 $lang['Logout'] = "התנתק";
-$lang['obligatory'] = "הכרחי";
+$lang['obligatory'] = 'חובה';
 $lang['display a calendar by creation date'] = "הצג לוח שנה לפי תאריך יצירה";
-$lang['display all photos in all sub-albums'] = "הצג את כל הפריטים בכל הקטגוריות ובכל התת קטגוריות";
-$lang['return to normal view mode'] = "חזור לתצוגה רגילה";
+$lang['display all photos in all sub-albums'] = 'הצג את כל התמונות בכל אלבומי המשנה';
+$lang['return to normal view mode'] = 'חזור למצב תצוגה רגילה';
 $lang['display a calendar by posted date'] = "הצג לוח שנה לפי תאריך פרסום";
 $lang['month'][10] = "אוקטובר";
 $lang['month'][11] = "נובמבר";
@@ -214,215 +214,222 @@ $lang['month'][9] = "ספטמבר";
 $lang['Most visited'] = "הכי נצפה";
 $lang['display most visited photos'] = "הצג את התמונות הנצפות ביותר";
 $lang['Unknown identifier'] = 'מזהה לא ידוע';
-$lang['New password'] = "סיסמה חדשה";
+$lang['New password'] = 'סיסמא חדשה';
 $lang['Rate this photo'] = "דרג תמונה זאת";
 $lang['Next'] = "הבא";
-$lang['no rate'] = "לא דורג";
-$lang['Photos posted within the last %d day.'] = "פריטים שנוספו ב %d ימים האחרונים.";
-$lang['Photos posted within the last %d days.'] = "פריטים שנוספו ב %d ימים האחרונים.";
-$lang['password updated'] = "הסיסמה עודכנה";
-$lang['Recent period must be a positive integer value'] = 'התמונות האחרונות חייב להיות מספר שלם חיובי';
+$lang['no rate'] = 'ללא דירוג';
+$lang['Photos posted within the last %d day.'] = 'פריטים שנוספו ב %d הימים האחרונים.';
+$lang['Photos posted within the last %d days.'] = 'פריטים שנוספו ב %d הימים האחרונים.';
+$lang['password updated'] = 'הסיסמא עודכנה';
+$lang['Recent period must be a positive integer value'] = 'התקופה האחרונה חייבת להיות מספר שלם חיובי';
 $lang['photo'] = "תמונה";
-$lang['Click on the photo to see it in high definition'] = "לחץ על הצמונה על מנת לראות אותה באיכות גבוהה";
+$lang['Click on the photo to see it in high definition'] = 'לחץ על התמונה על מנת לראות אותה באיכות גבוהה';
 $lang['Show file metadata'] = "הראה את המידע על הקובץ";
-$lang['Powered by'] = "נוצר על ידי";
+$lang['Powered by'] = 'Powered by';
 $lang['Preferences'] = "העדפות";
 $lang['Previous'] = "קודם";
-$lang['Random photos'] = "תמונה אקראית";
+$lang['Random photos'] = 'תמונות אקראיות';
 $lang['display a set of random photos'] = "הראה מספר תמונות אקראיות";
-$lang['Recent albums'] = "הקטגוריות האחרונות";
-$lang['display recently updated albums'] = "הראה את הקטגוריות שעודכנו לאחרונה";
-$lang['Recent period'] = "בתקופה האחרונה";
+$lang['Recent albums'] = 'אלבומים אחרונים';
+$lang['display recently updated albums'] = 'הצג אלבומים שעודכנו לאחרונה';
+$lang['Recent period'] = 'תקופה אחרונה';
 $lang['Recent photos'] = "תמונות אחרונות";
-$lang['display most recent photos'] = "הראה את התמונות הכי חדשות";
-$lang['Redirection...'] = "מעביר...";
-$lang['Please, enter a login'] = "הכנס שם משתמש";
+$lang['display most recent photos'] = 'הצג את התמונות הכי חדשות';
+$lang['Redirection...'] = 'העברה...';
+$lang['Please, enter a login'] = 'אנא הזן שם משתמש';
 $lang['login mustn\'t end with a space character'] = "שם משתמש לא יכול להיגמר ברווח";
 $lang['login mustn\'t start with a space character'] = "שם משתמש לא יכול להתחיל עם רווח";
-$lang['this login is already used'] = "השם משתמש הזה קיים כבר";
-$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = "דואר אלקטרוני חייב להיות כמו adir@biton.com (לדוגמה : adir@gmail.com)";
+$lang['this login is already used'] = 'שם המשתמש הזה כבר בשימוש';
+$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'דואר אלקטרוני חייב להיות כמו xxx@yyyy.eeee (לדוגמה : gates@gmail.com)';
 $lang['Auto login'] = "התחברות אוטומטית";
-$lang['remove this tag from the list'] = "מחק את התווית הזאת מהרשימה";
-$lang['representative'] = "נבחר";
-$lang['Search for Author'] = "חפש את המחבר";
-$lang['Search in albums'] = "חפש בקטגוריה";
+$lang['remove this tag from the list'] = 'הסר את התגית הזאת מהרשימה';
+$lang['representative'] = 'צלמית אלבום';
+$lang['Search for Author'] = 'חפש לפי יוצר';
+$lang['Search in albums'] = 'חפש באלבומים';
 $lang['Search by date'] = "חפש לפי תאריך";
 $lang['Date'] = "תאריך";
 $lang['End-Date'] = "תאריך סיום";
 $lang['Kind of date'] = "סוג של תאריך";
-$lang['Search for words'] = "חפש את המילה";
-$lang['Search for all terms'] = "חפש את כל התנאים";
-$lang['Search for any term'] = "חפש לפי כל תנאי";
+$lang['Search for words'] = 'חפש את המילים';
+$lang['Search for all terms'] = 'חפש לפי כל התנאים';
+$lang['Search for any term'] = 'חפש לפי תנאי כלשהו';
 $lang['Empty query. No criteria has been entered.'] = "שאילתה ריקה. לא הוכנסו קריטריונים.";
-$lang['Search results'] = "חפש תוצאות";
-$lang['Search in sub-albums'] = "חפש בתת קטגוריות";
-$lang['searched words : %s'] = "חפש מילה : %s";
+$lang['Search results'] = 'תוצאות חיפוש';
+$lang['Search in sub-albums'] = 'חפש באלבומי המשנה';
+$lang['searched words : %s'] = 'מילים לחיפוש : %s';
 $lang['Contact'] = "צור קשר";
-$lang['set as album representative'] = "סמן כמייצג הקטגוריה";
+$lang['set as album representative'] = 'בחר כצלמית אלבום';
 $lang['Show number of comments'] = "הראה מספר תגובות";
-$lang['Show number of hits'] = "הראה מספר לחיצות";
+$lang['Show number of hits'] = 'הראה מספר פגיעות';
 $lang['slideshow'] = "מצגת";
 $lang['stop the slideshow'] = "עצור את המצגת";
 $lang['Specials'] = "מיוחדים";
 $lang['SQL queries in'] = "שאילתות SQL";
-$lang['display only recently posted photos'] = "הראה רק תמונות שפורסמו לאחרונה";
+$lang['display only recently posted photos'] = 'הצג רק תמונות שפורסמו לאחרונה';
 $lang['return to the display of all photos'] = "חזור להצגת כל התמונות";
 $lang['the beginning'] = "ההתחלה";
-$lang['Thumbnails'] = "תמונות ממוזערות";
+$lang['Thumbnails'] = 'צלמיות';
 $lang['Menu'] = "תפריט";
 $lang['A comment on your site'] = "תגובה באתר שלך";
 $lang['today'] = "היום";
 $lang['Update your rating'] = "עדכן את הדירוג שלך";
-$lang['the username must be given'] = "דרוש שם משתמש";
-$lang['useful when password forgotten'] = "שימושי במקרה ששכחת את הסיסמה";
+$lang['the username must be given'] = 'שם משתמש חובה';
+$lang['useful when password forgotten'] = 'שימושי במקרה ששכחת את הסיסמא';
 $lang['Quick search'] = "חיפוש מהיר";
 $lang['Connected user: %s'] = "משתמש מחובר: %s";
-$lang['IP: %s'] = "אי פי: %s";
+$lang['IP: %s'] = 'IP: %s';
 $lang['Browser: %s'] = "דפדפן: %s";
-$lang['Author: %s'] = "מחבר: %s";
+$lang['Author: %s'] = 'יוצר: %s';
 $lang['Comment: %s'] = "תגובה: %s";
-$lang['Comment by %s'] = "התגובה נרשמה על ידי %s";
-$lang['User: %s'] = "שם משתמש: %s";
+$lang['Comment by %s'] = 'תגובה של %s';
+$lang['User: %s'] = 'משתמש: %s';
 $lang['Email: %s'] = "דואר אלקטרוני: %s";
-$lang['Admin: %s'] = "מנהל: %s";
+$lang['Admin: %s'] = 'אדמין: %s';
 $lang['Registration of %s'] = "רישום של %s";
-$lang['Album: %s'] = "קטגוריה: %s";
-$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'מצב לא טוב עבור המשתמש "האורח", השתמש במצב ברירת מחדל. עדכן בבקשה את מנהל האתר.';
-$lang['this email address is already in use'] = "משתמש אחר כבר משתמש בדואר האלקטרוני הזה";
-$lang['Album results for'] = "תוצאות עבור הקטגוריה";
-$lang['Tag results for'] = "תוצאות עבור התוויות";
+$lang['Album: %s'] = 'אלבום: %s';
+$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'מצב שגוי עבור משתמש "אורח", משתמש במצב ברירת מחדל. עדכן בבקשה את מנהל האתר.';
+$lang['this email address is already in use'] = 'הדואר האלקטרוני הזה כבר בשימוש';
+$lang['Album results for'] = 'תוצאות אלבום עבור';
+$lang['Tag results for'] = 'תוצאות עבור התגיות';
 $lang['from %s to %s'] = "מ %s עד %s";
-$lang['Play of slideshow'] = "הפעל מצגת";
+$lang['Play of slideshow'] = 'נגן מצגת';
 $lang['Pause of slideshow'] = "עצור מצגת";
-$lang['Repeat the slideshow'] = "חזור על אותם שקופיות";
+$lang['Repeat the slideshow'] = 'חזור על המצגת';
 $lang['Not repeat the slideshow'] = "אל תחזור על אותם שקופיות";
-$lang['Reduce diaporama speed'] = "הורד את מהירות הצגת המצגת";
-$lang['Accelerate diaporama speed'] = "העלה את מהירות הצגת המצגת";
+$lang['Reduce diaporama speed'] = 'האט את המצגת';
+$lang['Accelerate diaporama speed'] = 'הגבר מהירות המצגת';
 $lang['Submit'] = "שלח";
 $lang['Yes'] = "כן";
 $lang['No'] = "לא";
 $lang['%d photo'] = "%d תמונה";
 $lang['%d photos'] = "%d תמונות";
-$lang['%d photo is also linked to current tags'] = "%d התמונוה כבר מקושרת לתווית זאת";
-$lang['%d photos are also linked to current tags'] = "%d התמונה כבר מקושרת לתוויות אלה";
-$lang['display photos linked to this tag'] = "הראה תמונות המקושרות לתווית זאת בלבד";
+$lang['%d photo is also linked to current tags'] = '%d תמונה כבר מקושרת לתגית זו';
+$lang['%d photos are also linked to current tags'] = '%d תמונות מקושרות גם לתגיות אלה';
+$lang['display photos linked to this tag'] = 'הצג תמונות המקושרות לתגית זאת';
 $lang['photos posted during the last %d days'] = "תמונות שפורסמו במשך %d ימים אחרונים";
 $lang['Piwigo Help'] = "עזרת Piwigo";
 $lang['Rank'] = "דירוג";
-$lang['group by letters'] = "קבוצה לפי אותיות";
+$lang['group by letters'] = 'קבץ לפי אותיות';
 $lang['letters'] = "אותיות";
-$lang['show tag cloud'] = "הצג ענן תוויות";
+$lang['show tag cloud'] = 'הצג ענן תגיות';
 $lang['cloud'] = "ענן";
-$lang['Reset to default values'] = "אפס לערך ברירת מחדל";
+$lang['Reset to default values'] = 'אפס לערכי ברירת מחדל';
 $lang['delete all photos from your favorites'] = "מחק את כל התמונות מהמועדפים שלך";
 $lang['Sent by'] = "נשלח על ידי";
-$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "הדפדפן שלך חוסם קוקיז או לא תומך בהם. אתה חייב להפעיל את ה קוקיז בשביל להתחבר.";
+$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'הדפדפן שלך חוסם קוקיז או לא תומך בהם. אתה חייב להפעיל את הקוקיז בשביל להתחבר.';
 $lang['Edit a comment'] = "ערוך תגובה";
 $lang['Are you sure?'] = "האם אתה בטוח?";
-$lang['(!) This comment requires validation'] = '(!) תגובה זאת דורשת אישור מנהל';
+$lang['(!) This comment requires validation'] = '(!) תגובה זאת דורשת אישור';
 $lang['Welcome'] = 'ברוך הבא';
 $lang['Welcome to your Piwigo photo gallery!'] = 'ברוך הבא לגלריית ה Piwigo שלך!';
-$lang['... or browse your empty gallery'] = '... או גלוש בגלריה הריקה שלך';
-$lang['... or please deactivate this message, I will find my way by myself'] = '... אן התעלם מהודעה זאת, אני ימצא את דרכי לבד';
+$lang['... or browse your empty gallery'] = '... או שוטט בגלריה הריקה שלך';
+$lang['... or please deactivate this message, I will find my way by myself'] = '... או בטל הודעה זאת, אני אמצא את דרכי לבד';
 $lang['Hello %s, your Piwigo photo gallery is empty!'] = 'שלום %s, גלרית הPiwigo שלך ריקה!';
 $lang['I want to add photos'] = 'אני רוצה להוסיף תמונות';
-$lang['Manage this user comment: %s'] = 'נהל את תגובות משתמש זה: %s';
-$lang['Email address is missing. Please specify an email address.'] = "חסר כתובת דואר אלקטרוני. הכנס בבקשה כתובת דואר אלקטרוני זמינה.";
-$lang['This author modified following comment:'] = 'מחבר זה, ערך את התגובה שלו:';
-$lang['This author removed the comment with id %d'] = 'מחבר זה מחק את התגובה עם השם משתמש %d';
+$lang['Manage this user comment: %s'] = 'נהל את תגובת משתמש זה: %s';
+$lang['Email address is missing. Please specify an email address.'] = 'חסרה כתובת דואר אלקטרוני. הזן בבקשה כתובת דואר אלקטרוני.';
+$lang['This author modified following comment:'] = 'יוצר זה ערך את התגובה הבאה:';
+$lang['This author removed the comment with id %d'] = 'יוצר זה מחק את התגובה עם מספר זיהוי %d';
 $lang['html tags are not allowed in login'] = 'לא ניתן להשתמש בתגי html בהתחברות';
-$lang['The number of photos per page must be a not null scalar'] = 'מספר התמונות בד חייב להיות גדול מאפס';
+$lang['The number of photos per page must be a not null scalar'] = 'מספר התמונות בדף חייב להיות גדול מאפס';
 $lang['Number of photos per page'] = 'מספר תמונות בדף';
 
-$lang['Change my password'] = 'שנה את הסיסמה שלי';
+$lang['Change my password'] = 'שנה את הסיסמא שלי';
 $lang['Check your email for the confirmation link'] = 'קישור אימות ממתין אצלך באימייל';
 $lang['Desktop'] = 'שולחן העבודה';
 $lang['Edit'] = 'ערוך';
-$lang['Enter your new password below.'] = 'הכנס את סיסמתך החדשה מתחת';
+$lang['Enter your new password below.'] = 'הזן את סיסמתך החדשה מתחת';
 $lang['Hello %s,'] = 'שלום %s,';
-$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'אם זה טעות, התעלם ממייל זה ושום דבר לא יקרא';
+$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'אם זו היתה טעות, פשוט התעלם ממייל זה ודבר לא יקרה';
 $lang['%d rate'] = '%d דירוג';
 $lang['%d rates'] = '%d דירוגים';
 $lang['2small'] = 'XXS - זעיר';
-$lang['Bad request'] = 'בקשה לא טובה';
-$lang['Date created, new &rarr; old'] = 'תאריך יצירה, חדש &rare; ישן';
-$lang['Date created, old &rarr; new'] = 'תאריך יצירה, ישן &rare; חדש';
-$lang['Date posted, new &rarr; old'] = 'תאריך פרסום, חדש &rare; ישן';
-$lang['Date posted, old &rarr; new'] = 'תאריך פרסום, ישן &rare; חדש';
-$lang['EXIF Metadata'] = 'מטה EXIF';
-$lang['File name, A &rarr; Z'] = 'שם הקובץ, א &rarr; ת';
-$lang['File name, Z &rarr; A'] = 'שם הקובץ, ת &rarr; א';
+$lang['Bad request'] = 'בקשה שגויה';
+$lang['Date created, new &rarr; old'] = 'תאריך יצירה, חדש &larr; ישן';
+$lang['Date created, old &rarr; new'] = 'תאריך יצירה, ישן &larr; חדש';
+$lang['Date posted, new &rarr; old'] = 'תאריך פרסום, חדש &larr; ישן';
+$lang['Date posted, old &rarr; new'] = 'תאריך פרסום, ישן &larr; חדש';
+$lang['EXIF Metadata'] = 'EXIF Metadata';
+$lang['File name, A &rarr; Z'] = 'שם הקובץ, א &larr; ת';
+$lang['File name, Z &rarr; A'] = 'שם הקובץ, ת &larr; א';
 $lang['Forbidden'] = 'אסור';
-$lang['Here are your connection settings'] = 'כאן נמצאים הגדרות ההתחברות שלך';
-$lang['IPTC Metadata'] = 'מטה IPTC';
-$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'אם אתה חושב שקיבלת את האימייל הזה בטעות, בבקשה צור קשר איתנו ב %s';
+$lang['Here are your connection settings'] = 'הנה הגדרות ההתחברות שלך';
+$lang['IPTC Metadata'] = 'IPTC Metadata';
+$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'אם אתה חושב שקיבלת את האימייל הזה בטעות, אנא צור קשר איתנו ב %s';
 $lang['Invalid key'] = 'מקש שגוי';
 $lang['Invalid username or email'] = 'שם משתמש או אימייל שגויים';
 $lang['Manual sort order'] = 'מיון ידני';
-$lang['Mobile'] = 'סלולרי';
-$lang['Numeric identifier, 1 &rarr; 9'] = 'מספרי זיהוי, 1 %rarr; 9';
-$lang['Numeric identifier, 9 &rarr; 1'] = 'מספרי זיהוי, 9 %rarr; 1';
+$lang['Mobile'] = 'מובייל';
+$lang['Numeric identifier, 1 &rarr; 9'] = 'מספרי זיהוי, 1 %larr; 9';
+$lang['Numeric identifier, 9 &rarr; 1'] = 'מספרי זיהוי, 9 %larr; 1';
 $lang['Original'] = 'מקורי';
-$lang['Page not found'] = 'הדף לא נמצא';
-$lang['Password Reset'] = 'אפס סיסמה';
-$lang['Password reset is not allowed for this user'] = 'משתמש זה לא רשאי לאפס סיסמה';
-$lang['Password: %s'] = 'סיסמה: %s';
-$lang['Permalink for album not found'] = 'לא נמצא קישור לאלבום';
-$lang['Photo sizes'] = 'גודל התמונה';
-$lang['Photo title, A &rarr; Z'] = 'כותרת התמונה, א &rarr; ת';
-$lang['Photo title, Z &rarr; A'] = 'כותרת התמונה, א &rarr; ת';
-$lang['Piwigo encountered a non recoverable error'] = 'Piiwigo נתקל בשגיאה שלא נתנת לתיקון';
-$lang['Please enter your username or email address.'] = 'הכנס בבקשה את שם המשתמש או האימייל שלך';
-$lang['Rating score, high &rarr; low'] = 'ציון דירוג, גבוהה %rarr; נמוך';
-$lang['Rating score, low &rarr; high'] = 'ציון דירוג, נמוך %rarr; גבוהה';
+$lang['Page not found'] = 'דף לא נמצא';
+$lang['Password Reset'] = 'אפס סיסמא';
+$lang['Password reset is not allowed for this user'] = 'משתמש זה לא רשאי לאפס סיסמא';
+$lang['Password: %s'] = 'סיסמא: %s';
+$lang['Permalink for album not found'] = 'לא נמצא קישור קבוע לאלבום';
+$lang['Photo sizes'] = 'מידות התמונה';
+$lang['Photo title, A &rarr; Z'] = 'כותרת התמונה, א &larr; ת';
+$lang['Photo title, Z &rarr; A'] = 'כותרת התמונה, א &larr; ת';
+$lang['Piwigo encountered a non recoverable error'] = 'Piiwigo נתקל בשגיאה שלא ניתנת לתיקון';
+$lang['Please enter your username or email address.'] = 'הכנס בבקשה את שם המשתמש או האימייל שלך.';
+$lang['Rating score, high &rarr; low'] = 'ציון דירוג, גבוהה %larr; נמוך';
+$lang['Rating score, low &rarr; high'] = 'ציון דירוג, נמוך %larr; גבוהה';
 $lang['Rating score'] = 'ציון דירוג';
 $lang['Requested album does not exist'] = 'האלבום המבוקש לא קיים';
-$lang['Requested tag does not exist'] = 'תיוג מבוקש לא קיים';
+$lang['Requested tag does not exist'] = 'התגית המבוקשת לא קיימת';
 $lang['Return to home page'] = 'חזור לדף הבית';
-$lang['Send my connection settings by email'] = 'שלח את פירטי ההתחברות שלי באימייל';
-$lang['Show latest comments first'] = 'הראה את התגובה החדשה בהתחלה';
-$lang['Show oldest comments first'] = 'הראה את התגובה הישנה בהתחלה';
-$lang['Someone requested that the password be reset for the following user account:'] = 'מישהו ביקש לאפס סיסמה למשתמש:';
-$lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'נרשמת בהצלחה, בקרוב תקבל אימייל עם פרטי ההתחברות שלך, ברוך הבא!';
+$lang['Send my connection settings by email'] = 'שלח את פרטי ההתחברות שלי באימייל';
+$lang['Show latest comments first'] = 'הראה את התגובות האחרונות בהתחלה';
+$lang['Show oldest comments first'] = 'הראה את התגובות הישנות ביותר בהתחלה';
+$lang['Someone requested that the password be reset for the following user account:'] = 'מישהו ביקש לאפס סיסמא לחשבון משתמש:';
+$lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'נרשמת בהצלחה, בקרוב תקבל אימייל עם פרטי ההתחברות שלך. ברוך הבא!';
 $lang['Thank you for registering at %s!'] = 'תודה לך על רישומך אל %s!';
-$lang['The passwords do not match'] = 'הסיסמה לא תואמת';
-$lang['To reset your password, visit the following address:'] = 'כנס לכתובת הבאה, כדי לאפס את סיסמתך';
-$lang['User "%s" has no email address, password reset is not possible'] = 'למשתמש ״%s" אין כתובת אימייל, שיחזור סיסמה לא אפשרי';
+$lang['The passwords do not match'] = 'הסיסמאות לא תואמות';
+$lang['To reset your password, visit the following address:'] = 'לאיפוס הסיסמא, הכנס לכתובת הבאה';
+$lang['User "%s" has no email address, password reset is not possible'] = 'למשתמש ״%s" אין כתובת אימייל, לא ניתן לשחזר סיסמא.';
 $lang['Username "%s" on gallery %s'] = 'שם משתמש ״%s" בגלריה %s';
 $lang['Username modification'] = 'שינוי שם משתמש';
 $lang['Username or email'] = 'שם משתמש או אימייל';
 $lang['Username: %s'] = 'שם משתמש: %s';
 $lang['View in'] = 'צפייה ב';
-$lang['Visits, high &rarr; low'] = 'מבקרים, גבוהה %rarr; נמוך';
-$lang['Visits, low &rarr; high'] = 'מבקרים, נמוך %rarr; גבוהה';
-$lang['You will receive a link to create a new password via email.'] = 'אתה תקבל לינק אל האימייל שלך כדי ליצור סיסמה חדשה';
-$lang['Your password has been reset'] = 'הסיסמה שלך אופסה';
-$lang['Your username has been successfully changed to : %s'] = 'שם המשתמש שלך שונה בהצלחה אל : %s';
+$lang['Visits, high &rarr; low'] = 'ביקורים, גבוה %larr; נמוך';
+$lang['Visits, low &rarr; high'] = 'ביקורים, נמוך %larr; גבוה';
+$lang['You will receive a link to create a new password via email.'] = 'אתה תקבל קישור אל האימייל שלך כדי ליצור סיסמא חדשה';
+$lang['Your password has been reset'] = 'הסיסמא שלך אופסה';
+$lang['Your username has been successfully changed to : %s'] = 'שם המשתמש שלך שונה בהצלחה ל: %s';
 $lang['large'] = 'L - גדול';
 $lang['medium'] = 'M - בינוני';
 $lang['small'] = 'S - קטן';
 $lang['square'] = 'מרובע';
-$lang['thumb'] = 'תמונה ממוזערת';
+$lang['thumb'] = 'צלמית';
 $lang['xlarge'] = 'XL - גדול מאוד';
 $lang['xsmall'] = 'XS - קטן מאוד';
 $lang['xxlarge'] = 'XXL - ענק';
-$lang['Your website URL is invalid'] = 'כתובת האתר שלך לא טובה';
+$lang['Your website URL is invalid'] = 'כתובת האתר שלך לא תקינה';
 $lang['Email address is mandatory'] = 'שדה דואר אלקטרוני חובה';
-$lang['Username is mandatory'] = 'שדה שם משתמש חובה';
+$lang['Username is mandatory'] = 'שם משתמש חובה';
 $lang['Website'] = 'אתר';
-$lang['mandatory'] = 'הכרחי';
-$lang['Password is missing. Please enter the password.'] = 'סיסמה חסרה, נה להזין סיסמה..';
-$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'אישור סיסמה חסר, נה להזיר אישור סיסמה..';
+$lang['mandatory'] = 'חובה';
+$lang['Password is missing. Please enter the password.'] = 'סיסמא חסרה. אנא הזן את הסיסמא.';
+$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'אישור סיסמא חסר. אנא אשר את הסיסמא.';
 $lang['Last Page'] = 'עמוד אחרון';
-$lang['Theme'] = 'נושא';
+$lang['Theme'] = 'ערכת נושא';
 $lang['Go back to the album'] = 'חזור לאלבום';
 $lang['First Page'] = 'עמוד ראשון';
 $lang['Email'] = 'אימייל';
-$lang['%d photos per page'] = '%d תמונות בעמוד';
+$lang['%d photos per page'] = '%d תמונות לעמוד';
 $lang['No results for'] = 'לא נמצאו תוצאות עבור';
 $lang['Album name, A &rarr; Z'] = 'שם אלבום, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'שם אלבום, Z &rarr; A';
-$lang['Apply on properties'] = 'עדכן הגדרות';
+$lang['Apply on properties'] = 'עדכן תכונות';
 $lang['Link: %s'] = 'קישור: %s';
 $lang['Photo description'] = 'תיאור התמונה';
-$lang['Photo title'] = 'כותרת התמונה';
\ No newline at end of file
+$lang['Photo title'] = 'כותרת התמונה';
+$lang['day']['0'] = 'ראשון';
+$lang['day']['1'] = 'שני';
+$lang['day']['2'] = 'שלישי';
+$lang['day']['3'] = 'רביעי';
+$lang['day']['4'] = 'חמישי';
+$lang['day']['5'] = 'שישי';
+$lang['day']['6'] = 'שבת';
\ No newline at end of file
diff --git a/sources/language/he_IL/install.lang.php b/sources/language/he_IL/install.lang.php
index 3d7de40..898a3a7 100644
--- a/sources/language/he_IL/install.lang.php
+++ b/sources/language/he_IL/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "סיסמה [אושרה]";
 $lang['verification'] = "אימות";
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = "צריך עזרה? היעזר ב <a href=\"%s\">הפורום של Piwigo</a>.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "אורחים יוכלו להשתמש בדואר האלקטרוני הזה כדי ליצור קשר עם מנהל האתר";
-$lang['PHP 5 is required'] = "נדרש גירסת PHP 5";
+$lang['PHP 5 is required'] = 'נדרש גירסת PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = "שרת המארח שלך רץ על גירסת PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo תנסה להחליף את התצורה שלך ל PHP 5 על ידי יצירת או שינוי קובץ .htaccess";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo תנסה להחליף את התצורה שלך ל PHP 5.2 על ידי יצירת או שינוי קובץ .htaccess';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "אתה יכול לשנות את התצורה שלך לבד ולהריץ את Piwigo לאחר מכן.";
-$lang['Try to configure PHP 5'] = "נסה להגדיר PHP 5";
+$lang['Try to configure PHP 5'] = 'נסה להגדיר PHP 5.2';
 $lang['Sorry!'] = "סליחה!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo לא יכולה להגדיר את PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "אתה צריך לפנות לתמיכת השרת המאחר שלך ולראות איך אתה יכול להחליף ל PHP 5 לבד.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo לא יכולה להגדיר את PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'אתה צריך לפנות לתמיכת השרת המאחר שלך ולראות איך אתה יכול להחליף ל PHP 5.2 לבד.';
 $lang['Hope to see you back soon.'] = "מקווה לראות אותך שוב בקרוב.";
 $lang['Congratulations, Piwigo installation is completed'] = 'מזל טוב,התקנת Piwigo הושלמה';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'הפתרון החלופי הוא להעתיק את הטקסט בתיבה מעל ולהדביק אותו בקובץ "local/config/database.inc.php" (אזהרה : database.inc.php חייב להחיל רק את התווים שבתיבת טקסט, לא לחזור על שורות או לעשות רווח)';
diff --git a/sources/language/he_IL/upgrade.lang.php b/sources/language/he_IL/upgrade.lang.php
index d1777b9..5d629e8 100644
--- a/sources/language/he_IL/upgrade.lang.php
+++ b/sources/language/he_IL/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -23,19 +23,18 @@
 
 $lang['Upgrade'] = "שדרג";
 $lang['Upgrade from version %s to %s'] = "שדרג מגירסה %s ל %s";
-$lang['Statistics'] = "סטטיסטיקה";
+$lang['Statistics'] = 'סטטיסטיקות';
 $lang['total upgrade time'] = "זמן שידרוג כולל";
-$lang['total SQL time'] = "זמןSQLכולל";
-$lang['SQL queries'] = "SQLשאילתות";
+$lang['total SQL time'] = 'זמן SQL כולל';
+$lang['SQL queries'] = 'שאילתות SQL';
 $lang['Upgrade informations'] = "מידע לשידרוג";
 $lang['User permissions and group permissions have been erased'] = 'הרשאות משתמשים וקבוצות נמחקו';
 $lang['Only administrator can run upgrade: please sign in below.'] = 'רק מנהל יכול להריץ שדרוג : בבקשה התחבר למטה';
-$lang['You do not have access rights to run upgrade'] = 'אין לך גישה להפעיל שדרוג';
+$lang['You do not have access rights to run upgrade'] = 'אין לך הרשאות גישה לבצע שדרוג';
 $lang['This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).'] = 'דף זה מציע לשדרג את מסד הנתונים מגרסת Piwigo הישנה לגרסה החדשה. עוזר השדרוג חושב שאתה מפעיל כרגע <strong>שחרור %s</strong>.';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'רק תמונות ממוזערות, ודואר אלקטרוני של מנהל האתר נשמרו מהגירסה הקודמת';
 $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'בצע בדיקת תחזוקה ב[ ניהול> כלים> תחזוקה] אם נתקלת בעיה כלשהי.';
 $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'כאמצעי זהירות הערכות הבאות בוטלו, בדוק עדכונם לפני הפעלתם המחודשת:';
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'בתוך <i>%s</i>, לפני <b>?></b>, הכנס:';
 $lang['All sub-albums of private albums become private'] = 'כל אלבומי משנה של אלבומים פרטיים יהפכו לפרטים';
-$lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'התוספים הבאים בוטלו כאמצעי זהירות, בדוק אפשרות לעדכונם טרם הפעלתם המחודשת:';
-?>
\ No newline at end of file
+$lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'התוספים הבאים בוטלו כאמצעי זהירות, בדוק אפשרות לעדכונם טרם הפעלתם המחודשת:';
\ No newline at end of file
diff --git a/sources/language/hr_HR/admin.lang.php b/sources/language/hr_HR/admin.lang.php
index a9df2cb..318cd89 100644
--- a/sources/language/hr_HR/admin.lang.php
+++ b/sources/language/hr_HR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/hr_HR/common.lang.php b/sources/language/hr_HR/common.lang.php
index a55ea92..9c01d43 100644
--- a/sources/language/hr_HR/common.lang.php
+++ b/sources/language/hr_HR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Hrvatski [HR]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=422
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/hr_HR/help/index.php b/sources/language/hr_HR/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/hr_HR/help/index.php
+++ b/sources/language/hr_HR/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/hr_HR/index.php b/sources/language/hr_HR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/hr_HR/index.php
+++ b/sources/language/hr_HR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/hr_HR/install.lang.php b/sources/language/hr_HR/install.lang.php
index e9f9436..e73c0ea 100644
--- a/sources/language/hr_HR/install.lang.php
+++ b/sources/language/hr_HR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Zaporka [potvrdi]';
 $lang['verification'] = 'ovjera';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Trebate pomoć? Pitajte na <a href="%s">Piwigo message board</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Posjetitelji će moći pisati upravitelju galerije preko ove adrese';
-$lang['PHP 5 is required'] = 'PHP 5 je obvezan';
+$lang['PHP 5 is required'] = 'PHP 5.2 je obvezan';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Čini se da vaše web mjesto trenutno koristi PHP inačicu %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo će pokušati podesiti sustavne postavke na PHP 5 izradom ili prilagodbom .htaccess zapisa.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo će pokušati podesiti sustavne postavke na PHP 5.2 izradom ili prilagodbom .htaccess zapisa.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Ne zaboravite da možete i sami promijeniti postavke te potom ponovo pokrenuti Piwigo.';
-$lang['Try to configure PHP 5'] = 'Pokušaj podešavanja PHP 5';
+$lang['Try to configure PHP 5'] = 'Pokušaj podešavanja PHP 5.2';
 $lang['Sorry!'] = 'Nažalost!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nije u mogućnosti podesiti PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Trebate se obratiti vašem davatelju usluge smještaja za upute na koji se način možete prebaciti na PHP 5 samostalno.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nije u mogućnosti podesiti PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Trebate se obratiti vašem davatelju usluge smještaja za upute na koji se način možete prebaciti na PHP 5.2 samostalno.';
 $lang['Hope to see you back soon.'] = 'Do skorog viđenja.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Čestitamo, Piwigo ugradnja je dovršena';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Druga mogućnost je da kopirate tekst u prostoru poviše i prebacite ga u zapis "local/config/database.inc.php" (Pozor :u database.inc.php smije se prebaciti samo tekst iz kućice bez znakova novog reda ili praznog prostora)';
@@ -63,5 +63,4 @@ $lang['You can download the config file and upload it to local/config directory
 $lang['Just another Piwigo gallery'] = 'Samo još jedna Piwigo galerija';
 $lang['Welcome to my photo gallery'] = 'Dobrodošli u moju fotogaleriju';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Ukoliko trebate pomoć slobodno pitajte na forumu: %s';
-$lang['Welcome to your new installation of Piwigo!'] = 'Dobrodošli na vašu novu Piwigo instalaciju!';
-?>
\ No newline at end of file
+$lang['Welcome to your new installation of Piwigo!'] = 'Dobrodošli na vašu novu Piwigo instalaciju!';
\ No newline at end of file
diff --git a/sources/language/hr_HR/upgrade.lang.php b/sources/language/hr_HR/upgrade.lang.php
index 0f25b86..ae82e40 100644
--- a/sources/language/hr_HR/upgrade.lang.php
+++ b/sources/language/hr_HR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/hu_HU/admin.lang.php b/sources/language/hu_HU/admin.lang.php
index 37d9292..01a2a27 100644
--- a/sources/language/hu_HU/admin.lang.php
+++ b/sources/language/hu_HU/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -985,4 +985,13 @@ $lang['Empty caddie'] = 'Üres kosár';
 $lang['The settings for the guest are from the %s user'] = 'A vendég beállításai a %s fekhasználótól';
 $lang['Upload in progress'] = 'Feltöltés folyamatban';
 $lang['based on'] = 'erre alapozva:';
-$lang['No and unlock sub-albums'] = 'Nem és al-albumok feloldása';
\ No newline at end of file
+$lang['No and unlock sub-albums'] = 'Nem és al-albumok feloldása';
+$lang['Delete %d orphan photos'] = 'Az %d árva képek törlése';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Minden küldött e-mail tartalmazni fogja a saját automatikus érvényesítő kulcsát hivatkozásként. Eddig érvényes: %s.';
+$lang['Edit user'] = 'Felhasználó szerkesztése';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Biztonsági okok miatt az érvényesítő kulcsok nem működnek az adminisztrátoroknál.';
+$lang['No recipient selected'] = 'Nincs címzett kiválasztva';
+$lang['No user is permitted to see this private album'] = 'Nincs felhasználó, aki láthatná ezt a személyes albumot.';
+$lang['Orphans'] = 'Árvák';
+$lang['Recipients'] = 'Címzettek';
+$lang['Y Repeat'] = 'Y ismétlődés';
\ No newline at end of file
diff --git a/sources/language/hu_HU/common.lang.php b/sources/language/hu_HU/common.lang.php
index 386d5d1..fbfee9b 100644
--- a/sources/language/hu_HU/common.lang.php
+++ b/sources/language/hu_HU/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Magyar [HU]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=423
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -429,4 +429,5 @@ $lang['Photo title'] = 'Kép címe';
 $lang['Album name, A &rarr; Z'] = 'Album név, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Album név, Z &rarr; A';
 $lang['No results for'] = 'Nincs eredmény';
-$lang['Link: %s'] = 'Hivatkozás: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Hivatkozás: %s';
+$lang['Your authentication key is no longer valid.'] = 'A hitelesítési kulcsod már nem érvényes.';
\ No newline at end of file
diff --git a/sources/language/hu_HU/help/index.php b/sources/language/hu_HU/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/hu_HU/help/index.php
+++ b/sources/language/hu_HU/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/hu_HU/help/photos_add_ftp.html b/sources/language/hu_HU/help/photos_add_ftp.html
index 96bd6d2..95d60ed 100644
--- a/sources/language/hu_HU/help/photos_add_ftp.html
+++ b/sources/language/hu_HU/help/photos_add_ftp.html
@@ -27,39 +27,34 @@ Gratulálunk, ezzel létrehoztad az első album képtárat.
     <p>A mappák és albumok listája a Piwigo "galeries" könyvtárban. 
     Itt következik a könyvtárfa egy kis galériáról, (de számos funkcióval): </p>
   
-<pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+    <pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -80,6 +75,8 @@ Gratulálunk, ezzel létrehoztad az első album képtárat.
   alapértelmezés szerint a fájl kiterjesztéséhez illeszkedő ikon jelenik meg. 
   Az ilyen fájlokhoz hozzárendelhető egy bélyegkép fájl (lásd a fenti példában a video.avi fájlt).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Figyelem</em>: a könyvtárak és fájlok nevei csak betűket és számokat, 
   valamint a következő karaktereket tartalmazhatják: "-", "_" vagy ".". 
   Nem lehet üres hely és soremelés karakter.</li>
diff --git a/sources/language/hu_HU/index.php b/sources/language/hu_HU/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/hu_HU/index.php
+++ b/sources/language/hu_HU/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/hu_HU/install.lang.php b/sources/language/hu_HU/install.lang.php
index c153556..cb644ac 100644
--- a/sources/language/hu_HU/install.lang.php
+++ b/sources/language/hu_HU/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Jelszó [megerősítés]';
 $lang['verification'] = 'jelszó egyezőségének ellenőrzése';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Segítségre van szüksége ? Kérdéseit itt teheti fel: <a href="%s">Piwigo üzenőfal</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'A látogatók ezen az e-mail címen tudják felvenni a kapcsolatot az adminisztrátorral';
-$lang['PHP 5 is required'] = 'PHP 5 szükséges';
+$lang['PHP 5 is required'] = 'PHP 5.2 szükséges';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Úgy tűnik, a tárhelyszolgáltatójánál jelenleg futó PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo megpróbálhatja bekapcsolni a PHP 5-öt azáltal, hogy létrehoz vagy módosít egy .htaccess fájlt.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo megpróbálhatja bekapcsolni a PHP 5.2-öt azáltal, hogy létrehoz vagy módosít egy .htaccess fájlt.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Figyelem: Ha meg tudja változtatni a PHP konfigurációt, indítsa újra a Piwigot.';
-$lang['Try to configure PHP 5'] = 'Próbálja meg beállítani a PHP 5-öt';
+$lang['Try to configure PHP 5'] = 'Próbálja meg beállítani a PHP 5.2-öt';
 $lang['Sorry!'] = 'Elnézést!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nem tudta beállítani a PHP 5-öt.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nem tudta beállítani a PHP 5.2-öt.';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Lehet, hogy a tárhely szolgáltató támogatja a PHP 5-öt. A bekapcsoláshoz keresse meg őket.";
 $lang['Hope to see you back soon.'] = 'Remélem később viszontlátjuk.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gratulálunk, a Piwigo telepítése sikeresen befejeződött';
@@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Üdvözöljük a képgalériában';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Kérdése van? Keresse fel fórumunkat: %s';
 $lang['Welcome to your new installation of Piwigo!'] = 'Köszönt a frissen telepített Piwigo galéria!';
 $lang['localhost or other, supplied by your host provider'] = 'localhost vagy egyéb, a fogadó szolgáltató által megadott';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Lehet, hogy a tárhely szolgáltató támogatja a PHP 5.2-öt. A bekapcsoláshoz keresse meg őket.';
\ No newline at end of file
diff --git a/sources/language/hu_HU/upgrade.lang.php b/sources/language/hu_HU/upgrade.lang.php
index b2dfd45..85928e7 100644
--- a/sources/language/hu_HU/upgrade.lang.php
+++ b/sources/language/hu_HU/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/id_ID/common.lang.php b/sources/language/id_ID/common.lang.php
index 262d0bc..471277a 100644
--- a/sources/language/id_ID/common.lang.php
+++ b/sources/language/id_ID/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Bahasa Indonesia [ID]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=707
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -416,4 +416,15 @@ $lang['About'] = 'Tentang';
 $lang['About Piwigo'] = 'Tentang Piwigo';
 $lang['Accelerate diaporama speed'] = 'Tingkatkan kecepatan guliran gambar ';
 $lang['Add a comment'] = 'Tambahkan sebuah komentar';
-?>
\ No newline at end of file
+$lang['%d photos per page'] = '%d foto per halaman';
+$lang['Album name, A &rarr; Z'] = 'Nama album, A &arr; Z';
+$lang['Album name, Z &rarr; A'] = 'Nama album, Z &arr; A';
+$lang['Apply on properties'] = 'Terapkan ke properti';
+$lang['Link: %s'] = 'Tautan: %s';
+$lang['No results for'] = 'Tidak ada hasil untuk';
+$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Konfirmasi kata sandi terlewatkan. Harap konfirmasi kata sandi yang dipilih.';
+$lang['Password is missing. Please enter the password.'] = 'Kata sandi terlewat. Harap masukkan kata sandi.';
+$lang['Photo description'] = 'Deskripsi Foto';
+$lang['Photo title'] = 'Judul foto';
+$lang['Theme'] = 'Tema';
+$lang['Your authentication key is no longer valid.'] = 'Kunci otentikasi tidak lagi berlaku.';
\ No newline at end of file
diff --git a/sources/language/id_ID/index.php b/sources/language/id_ID/index.php
index ece5850..0837249 100644
--- a/sources/language/id_ID/index.php
+++ b/sources/language/id_ID/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/id_ID/install.lang.php b/sources/language/id_ID/install.lang.php
new file mode 100644
index 0000000..d863ace
--- /dev/null
+++ b/sources/language/id_ID/install.lang.php
@@ -0,0 +1,49 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2015 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+$lang['verification'] = 'Verifikasi';
+$lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Butuh bantuan? Ajukan pertannyaan anda ke <a href="%s">Piwigo message board</a>.';
+$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Catat bahwa anda dapat mengubah pengaturan anda sendiri kemudian mulai ulang Piwigo.';
+$lang['PHP 5 is required'] = 'PHP 5.2 diperlukan';
+$lang['Password ']['confirm'] = 'Kata sandi [konfirmasi]';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo mungkin akan mencoba mengganti pengaturan anda ke PHP 5.2 dengan membuat atau mengubah sebuah berkan .httaccess';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo tidak dapat mengatur PHP 5.2';
+$lang['Sorry!'] = 'Maaf!';
+$lang['Start Install'] = 'Mulai pemasangan';
+$lang['Try to configure PHP 5'] = 'Cobalah untuk mengatur PHP 5.2';
+$lang['User'] = 'Pengguna';
+$lang['Visitors will be able to contact site administrator with this mail'] = 'Pengunjung akan dapat menggunakan email ini untuk menghubungi administrator situs';
+$lang['Welcome to my photo gallery'] = 'Selamat datang ke foto galeriku';
+$lang['Welcome to your new installation of Piwigo!'] = 'Selamat datang ke instalasi baru dari Piwigo!';
+$lang['Admin configuration'] = 'Pengaturan administrasi';
+$lang['Basic configuration'] = 'Pengaturan dasar';
+$lang['Can\'t connect to server'] = 'Tidak dapat terhubung ke server';
+$lang['Congratulations, Piwigo installation is completed'] = 'Selamat, Instalasi piwigo telah selesai';
+$lang['Connection to server succeed, but it was impossible to connect to database'] = 'Koneksi ke server berhasil, tetapi koneksi ke database tidak memungkinkan.';
+$lang['Creation of config file local/config/database.inc.php failed.'] = 'Pembuatan berkas pengaturan local/config.database.inc.php gagal.';
+$lang['Database configuration'] = 'Pengaturan database';
+$lang['Database name'] = 'Nama database';
+$lang['Database table prefix'] = 'Prefiks tabel database';
+$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Jangan ragu untuk berkosultasi ke forum kami untuk bantuan apapun: %s';
+$lang['Download the config file'] = 'Unduh berkas pengaturan';
+$lang['Hope to see you back soon.'] = 'Berharap akan bertemu anda kembali.';
+$lang['Installation'] = 'Pemasangan';
\ No newline at end of file
diff --git a/sources/language/index.php b/sources/language/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/index.php
+++ b/sources/language/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/is_IS/common.lang.php b/sources/language/is_IS/common.lang.php
index 79b9c0f..3325d5c 100644
--- a/sources/language/is_IS/common.lang.php
+++ b/sources/language/is_IS/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Íslenska [IS]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=518
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/is_IS/index.php b/sources/language/is_IS/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/is_IS/index.php
+++ b/sources/language/is_IS/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/it_IT/admin.lang.php b/sources/language/it_IT/admin.lang.php
index ea0bdde..990cf8c 100644
--- a/sources/language/it_IT/admin.lang.php
+++ b/sources/language/it_IT/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -982,4 +982,14 @@ $lang['file name'] = 'nome file';
 $lang['date & time'] = 'data e ora';
 $lang['width & height'] = 'larghezza e altezza';
 $lang['No and unlock sub-albums'] = 'No e sbloccare sub-albums';
-$lang['Upload in progress'] = 'Trasferimento in corso...';
\ No newline at end of file
+$lang['Upload in progress'] = 'Trasferimento in corso...';
+$lang['Delete %d orphan photos'] = 'Cancellazione di %d foto orfane';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Ogni Email inviata conterrà una propria chiave di autenticazione automatica, valida per %s.';
+$lang['Edit user'] = 'Modificare utente';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Per motivi di sicurezza, le chiavi di autenticazione non funzionano per gli amministratori.';
+$lang['No recipient selected'] = 'Nessun destinatario selezionato';
+$lang['No user is permitted to see this private album'] = 'Nessun utente è autorizzato a visualizzare questo album privato';
+$lang['Orphans'] = 'Orfane';
+$lang['Recipients'] = '
+Destinatari';
+$lang['Y Repeat'] = 'Y Ripeti';
\ No newline at end of file
diff --git a/sources/language/it_IT/common.lang.php b/sources/language/it_IT/common.lang.php
index e291d64..deb9c7e 100644
--- a/sources/language/it_IT/common.lang.php
+++ b/sources/language/it_IT/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Italiano [IT]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=424
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -424,4 +424,5 @@ $lang['Photo description'] = 'Descrizione foto';
 $lang['Photo title'] = 'Titolo foto';
 $lang['Album name, A &rarr; Z'] = 'Nome album, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Nome album, Z &rarr; A';
-$lang['Link: %s'] = 'Link: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Link: %s';
+$lang['Your authentication key is no longer valid.'] = 'La chiave di autenticazione non è più valida';
\ No newline at end of file
diff --git a/sources/language/it_IT/help/index.php b/sources/language/it_IT/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/it_IT/help/index.php
+++ b/sources/language/it_IT/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/it_IT/help/photos_add_ftp.html b/sources/language/it_IT/help/photos_add_ftp.html
index 8e5001f..3d2fb0e 100644
--- a/sources/language/it_IT/help/photos_add_ftp.html
+++ b/sources/language/it_IT/help/photos_add_ftp.html
@@ -43,11 +43,20 @@ galleries
     |-- video-decollo-aereo.avi
     +-- pwg_representative
         +-- video-decollo-aereo.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>Ad eccezione di "pwg_representative", ogni directory inserita in "galleries" genera un album. Il numero di livelli (profondità) è illimitato.</li>
+  <li>Ad eccezione di "pwg_representative" and "pwg_format", ogni directory inserita in "galleries" genera un album. Il numero di livelli (profondità) è illimitato.</li>
 
   <li>Una foto è invece rappresentata da un file. Un file può essere una foto di Piwigo se la sua estensione è presente tra le possibilità previste nel parametro di configuarzione <code>file_ext</code> (vedi
 file <span class="filename">include/config.inc.php</span>). Un file è considerato come una foto
@@ -60,6 +69,8 @@ all'estensione del file. In modo opzionale, è possibile associare una miniatura
 ed un file rappresentativo (come per il file <span 
 class="filename">video-decollaggio-aereo.avi</span> nell'esempio proposto).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Attenzione</em>: il nome di una directory o di un file deve essere
 composto da lettere, numeri o simboli come "-", "_" o ".". Non utilizzate spazio
 e caratteri accentati.</li>
diff --git a/sources/language/it_IT/index.php b/sources/language/it_IT/index.php
index ece5850..0837249 100644
--- a/sources/language/it_IT/index.php
+++ b/sources/language/it_IT/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/it_IT/install.lang.php b/sources/language/it_IT/install.lang.php
index bdd31be..ec790e7 100644
--- a/sources/language/it_IT/install.lang.php
+++ b/sources/language/it_IT/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -47,14 +47,14 @@ $lang['Password [confirm]'] = 'Password [confermare]';
 $lang['verification'] = 'verifica';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Avete bisogno di aiuto? Visitate il <a href="%s">forum di Piwigo</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'I visitatori saranno in grado di contattarvi usando questa email';
-$lang['PHP 5 is required'] = 'E\' richiesto PHP 5';
+$lang['PHP 5 is required'] = 'E\' richiesto PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Sembra che la versione PHP del vostro server sia %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo tenterà di cambiare la configurazione di PHP 5 creando o modificando il file .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo tenterà di cambiare la configurazione di PHP 5.2 creando o modificando il file .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Nota: potete cambiare manualmente la configurazione PHP e poi riavviare Piwigo.';
-$lang['Try to configure PHP 5'] = 'Provare a configurare PHP 5';
+$lang['Try to configure PHP 5'] = 'Provare a configurare PHP 5.2';
 $lang['Sorry!'] = 'Spiacente!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non è stato in grado di configurare PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Si consiglia di fare riferimento al supporto del vostro provider di hosting e vedere come potete passare a PHP 5 da soli.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non è stato in grado di configurare PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Si consiglia di fare riferimento al supporto del vostro provider di hosting e vedere come potete passare a PHP 5.2 da soli.';
 $lang['Hope to see you back soon.'] = 'Speriamo di rivedervi presto.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Congratulazioni, l\'installazione di Piwigo è completata';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Una soluzione alternativa è quella di copiare il testo della casella sopra e incollarlo nel file "local/config/database.inc.php" (Attenzione: database.inc.php deve contenere solo quello che c\'è nel box sopra, senza nessun ritorno a capo o spazio)';
@@ -64,5 +64,4 @@ $lang['You can download the config file and upload it to local/config directory
 $lang['Just another Piwigo gallery'] = 'Una galleria Piwigo in più ';
 $lang['Welcome to my photo gallery'] = 'Benvenuti nella mia galleria fotografica';
 $lang['Welcome to your new installation of Piwigo!'] = 'Benvenuti sulla vostra nuova installazione di Piwigo!';
-$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Non esitate a consultare i nostri forum se avete un qualunque problema: %s';
-?>
\ No newline at end of file
+$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Non esitate a consultare i nostri forum se avete un qualunque problema: %s';
\ No newline at end of file
diff --git a/sources/language/it_IT/upgrade.lang.php b/sources/language/it_IT/upgrade.lang.php
index fc18a60..5a22061 100644
--- a/sources/language/it_IT/upgrade.lang.php
+++ b/sources/language/it_IT/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ja_JP/admin.lang.php b/sources/language/ja_JP/admin.lang.php
index 60a3855..6a95fc0 100644
--- a/sources/language/ja_JP/admin.lang.php
+++ b/sources/language/ja_JP/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -67,10 +67,10 @@ $lang['Database'] = 'データベース';
 $lang['Deactivate'] = '無効化';
 $lang['Delete Representant'] = 'アルバムのサムネイルを削除する';
 $lang['Delete selected tags'] = '選択したタグを削除する';
-$lang['Delete selected users'] = '選択したユーザを削除する';
+$lang['Delete selected users'] = '選択したユーザーを削除する';
 $lang['Deletions'] = '削除';
 $lang['Deny selected groups'] = '選択したグループを拒否する';
-$lang['Deny selected users'] = '選択したユーザを拒否する';
+$lang['Deny selected users'] = '選択したユーザーを拒否する';
 $lang['Description'] = '説明';
 $lang['Display options'] = '表示オプション';
 $lang['Dissociated'] = '関連なし';
@@ -157,14 +157,14 @@ $lang['Tag selection'] = 'タグ選択';
 $lang['The %d following tags were deleted'] = '次の %d 件のタグが削除されました。';
 $lang['Uninstall'] = 'アンインストール';
 $lang['Use the default photo sort order'] = 'デフォルトのイメージ並び順を使用する';
-$lang['User comments validation'] = 'ユーザコメント承認';
-$lang['Users'] = 'ユーザ';
+$lang['User comments validation'] = 'ユーザーコメント承認';
+$lang['Users'] = 'ユーザー';
 $lang['Validate'] = '承認';
 $lang['Validation'] = '承認';
 $lang['Version'] = 'バージョン';
 $lang['Virtual albums to move'] = '移動するバーチャルアルバム';
 $lang['Virtual album name'] = 'バーチャルアルバム名';
-$lang['Webmaster cannot be deleted'] = 'ウェブマスタは削除できません。';
+$lang['Webmaster cannot be deleted'] = 'ウェブマスターは削除できません。';
 $lang['You are running on development sources, no check possible.'] = 'あなたは開発版を使用しているため、チェックすることはできません。';
 $lang['You cannot delete your account'] = "あなた自身のアカウントを削除できません。";
 $lang['You cannot move an album in its own sub album'] = 'あなたは、アルバムをサブアルバムに移動できません。';
@@ -219,9 +219,9 @@ $lang['Execution time is out, treatment must be continue [Estimated time: %d sec
 $lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = '実行時間が終了しました。処理を継続します  [予想時間: %d 秒].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'メール送信するユーザリストのユーザ数が制限されています。他のユーザは、リストに含まれていません。';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'メール送信時間が制限されています。他のメールはスキップされます。';
-$lang['To send ?'] = '送信?';
+$lang['To send ?'] = '送信しますか?';
 $lang['Last send'] = '最終送信';
-$lang['User'] = 'ユーザ';
+$lang['User'] = 'ユーザー';
 $lang['See you soon,'] = 'それでは ';
 $lang['Go to'] = '移動 ';
 $lang['Hello'] = 'こんにちは ';
@@ -267,23 +267,23 @@ $lang['Subscribe'] = '購読';
 $lang['Parameters'] = 'パラメータ';
 $lang['Select recipients'] = '受信者の選択';
 $lang['Subscribe/unsubscribe users'] = 'ユーザの購読登録/購読解除';
-$lang['Unsubscribed'] = '購読なし';
+$lang['Unsubscribed'] = '購読解除';
 $lang['%d parameter was updated.'] = '%d 件のパラメータが更新されました。';
 $lang['%d parameters were updated.'] = '%d 件のパラメータが更新されました。';
 $lang['%d user was not updated.'] = '%d 名のユーザが更新されませんでした。';
 $lang['%d users were not updated.'] = '%d 名のユーザが更新されませんでした。';
-$lang['User %s [%s] was removed from the subscription list.'] = 'ユーザ %s [%s] は、購読リストから削除されました。';
-$lang['User %s [%s] was added to the subscription list.'] = 'ユーザ %s [%s] は、購読リストに追加されました。';
+$lang['User %s [%s] was removed from the subscription list.'] = 'ユーザー %s [%s] は、購読リストから削除されました。';
+$lang['User %s [%s] was added to the subscription list.'] = 'ユーザー %s [%s] は、購読リストに追加されました。';
 $lang['%d user was updated.'] = '%d 名のユーザが更新されました。';
 $lang['%d users were updated.'] = '%d 名のユーザが更新されました。';
-$lang['User %s [%s] was not removed from the subscription list.'] = 'ユーザ %s [%s] は、購読リストから削除されませんでした。';
-$lang['User %s [%s] was not added to the subscription list.'] = 'ユーザ %s [%s] は、購読リストに追加されませんでした。';
-$lang['User %s [%s] added.'] = 'ユーザ %s [%s] が追加されました。';
-$lang['Warning: subscribing or unsubscribing will send mails to users'] = '注意: 購読登録または購読解除の設定は、ユーザ宛にメール通知されます。';
-$lang['Send mail on HTML format'] = 'HTMLフォーマットでメールを送信する';
+$lang['User %s [%s] was not removed from the subscription list.'] = 'ユーザー %s [%s] は、購読リストから削除されませんでした。';
+$lang['User %s [%s] was not added to the subscription list.'] = 'ユーザー %s [%s] は、購読リストに追加されませんでした。';
+$lang['User %s [%s] added.'] = 'ユーザー %s [%s] が追加されました。';
+$lang['Warning: subscribing or unsubscribing will send mails to users'] = '注意: 購読登録または購読解除の設定は、ユーザー宛にメール通知されます。';
+$lang['Send mail on HTML format'] = 'HTML形式でメールを送信する';
 $lang['Include display of recent photos grouped by dates'] = '最近の写真グループの日付ごとの表示を含む';
 $lang['Available only with HTML format'] = 'HTMLフォーマットのみ利用可';
-$lang['no write access'] = 'アクセス権なし';
+$lang['no write access'] = '書き込み権限なし';
 $lang['Permissions'] = 'パーミッション';
 $lang['private'] = 'プライベート';
 $lang['public'] = 'パブリック';
@@ -320,7 +320,7 @@ $lang['Album list management'] = 'アルバム管理';
 $lang['Piwigo configuration'] = 'Piwigo設定';
 $lang['Edit album'] = 'アルバムを編集する';
 $lang['Group management'] = 'グループ管理';
-$lang['User list'] = 'ユーザリスト';
+$lang['User list'] = 'ユーザーリスト';
 $lang['Database synchronization with files'] = 'ファイルおよびデータベースの同期化';
 $lang['all'] = 'すべて';
 $lang['height must be a number superior to'] = '高さは、次の値より大きくしてください:';
@@ -361,7 +361,7 @@ $lang['Metadata synchronization results'] = 'メタデータ同期結果';
 $lang['only perform a simulation (no change in database will be made)'] = 'シミュレーションのみ実行する (データベースは更新されません)';
 $lang['Simulation'] = 'シミュレーション';
 $lang['directories + files'] = 'ディレクトリ + ファイル';
-$lang['only directories'] = 'ディレクトリのみ';
+$lang['only directories'] = 'ディレクトリーのみ';
 $lang['synchronize files structure with database'] = 'ファイル構造とデータベースを同期化する';
 $lang['synchronize files metadata with database photos informations'] = 'ファイルメタデータとデータベースエレメント情報を同期化する';
 $lang['even already synchronized photos'] = 'すでに同期化されているエレメントも同期化する';
@@ -370,7 +370,7 @@ $lang['The name of directories and files must be composed of letters, numbers, "
 $lang['wrong filename'] = 'ファイル名が正しくありません。';
 $lang['Upload'] = 'アップロード';
 $lang['user "%s" added'] = 'ユーザ "%s" が追加されました。';
-$lang['User status'] = 'ユーザステータス';
+$lang['User status'] = 'ユーザーステータス';
 $lang['user_status_admin'] = '管理者';
 $lang['user_status_generic'] = '一般';
 $lang['user_status_guest'] = 'ゲスト';
@@ -384,7 +384,7 @@ $lang['Advanced features'] = '高度な機能';
 $lang['Overall'] = '全体';
 $lang['Year'] = '年';
 $lang['Month'] = '月';
-$lang['Day'] = '日';
+$lang['Day'] = '曜日';
 $lang['Pages seen'] = 'ページ閲覧回数';
 $lang['Time'] = '時間';
 $lang['IP'] = 'IP';
@@ -438,7 +438,7 @@ $lang['Main "guest" user status is incorrect'] = 'メイン「ゲスト」ユー
 $lang['Default user does not exist'] = 'デフォルトユーザーが設定されていません。';
 $lang['Main "webmaster" user does not exist'] = 'メイン「ウェブマスタ」ユーザーは存在しません。';
 $lang['Main "webmaster" user status is incorrect'] = 'メイン「ウェブマスタ」ユーザーステータスが正しくありません。';
-$lang['User "%s" created with "%s" like password'] = 'ユーザ「 %s 」がパスワード「 %s 」で作成されました。';
+$lang['User "%s" created with "%s" like password'] = 'ユーザー「 %s 」がパスワード「 %s 」で作成されました。';
 $lang['Status of user "%s" updated'] = 'ユーザ "%s" のステータスが更新されました。';
 $lang['add new photos to caddie'] = 'キャディに新しいエレメントを追加する';
 $lang['No display'] = '表示なし';
@@ -475,7 +475,7 @@ $lang['Can\'t create temporary file.'] = '一時ファイルを作成できま
 $lang['Can\'t download archive.'] = 'アーカイブをダウンロードできません。';
 $lang['Can\'t read or extract archive.'] = 'アーカイブを読めないか、展開できません。';
 $lang['An error occured during extraction (%s).'] = '展開中にエラーが発生しました (%s)。';
-$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = '「プラグイン」フォルダおよびサブフォルダのパーミッションをチェック (CHMOD) してください。';
+$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = '「プラグイン」フォルダおよびサブフォルダのパーミッションをチェックしてください(CHMOD)。';
 $lang['Can\'t connect to server.'] = 'サーバに接続できません。';
 $lang['Purge compiled templates'] = 'コンパイル済みテンプレートを削除する';
 $lang['ACCESS_0'] = 'フリーアクセス';
@@ -529,7 +529,7 @@ $lang['Number of downloads'] = 'ダウンロードの件数';
 $lang['Piwigo Announcements Newsletter'] = 'Piwigo のニューズレター';
 $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Piwigoプロジェットのニュースレターでは、Piwigoの新しいリリース情報やセキュリティ・バグ修正、アップグレードなどについてのお知らせいたします。Piwigoのニュースレターに加入して下さい。';
 $lang['Subscribe %s'] = '加入 %s';
-$lang['Subscribe %s to Piwigo Announcements Newsletter'] = ' %s Piwigoのニューズレターを加入する';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = ' %s Piwigoのニューズレターを購読する';
 $lang['Purge search history'] = 'パージ検索履歴';
 $lang['Hide'] = '隠す';
 $lang['Password is missing. Please enter the password.'] = 'パスワードがありません。パスワードを入力して下さい。';
@@ -547,12 +547,12 @@ $lang['Instructions to use Piwigo'] = 'Piwigoの使い方';
 $lang['Installed Themes'] = 'インストールされたテーマ';
 $lang['Add New Theme'] = '新しいテーマを追加する';
 $lang['Forbid this theme to users'] = 'このテーマをユーザーに禁止する';
-$lang['Set as default theme for unregistered and new users'] = '新しいユーザーや登録されてないユーザーにデフォルト・テーマを設定する';
+$lang['Set as default theme for unregistered and new users'] = '新しいユーザーや登録されてないユーザーにデフォルトのテーマを設定する';
 $lang['unknown'] = '不明';
 $lang['Upload Photos'] = '写真をアップロードする';
 $lang['Drop into album'] = 'アルバムに入れる';
 $lang['+ Add an upload box'] = '+ アップロード・ボックスを追加する';
-$lang['Create the "%s" directory at the root of your Piwigo installation'] = ' Piwigoにインストールされている場所の"%s" というディレクトリーに作成してください。';
+$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Piwigoのインストールされている場所の"%s" というディレクトリーに作成してください。';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Piwigoにインストールされている場所の "%s" というディレクトリーに書き込み(chmod 777)アクセスをする。';
 $lang['existing album'] = '存在しているアルバム';
 $lang['create a new album'] = '新しいアルバムを作成する';
@@ -616,10 +616,10 @@ $lang['Select:'] = '選択:';
 $lang['None'] = 'なし';
 $lang['Invert'] = '反転';
 $lang['Impossible to deactivate this theme, you need at least one theme.'] = 'このテーマは無効になりません。少なくとも一つのテーマが必要です。';
-$lang['Webmaster status is required.'] = 'ウェッブマスターのステータスが必要';
-$lang['Bound Theme'] = 'バウンドテーマ';
+$lang['Webmaster status is required.'] = 'ウェブマスターのステータスが必要';
+$lang['Bound Theme'] = 'テーマを割り当てる';
 $lang['Allow rating'] = 'レーティングを許可する';
-$lang['Select at least one comment'] = '少なくとも一つのコメントを選択して下さい';
+$lang['Select at least one comment'] = '少なくとも1つのコメントを選択して下さい';
 $lang['Active Plugins'] = '有効なプラグイン';
 $lang['Inactive Plugins'] = '無効なプラグイン';
 $lang['Missing Plugins'] = '見つからないプラグイン';
@@ -659,7 +659,7 @@ $lang['Choose an action'] = 'アクションを選択して下さい';
 $lang['Activate icon "new" next to albums and pictures'] = 'アルバムと写真のとなりに、\'起動アイコン　"新" があります';
 $lang['Deactivate all'] = '全て非活性する';
 $lang['Default photos order'] = 'デフォルト写真順番';
-$lang['Delete orphan tags'] = '使われていないタグを削除する';
+$lang['Delete orphan tags'] = '使われていないタグを削除します';
 $lang['delete photo'] = '写真を削除する';
 $lang['Duplicates'] = '重複';
 $lang['Error on file "%s" : %s'] = '"%s"　のファイル・エラー : %s';
@@ -679,7 +679,7 @@ $lang['Include history data (Warning: server memory limit may be exceeded)'] = '
 $lang['Unable to dump database.'] = 'ダンプデータベースができません。';
 $lang['Update in progress... Please wait.'] = 'アップグレード処理中 ... お待ちください。';
 $lang['Update to Piwigo %s'] = 'Piwigo %s にアップグレード';
-$lang['Two updates are available'] = '２個のアップグレードがあります';
+$lang['Two updates are available'] = '2個のアップグレードがあります';
 $lang['This is a minor update, with only bug corrections.'] = 'これはマイナーアップグレードだけバグ修正しています。';
 $lang['This is a major update, with <a href="%s">new exciting features</a>.'] = 'これはメジャーアップグレードで、 いろいろな楽しい<a href="%s">新機能がついています。</a>.';
 $lang['Some themes and plugins may be not available yet.'] = 'あるテーマとプラグインはまだできていません。';
@@ -718,7 +718,7 @@ $lang['Permission management'] = '権限管理';
 $lang['Remove all filters'] = '全てのフィルターを削除';
 $lang['Remove from caddie'] = 'キャディーから削除';
 $lang['Restore'] = '復元';
-$lang['Set author'] = '作者をセット';
+$lang['Set author'] = '作者を設定';
 $lang['Some upgrades are available for extensions.'] = '拡張機能のアップグレードがあります。';
 $lang['Type here the author name'] = '作者名を入力してください。';
 $lang['Update All'] = '全てをアップデート';
@@ -762,8 +762,8 @@ $lang['top left corner'] = '左上';
 $lang['top right corner'] = '右上';
 $lang['%s photos can not be regenerated'] = '%s 更新できなかった写真。';
 $lang['%s photos have been regenerated'] = '%s 更新できた写真。';
-$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'おおよその最大レゾリューション：%dM ピクセル (%dx%d ピクセルである).';
-$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'デフォルトで、PiwigoがHD（高品位）版の写真より、最新ウェブサイズ版を作成します。';
+$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'おおよその最大解像度：%dM ピクセル (%dx%d ピクセルである).';
+$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'デフォルトで、PiwigoはHD(高品質)版の写真から新しくウェブサイズ版を生成します。';
 $lang['Do you want to activate anyway?'] = 'とにかく有効化したいですか？';
 $lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'エラー：このプラグインがありませんが、インストールされています！すぐアンインストールして下さい。';
 $lang['Follow Orientation'] = '配向進み';
@@ -809,15 +809,15 @@ $lang['Multiple Size'] = '複数のサイズ';
 $lang['Piwigo Publish plugin for Lightroom'] = 'Lightroom 用 Piwigo エクスポートプラグイン';
 $lang['Piwigo export plugin for Aperture'] = 'Aperture 用 Piwigo エクスポートプラグイン';
 $lang['Piwigo export plugin for iPhoto'] = 'iPhoto 用 Piwigo エクスポートプラグイン';
-$lang['Piwigo for Android'] = 'Piwigo for Android';
-$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'Piwigo for iOS (iPhone, iPad, iPod Touch)';
+$lang['Piwigo for Android'] = 'Android用Piwigo';
+$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'iOS用Piwigo(iPhone, iPad, iPod Touch)';
 $lang['Piwigo publish plugin for Shotwell'] = 'Shotwell 用 Piwigo 公開プラグイン';
 $lang['Piwigo publish plugin for digiKam'] = 'digiKam 用 Piwigo 公開プラグイン';
 $lang['Predefined filter'] = '定義済みフィルター';
 $lang['Select groups...'] = 'グループを選択...';
 $lang['Select users...'] = 'ユーザーを選択...';
-$lang['Set creation date'] = 'コレクション日を設定';
-$lang['Sharpen'] = 'シャープ';
+$lang['Set creation date'] = '作成日を設定';
+$lang['Sharpen'] = 'シャープにする';
 $lang['The whole page'] = 'ページ全体';
 $lang['The whole set'] = 'セット全体';
 $lang['This album contains no photo.'] = 'このアルバムには写真がありません。';
@@ -834,13 +834,13 @@ $lang['Generate multiple size images'] = '複数サイズのイメージを作
 $lang['Original file : %s'] = 'オリジナルファイル : %s';
 $lang['Added by %s'] = '%sで追加されました。';
 $lang['Automatic sort order'] = '自動並び替え';
-$lang['By default, the center of interest is placed in the middle of the photo.'] = '写真の真ん中は中心デフォルト';
+$lang['By default, the center of interest is placed in the middle of the photo.'] = 'デフォルトで、関心の中心は写真の中央に合わせます';
 $lang['Center of interest'] = '中心';
 $lang['No destination tag selected'] = '行き先タグ選択されていません';
 $lang['No group is permitted to see this private album'] = 'このプライベートなアルバムを見ることのできるグループはありません';
 $lang['No photo in the current set.'] = '現在のセットには写真がありません。';
 $lang['No photo selected, %d photos in current set'] = '写真が選択されません。現在のセットに%d枚写真があります。';
-$lang['Orphan tags deleted'] = 'オーファンタグ削除されました。';
+$lang['Orphan tags deleted'] = '使われていないタグが削除されました';
 $lang['Photos generation in progress...'] = '写真作成中・・・';
 $lang['Posted %s on %s'] = '%sの%s展示されました。';
 $lang['Save manual order'] = 'マニュアル順保存します。';
@@ -850,12 +850,12 @@ $lang['The uploaded file was only partially uploaded'] = 'アップロードさ
 $lang['There is no group in this gallery.'] = 'このガラリにグループがありません。';
 $lang['Type in a search term'] = '検索アイテムを入力してください。';
 $lang['Visited %d times'] = '%d回見られました。';
-$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = '注意！このプラグインがこのPIWIGOのバージョンに合っていません。';
+$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = '注意！このプラグインはPiwigoのバージョンに合っていません。';
 $lang['Who can see this photo?'] = 'どなたがこの写真を見られますか？';
 $lang['With no album'] = 'アルバムなしを含まれます。';
 $lang['With no tag'] = 'タグなしを含まれます。';
 $lang['With no virtual album'] = 'バーチャル・アルバムが含まれません。';
-$lang['You can activate only one mobile theme.'] = 'モバイル・テーマ一つしか有効できません。';
+$lang['You can activate only one mobile theme.'] = 'モバイル・テーマは1つしか有効化できません。';
 $lang['cancel manual order'] = 'マニュアル順を中止します。';
 $lang['registered users'] = '登録されているユーザー';
 $lang['simple visitors'] = '単ユーザー';
@@ -882,7 +882,7 @@ $lang['Duplicate'] = '重複';
 $lang['Duplicate selected tags'] = '選択したタグを複製します';
 $lang['Apply watermark if height is bigger than'] = 'これ以上の高さの際にウォーターマークを付ける';
 $lang['Apply watermark if width is bigger than'] = 'これ以上の幅の際にウォーターマークを付ける';
-$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroomは、大量のデジタル画像の管理と、撮影後の仕事のために設計されて写真用ソフトウェアです。';
+$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroomは、大量のデジタル画像の管理と、撮影後の仕事のために設計された写真用ソフトウェアです。';
 $lang['Permission granted for groups'] = 'グループ権限';
 $lang['Panorama'] = 'パノラマ';
 $lang['Number of albums per page'] = '１ページ当りのアルバム数';
@@ -900,7 +900,7 @@ $lang['Loading...'] = 'ロード中 ...';
 $lang['Change password'] = 'パスワードを変える';
 $lang['Change username'] = 'ユーザー名を変える';
 $lang['Tag "%s" is now a duplicate of "%s"'] = 'タグ "%s"は、現在 "%s"と重複しています';
-$lang['Allow users to add a link to their website'] = 'ユーザは自分のウェブサイトへのリンクを追加できるようにする';
+$lang['Allow users to add a link to their website'] = 'ユーザーは自分のウェブサイトへのリンクを追加できるようにする';
 $lang['All %d users are selected'] = '全ての %d ユーザが選択されました';
 $lang['<em>Piwigo for iOS</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = '<em>Piwigo for iOS</em>アプリは、iPhone、iPad、iPod Touchから、Piwigoギャラリーに接続し、アルバムを作成したり、複数の写真を一括でアップロードしたりできます。';
 $lang['Activate it now'] = '今すぐ有効にする';
@@ -917,13 +917,13 @@ $lang['date & time'] = '日付と時刻';
 $lang['No matching user found'] = '一致するユーザはみつかりませんでした';
 $lang['ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform.'] = 'ReGalAndroid (RemoteGallery client for Android)は、Android 携帯/タブレット向けのオープンソース(GPL v3)クライアントソフトです';
 $lang['Rename'] = 'リネーム';
-$lang['Select at least one tag'] = '最低１つのタグを選択してください';
+$lang['Select at least one tag'] = '最低1つのタグを選択してください';
 $lang['width & height'] = '幅と高さ';
 $lang['close'] = '閉じる';
-$lang['User %s added'] = 'ユーザ %s を追加しました';
-$lang['User %s updated'] = 'ユーザ %s を更新しました';
-$lang['Users modified'] = 'ユーザの変更';
-$lang['Update user'] = 'ユーザの更新';
+$lang['User %s added'] = 'ユーザー %s を追加しました';
+$lang['User %s updated'] = 'ユーザー %s を更新しました';
+$lang['Users modified'] = 'ユーザーの変更';
+$lang['Update user'] = 'ユーザーの更新';
 $lang['Upload in progress'] = 'アップロード状況';
 $lang['Refresh photo set'] = 'フォトセットをリフレッシュ';
 $lang['Password updated'] = 'パスワードを更新しました';
@@ -933,4 +933,63 @@ $lang['Mail address is mandatory for registration'] = '登録のために、メ
 $lang['Empty caddie'] = '空のキャディ';
 $lang['%u users have automatic permission because they belong to a granted group.'] = '%u ユーザは、承認されたグループに所属していますので、自動的にパーミッションが付与されます';
 $lang['visitors need to login and have the appropriate permissions to see this album'] = 'このアルバムを見るために、ログインをして、パーミッションを得る必要があります。';
-$lang['View in gallery'] = 'ギャラリーで見る';
\ No newline at end of file
+$lang['View in gallery'] = 'ギャラリーで見る';
+$lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = 'タグ　<em>%s</em>は、<em>%s</em>にマージされました';
+$lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = 'digiKamは、写真を見たり、管理、編集したり、シェアしたりしたい人向けのソフトです。';
+$lang['digiKam is an advanced digital photo management free software for Linux, Windows, and MacOSX.'] = 'digiKam は、洗練された写真管理ソフト（フリーソフト）です。Linux, Windows, Mac OS Xで動作します。';
+$lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwellは、Linux上で動作するオープンソースな写真管理ソフトです。UbuntuやFedoraではデフォルトになっています。';
+$lang['Select at least two tags for merging'] = 'マージするタグを2つ以上選択して下さい';
+$lang['Select a zone with your mouse to define a new center of interest.'] = 'マウスを使って、必要な領域を選択して下さい';
+$lang['include photos with lower privacy level'] = 'プライバシーレベルの低い写真が、含まれています';
+$lang['The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'] = 'アップロードされたファイルは、php.iniに定められたupload_max_sizeを超過しています: %sB';
+$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'アップロードされたファイルは、HTMLフォームで指定されたMAX_FILE_SIZEディレクティブを超過しています';
+$lang['The settings for the guest are from the %s user'] = 'ゲストの設定は、%sユーザーから設定されています';
+$lang['The picture dimensions will be reduced to %dx%d pixels.'] = '写真は、%dx%dピクセルに縮小されます';
+$lang['The original maximum width must be a number between %d and %d'] = '元の最大の幅は、%dから%dの間の数で指定しなくてはいけません';
+$lang['The original maximum height must be a number between %d and %d'] = '元の最大の高さは、%dから%dの間の数で指定しなくてはいけません';
+$lang['The original image quality must be a number between %d and %d'] = '元の写真の品質は、%dから%dの間の数で指定しなくてはいけません';
+$lang['on the %d selected users'] = '%d人の選択されたユーザー';
+$lang['on the %d selected photos'] = '%d枚の選択された写真';
+$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhotoはMac OS Xのデフォルトの写真管理ソフトウェアです。Piwigoエクスポートプラグインにより、新しいアルバムを作成し、iPhotoからPiwigoギャラリーに直接エクスポートすることができます';
+$lang['between %s and %s MB'] = '%sから%s MBの間で';
+$lang['based on'] = '元';
+$lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'ローカルの設定ファイルで<i>$conf[\'order_by\']</i>が指定されています。このパラメーターは古く推奨されません。削除するか、<i>$conf[\'order_by_custom\']</i>に置き換えてください!';
+$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'ローカルの設定により、デフォルトの写真の順序を設定できません';
+$lang['Y Repeat'] = 'Y リピート';
+$lang['Type here the name of the new group'] = '新しいグループ名を入力してください';
+$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'digikamkからPiwigoに写真をアップロードするには、digikamとKipiプラグインをインストールしてください';
+$lang['This group will be unset to default'] = 'このグループはデフォルトでは使われなくなります';
+$lang['This group will be set to default'] = 'デフォルトでこのグループが使われます';
+$lang['This album contains %d photos, added on %s.'] = 'このアルバムは%d個の写真を含んでいます。%sに追加しました';
+$lang['This album contains %d photos, added between %s and %s.'] = 'このアルバムは%d個の写真を含んでいます。%sと%sの間に追加しました';
+$lang['The uploaded files exceed the post_max_size directive in php.ini: %sB'] = 'アップロードされたファイルは、php.iniに定められたpost_max_sizeを超過しています: %sB';
+$lang['The center of interest is the most meaningful zone in the photo.'] = '関心の中心は、写真で最も重要な意味を持つ領域です';
+$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'LightroomのPiwigo公開プラグインにより、Piwigoのギャラリーを直接エクスポートし同期させることができます';
+$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'Piwigoエクスポートプラグインにより、アルバムを作成しエクスポートすることができます';
+$lang['Source tag'] = 'ソースタグ';
+$lang['Showing %s to %s of %s users'] = '%sから%sのユーザーを表示する(全%sユーザー)';
+$lang['Show %s users'] = '%sのユーザーを表示する';
+$lang['Save visits in history for'] = '訪問の履歴を保存する';
+$lang['Restore default configuration. You will lose your plugin settings!'] = 'デフォルトの設定を復元します。プラグインに関する設定は失われます';
+$lang['Resize after upload disabled due to the use of GD as graphic library'] = 'GDを画像ライブラリーとして使用しているためアップロードして拡大縮小する機能は無効化されています';
+$lang['Reset ignored updates'] = '無視したアップデートをリセットする';
+$lang['Registered on %s, %s.'] = '登録日: %s, %s';
+$lang['Rated %d times, score : %.2f'] = '%d回評価され、評価は%.2fです';
+$lang['Recipients'] = '受信者';
+$lang['No recipient selected'] = '受信者が選ばれていません';
+$lang['No user is permitted to see this private album'] = 'このプライベートアルバムを見ることのできるユーザーはいません';
+$lang['No user selected of %d users'] = '%dのユーザーのからユーザーが選ばれていません';
+$lang['No user selected, no action possible.'] = 'ユーザーが選択されていないので、操作できません';
+$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'Linuxでは、Shotwellをパッケージ管理ソフトウェアからインストールすることで、Piwigoに公開するオプションを使うことができます';
+$lang['No and unlock sub-albums'] = 'いいえ。サブアルバムのロックを解除します';
+$lang['Last visit on %s, %s.'] = '最新の訪問日: %s, %s';
+$lang['Impossible to deactivate the default theme.'] = 'デフォルトのテーマを無効化することはできません';
+$lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'HD版がない、または、現在のウェブサイズ版がサイズ変更後より大きい場合、Piwigoは、それをHD版とし、それから縮小したウェブサイズ版を作成します';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'セキュリティー上の理由により、管理者は認証キーを使うことはできません';
+$lang['Edit user'] = 'ユーザーを編集する';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '電子メールは自動認証キーのリンクがあります。%sに対して有効です';
+$lang['Delete %d orphan photos'] = '%dの迷子の写真を削除します';
+$lang['Orphans'] = '迷子';
+$lang['You have %d orphan tags: %s.'] = '%d個の使われていないタグがあります: %s';
+$lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Apartureは、iPhotoのシンプルさを持ったプロの写真家用に設計されたソフトウェアです。';
+$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Apartureは、Mac上で写真を調整し、大規模なライブラリーを管理するための強力なツールです。';
\ No newline at end of file
diff --git a/sources/language/ja_JP/common.lang.php b/sources/language/ja_JP/common.lang.php
index b651594..9eec0d8 100644
--- a/sources/language/ja_JP/common.lang.php
+++ b/sources/language/ja_JP/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: 日本語 [JP]
-Version: 2.7.2
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=425
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -54,7 +54,7 @@ $lang['About'] = 'About';
 $lang['All tags'] = 'すべてのタグ';
 $lang['Any tag'] = 'すべてのtag';
 $lang['At least one listed rule must be satisfied.'] = '少なくともリスト記載ルール1つを満たす必要があります。';
-$lang['Author'] = '撮影者';
+$lang['Author'] = '作成者';
 $lang['Albums'] = 'アルバム';
 $lang['Album'] = 'アルバム';
 $lang['Close this window'] = 'このウィンドウを閉じる';
@@ -424,4 +424,5 @@ $lang['Apply on properties'] = 'プロパティの適用';
 $lang['Link: %s'] = 'リンク: %s';
 $lang['No results for'] = 'みつかりませんでした。';
 $lang['Photo description'] = '写真の説明';
-$lang['Photo title'] = '写真のタイトル';
\ No newline at end of file
+$lang['Photo title'] = '写真のタイトル';
+$lang['Your authentication key is no longer valid.'] = 'あなたの認証キーは既に有効ではありません。';
\ No newline at end of file
diff --git a/sources/language/ja_JP/help/photos_add_ftp.html b/sources/language/ja_JP/help/photos_add_ftp.html
index 23956ed..21336b4 100644
--- a/sources/language/ja_JP/help/photos_add_ftp.html
+++ b/sources/language/ja_JP/help/photos_add_ftp.html
@@ -26,38 +26,35 @@
 
     <p>ギャラリーディレクトリは、Piwigoディレクトリ「galleries」にあります。以下、非常に小さな (しかし、多くの特長を持つ) ギャラリーのディレクトリツリーの例です:</p>
 
-    <pre>.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- album-1
-|   |   |-- album-1.1
-|   |   |   |-- album-1.1.1
-|   |   |   |   |-- album-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- album-1.1.1.2
-|   |   |   +-- album-1.1.2
-|   |   |-- album-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- album-1.3
-|   +-- album-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+
+    <pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
 
@@ -73,6 +70,8 @@
   <li>デフォルトでは、写真エレメント (ビデオ、サウンド、テキスト等) に関して、ファイル名の拡張子に関連付けられるアイコンはありません。
   任意で、あなたはサムネイルおよび見本ファイルを関連付けることができます (上記例のvideo.aviをご覧ください)。</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>警告</em>: ディレクトリおよびファイル名には、文字、「-」「_」「.」の記号のみ含んでください。空白、アクセント符号は含まないでください。</li>
 
   <li>ファイル、サムネイルおよび見本が正しくディレクトリに配置された場合、「<span class="pwgScreen">管理 > アルバム > 同期化</span>」に移動してください。</li>
diff --git a/sources/language/ja_JP/index.php b/sources/language/ja_JP/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/ja_JP/index.php
+++ b/sources/language/ja_JP/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ja_JP/install.lang.php b/sources/language/ja_JP/install.lang.php
index 8ae1d0e..6754f1c 100644
--- a/sources/language/ja_JP/install.lang.php
+++ b/sources/language/ja_JP/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ja_JP/upgrade.lang.php b/sources/language/ja_JP/upgrade.lang.php
index 63b8984..53eb826 100644
--- a/sources/language/ja_JP/upgrade.lang.php
+++ b/sources/language/ja_JP/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -35,10 +35,9 @@ $lang['Upgrade informations'] = '更新情報';
 $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = '問題がある場合、[管理 > ツール > メンテナンス] でメンテナンスチェックを実行してください。';
 $lang['Only administrator can run upgrade: please sign in below.'] = '管理者のみアップグレードを実行できます: 以下でログインしてください。';
 $lang['You do not have access rights to run upgrade'] = 'あなたには、アップグレードを実行する権限がありません。';
-$lang['All sub-albums of private albums become private'] = 'プライベートカテゴリのすべてのサブカテゴリがプライベートにされました。';
+$lang['All sub-albums of private albums become private'] = 'プライベートアルバムに含まれるすべてのサブアルバムがプライベートにされました。';
 $lang['User permissions and group permissions have been erased'] = 'ユーザパーミッションおよびグループパーミッションが削除されました。';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = '以前の設定より、サムネイル接頭辞およびウェブマスターのメールアドレスのみ保存されました。';
 $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = '予防措置として、次のプラグインは無効になりました。プラグインを有効にする前に、プラグインのアップグレードを確認してください。:';
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = '<i>%s</i>に、 <b>?></b>の前に入力:';
-$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = '予防措置として、次のテーマが無効になりました。テーマを有効にする前に、アップグレードを確認してください。：';
-?>
\ No newline at end of file
+$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = '予防措置として、次のテーマが無効になりました。テーマを有効にする前に、アップグレードを確認してください。：';
\ No newline at end of file
diff --git a/sources/language/ka_GE/admin.lang.php b/sources/language/ka_GE/admin.lang.php
index 1a6b313..bb17168 100644
--- a/sources/language/ka_GE/admin.lang.php
+++ b/sources/language/ka_GE/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ka_GE/common.lang.php b/sources/language/ka_GE/common.lang.php
index fb975f1..bd17cee 100644
--- a/sources/language/ka_GE/common.lang.php
+++ b/sources/language/ka_GE/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: ქართული [GE]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=426
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/ka_GE/help/photos_add_ftp.html b/sources/language/ka_GE/help/photos_add_ftp.html
index b05abce..c5faf4f 100644
--- a/sources/language/ka_GE/help/photos_add_ftp.html
+++ b/sources/language/ka_GE/help/photos_add_ftp.html
@@ -33,39 +33,35 @@
     <p>კატეგორიის ფოლდერები განლაგებულია ფოლდერ "galleries" -ში.
     ქვევით ნახეთ პატარა გალერეის წყობა:</p>
 
+
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
 
@@ -80,6 +76,8 @@
 
   <li>ელემენტები, რომლებიც არ არიან ფოტოები (ვიდეო, მუსიკა, ტექსტი და ა.შ.) წარმოდგენილი არიან ამ ფაილის შესაბამისი მინიატურებით. დამატებით, თქვენ შეგიძლიათ დაუკავშიროთ მინიატურა და წარმომადგენლობითი ფაილი (ნახე video.avi მაგალითში მაღლა).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>ყურადღება</em>: ფოლდერების და ფაილების სახელი უნდა შედგებოდეს ასოების, რიცხვების, "-", "_" ან "." -საგან. ნუ გამოიყენებთ დაშორებებს.</li>
 
   <li><em>ცნობისათვის</em>: კატეგორია შეიძლება შეიცავდეს ელემენტებს და ქვეკატეგორიებს ერთდოულად. მიუხედავად ამისა, რეკომენდირებულია ყოველი კატეგორიისათვის აირჩიოთ, შეიცავს იგი ელემენტებს თუ კატეგორიებს.</li>
diff --git a/sources/language/ka_GE/index.php b/sources/language/ka_GE/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/ka_GE/index.php
+++ b/sources/language/ka_GE/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ka_GE/install.lang.php b/sources/language/ka_GE/install.lang.php
index 6d956ee..b139399 100644
--- a/sources/language/ka_GE/install.lang.php
+++ b/sources/language/ka_GE/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'გაიმეორეთ პაროლი';
 $lang['verification'] = 'კიდევ ერთხელ,შეცდომის გამოსარიცხად';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'გჭირდებათ დახმარება?დასვით შეკითხვები <a href="%s">Piwigo–ს ფორუმზე</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'გამოყენებული იქნება მომხმარებლების მიერ ადმინისტრატორთან კავშირისათვის';
-$lang['PHP 5 is required'] = 'საჭიროა PHP 5';
+$lang['PHP 5 is required'] = 'საჭიროა PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = 'სავარაუდოდ თქვენი ხოსტინგი ამჟამად იყენებს PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo–ს შეუძლია შეეცადოს გადართოს თქვენი კონფიგურაცია PHP 5, .htaccess ფაილს შექმნით ან შეცვლით.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo–ს შეუძლია შეეცადოს გადართოს თქვენი კონფიგურაცია PHP 5.2, .htaccess ფაილს შექმნით ან შეცვლით.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'აღნიშნეთ,რომ თქვენ შეგიძლიათ თქვენით შეცვალოთ კონფიგურაცია და ამის შემდეგ ახლიდან გაუშვით Piwigo.';
-$lang['Try to configure PHP 5'] = 'შვეცადოთ PHP 5 გადაკონფიგურირება';
+$lang['Try to configure PHP 5'] = 'შვეცადოთ PHP 5.2 გადაკონფიგურირება';
 $lang['Sorry!'] = 'ბოდიში!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo–ს არ შეუძლია PHP 5 გადაკონფიგურირება.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'თქვენ უნდა მიმართოთ პროვაიდერს დახმარებისა და განმარტებისათვის ტუ როგორ მოახერხოთ PHP 5 ზე გადართვა.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo–ს არ შეუძლია PHP 5.2 გადაკონფიგურირება.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'თქვენ უნდა მიმართოთ პროვაიდერს დახმარებისა და განმარტებისათვის ტუ როგორ მოახერხოთ PHP 5.2 ზე გადართვა.';
 $lang['Hope to see you back soon.'] = 'იმედი გავქვს მალე შემოგვიერთდებით.';
 $lang['Congratulations, Piwigo installation is completed'] = 'გილოცავთ,Piwigo–ს დაყენება დამთავრებულია';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'ალტერნატიული გადაწყვეტილება მდგომარეობს შემდეგში,შეგიძლიათ დააკოპიროთ ტექსტი მაღლა ბლოკიდან და ჩასვათ ამ ფაილში "local/config/database.inc.php"   (გაფრთხილება: database.inc.php უნდა შეიცავდეს მხოლოდ იმას რაც წერია textarea–ში, თავისუფალი ადგილების და დაბრუნების ხაზების გარეშე)';
@@ -63,5 +63,4 @@ $lang['You can download the config file and upload it to local/config directory
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'ნუ მოგერიდებათ დახმარებისა და კონსულტაციისათვის მოგვმართოთ ჩვენს ფორუმზე: %s';
 $lang['Just another Piwigo gallery'] = 'Piwigo -ს კიდევ ერთი გალერეა';
 $lang['Welcome to my photo gallery'] = 'კეთილი იყოს ჩემს ფოტო გალერეაში თქვენი მობრძანება';
-$lang['Welcome to your new installation of Piwigo!'] = 'კეთილი იყოს თქვენს მიერ Piwigo -ს დაყენება!';
-?>
\ No newline at end of file
+$lang['Welcome to your new installation of Piwigo!'] = 'კეთილი იყოს თქვენს მიერ Piwigo -ს დაყენება!';
\ No newline at end of file
diff --git a/sources/language/ka_GE/upgrade.lang.php b/sources/language/ka_GE/upgrade.lang.php
index 41aab4c..da4eca2 100644
--- a/sources/language/ka_GE/upgrade.lang.php
+++ b/sources/language/ka_GE/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/km_KH/admin.lang.php b/sources/language/km_KH/admin.lang.php
index d930cc3..3c56981 100644
--- a/sources/language/km_KH/admin.lang.php
+++ b/sources/language/km_KH/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -242,4 +242,19 @@ $lang['Batch Manager'] = 'កម្មវិធីគ្រប់គ្រងជ
 $lang['Basic settings'] = 'ការកំណត់មូលដ្ឋាន';
 $lang['Average rate'] = 'អត្រាជាមធ្យម';
 $lang['Available versions for'] = 'ជំនាន់ដែល​មាន​សម្រាប់';
-$lang['Available only with HTML format'] = 'មាន​តែ​នៅលើ​ទម្រង់ HTML ទេ';
\ No newline at end of file
+$lang['Available only with HTML format'] = 'មាន​តែ​នៅលើ​ទម្រង់ HTML ទេ';
+$lang['Check all'] = 'ធីកទាំងអស់';
+$lang['Change username'] = 'ផ្តាស់ប្តូរឈ្មោះប្រើប្រាស់';
+$lang['Change password'] = 'ផ្តាស់ប្តូរ​ពាក្យ​សម្ងាត់';
+$lang['Change Admin Colors'] = 'ផ្លាស់ប្តូរ​ពណ៌​អ្នក​គ្រប់​គ្រង';
+$lang['Center of interest'] = 'ចំណុច​កណ្តាល​នៃ​ចំណាប់​អារម្មណ៍​';
+$lang['Cannot delete the old permalink !'] = 'Permalink ចាស់​មិន​អាច​លុប​បាន!';
+$lang['Can\'t read or extract archive.'] = 'បណ្ណសារមិនអាច​អាន​បាន ឬស្រង់​ចេញ​បាន';
+$lang['Can\'t download archive.'] = 'បណ្ណសារមិនអាច​ទាញ​យក​បាន';
+$lang['Can\'t create temporary file.'] = 'ឯកសារបណ្តោះអាសន្នដែលមិនអាចត្រូវបានបង្កើតឡើង';
+$lang['Can\'t connect to server.'] = 'ការ​ភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​មេមិន​អាច​ប្រើ​បាន';
+$lang['Caddie management'] = 'ការ​គ្រប់​គ្រង Caddie';
+$lang['By default, the center of interest is placed in the middle of the photo.'] = 'តាម​ការ​កំណត់​ជា​ស្រេច ចំណុច​កណ្តាល​នៃ​ចំណាប់​អារម្មណ៍​នឹង​ត្រូវ​បាន​ដាក់​នៅ​ចំណុច​កណ្តាល​នៃ​រូប​ថត';
+$lang['Caddie'] = 'Caddie';
+$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'តាមការកំណត់ជាស្រេច Piwigo និងបង្កើត​វិបសាយ​ថ្មី​មួយ​ពី HD (high definition) version នៃរូបថត​របស់​អ្នក';
+$lang['Allow users to add a link to their website'] = 'អនុញ្ញាតឲ្យអ្នកប្រើប្រាស់​បន្ថែម​តំណភ្ជាប់​ទៅកាន់​វិបសាយ​របស់​គេ';
\ No newline at end of file
diff --git a/sources/language/km_KH/common.lang.php b/sources/language/km_KH/common.lang.php
index 8daf067..bcba215 100644
--- a/sources/language/km_KH/common.lang.php
+++ b/sources/language/km_KH/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: ខ្មែរ [KH]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=579
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -424,4 +424,5 @@ $lang['No results for'] = 'មិនមានលទ្ធផលសំរាប
 $lang['Photo description'] = 'ពិពណ៌នារូបថត';
 $lang['Photo title'] = 'ឈ្មោះរូបថត';
 $lang['Album name, A &rarr; Z'] = 'ឈ្មោះអាល់ប៊ុម A &rarr; Z';
-$lang['Album name, Z &rarr; A'] = 'ឈ្មោះអាល់ប៊ុម Z &rarr; A';
\ No newline at end of file
+$lang['Album name, Z &rarr; A'] = 'ឈ្មោះអាល់ប៊ុម Z &rarr; A';
+$lang['Link: %s'] = 'តំណភ្ជាប់៖ %s';
\ No newline at end of file
diff --git a/sources/language/km_KH/index.php b/sources/language/km_KH/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/km_KH/index.php
+++ b/sources/language/km_KH/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/km_KH/install.lang.php b/sources/language/km_KH/install.lang.php
index 0b41680..b119bfb 100755
--- a/sources/language/km_KH/install.lang.php
+++ b/sources/language/km_KH/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -21,7 +21,7 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 $lang['Password ']['confirm'] = 'ពាក្យ​សម្ងាត់​ [បញ្ជាក់]';
-$lang['PHP 5 is required'] = 'PHP 5 ត្រូវ​ការជា​ចាំបាច់';
+$lang['PHP 5 is required'] = 'PHP 5.2 ត្រូវ​ការជា​ចាំបាច់';
 $lang['Database configuration'] = 'ការ​កំណត់​លើ​មូលដ្ឋាន​ទិន្នន័យ';
 $lang['Download the config file'] = 'ទាញ​យក​ឯកសារកំណត់';
 $lang['Admin configuration'] = 'ការ​កំណត់​ផ្នែក​រដ្ឋបាល';
@@ -33,11 +33,35 @@ $lang['Default gallery language'] = 'ភាសាវិចិត្រសាល
 $lang['Database table prefix'] = 'បុព្វបទតារាងមូលដ្ឋាន​ទិន្ន​ន័យ';
 $lang['Database name'] = 'ឈ្មោះ​មូលដ្ឋាន​ទិន្ន​ន័យ';
 $lang['Hope to see you back soon.'] = 'សង្ឃឹមថា​នឹងឃើញ​អ្នក​មកវិញឆាប់ៗ';
-$lang['Try to configure PHP 5'] = 'ព្យាយាម​កែកំណត់ PHP 5';
+$lang['Try to configure PHP 5'] = 'ព្យាយាម​កែកំណត់ PHP 5.2';
 $lang['User'] = 'អ្នក​​ប្រើប្រាស់';
 $lang['Sorry!'] = 'សុំទោស!';
 $lang['Start Install'] = 'ចាប់ផ្តើម​បញ្ចូល';
 $lang['Welcome to your new installation of Piwigo!'] = 'ស្វាគមន៍​មកកាន់​​ការបញ្ចូល​ថ្មីរបស់​ភីវីហ្គូ!';
 $lang['Welcome to my photo gallery'] = 'ស្វាគមន៍​មកកាន់​វិចិត្រសាលរូបភាព​របស់​ខ្ញុំ';
 $lang['Just another Piwigo gallery'] = 'គ្រាន់តែជា​វិចិត្រសាលផ្សេងទៀតរបស់​ភីវីហ្គូ';
-$lang['Congratulations, Piwigo installation is completed'] = 'អប់​អរ​សាទរ, ការ​បញ្ចូល​ភីវីហ្គូ​បាន​សម្រេច';
\ No newline at end of file
+$lang['Congratulations, Piwigo installation is completed'] = 'អប់​អរ​សាទរ, ការ​បញ្ចូល​ភីវីហ្គូ​បាន​សម្រេច';
+$lang['also given by your host provider'] = 'ផ្គត់ផ្គង់ដោយអ្នកផ្គត់ផ្គង់ hosting របស់អ្នកផងដែរ';
+$lang['user login given by your host provider'] = 'ការចូលរបស់អ្នកប្រើប្រាស់ បានផ្តល់ដោយអ្នកផ្តល់ host របស់អ្នក';
+$lang['localhost or other, supplied by your host provider'] = 'localhost ឬផ្សេងទៀត ដែលបានផ្គត់ផ្គង់ដោយអ្នកផ្តល់ host របស់អ្នក';
+$lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'ឈ្មោះតារាង database នឹងត្រូវបានដាក់បុព្វបទជាមួយវា (អនុញ្ញាតឱ្យអ្នកគ្រប់គ្រងតារាងរបស់អ្នកល្អប្រសើរជាងមុន)';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo អាចព្យាយាមដើម្បីប្តូរការកំណត់រចនាសម្ព័ន្ធរបស់អ្នកទៅ PHP 5.2 ដោយការបង្កើត ឬកែប្រែឯកសារ .htaccess';
+$lang['You can download the config file and upload it to local/config directory of your installation.'] = 'អ្នកអាចទាញយក​ឯកសាររចនាសម្ព័ន្ធ ហើយផ្ទុកឡើងទៅកាន់ថត local/config នៅក្នុងការតំឡើងរបស់អ្នក';
+$lang['Visitors will be able to contact site administrator with this mail'] = 'ភ្ញៀវនឹងអាចប្រើអ៊ីម៉ែលនេះដើម្បីទាក់ទងអ្នកគ្រប់គ្រងតំបន់បណ្ដាញ';
+$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'ចំណាំថាអ្នកអាចប្តូររចនាសម្ព័ន្ធដោយខ្លួនអ្នក ហើយបន្ទាប់មកចាប់ផ្តើម Piwigo សារជាថ្មី';
+$lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'ត្រូវការជំនួយ? សូមសួរសំណួររបស់អ្នកនៅលើ <a href="%s">ក្តារសារ Piwigo</a>';
+$lang['Keep it confidential, it enables you to access administration panel'] = 'រក្សាទុកវាជាសម្ងាត់, វាអនុញ្ញាតឱ្យអ្នកដើម្បីចូលដំណើរការ administration panel';
+$lang['It will be shown to the visitors. It is necessary for website administration'] = 'វានឹងត្រូវបានបង្ហាញដល់ភ្ញៀវ។ វាជាការចាំបាច់សម្រាប់ការគ្រប់គ្រងវ៉ិបសាយ';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo គឺមិនអាចកំណត់ PHP 5.2';
+$lang['It appears your webhost is currently running PHP %s.'] = 'នៅលើម៉ាស៊ីនបណ្តាញរបស់អ្នកបច្ចុប្បន្នកំពុងដំណើរការ PHP​ %s';
+$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'ចូរកុំស្ទាក់ស្ទើរក្នុងការពិគ្រោះយោបល់នៅវេទិការបស់យើងសម្រាប់ជំនួយណាមួយ: %s';
+$lang['Creation of config file local/config/database.inc.php failed.'] = 'ការបង្កើតរចនាសម្ព័ន្ធឯកសារ local/config/database.inc.php បរាជ័យ';
+$lang['Connection to server succeed, but it was impossible to connect to database'] = 'ការភ្ជាប់ទៅកាន់ម៉ាស៊ីនមេបានជោគជ័យ តែការភ្ជាប់ទៅកាន់ database​ គឺមិនអាចធ្វើទៅបាន';
+$lang['webmaster login can\'t contain characters \' or "'] = '
+ការចូលរបស់អ្នកគ្រប់គ្រងបណ្ដាញមិនអាចមានតួអក្សរ \' ឬ​ "';
+$lang['user password given by your host provider'] = 'ពាក្យសម្ងាត់របស់អ្នកប្រើប្រាស់់ដែលបានផ្គត់ផ្គង់ដោយអ្នកផ្តល់​ host របស់អ្នក';
+$lang['verification'] = 'ការផ្ទៀងផ្ទាត់';
+$lang['enter a login for webmaster'] = 'សូមបញ្ចូលឈ្មោះអ្នកគ្រប់គ្រងបណ្ដាញ';
+$lang['please enter your password again'] = 'សូមបញ្ចូលលេខសម្ងាត់របស់អ្នកម្តងទៀត';
+$lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'ដំណោះស្រាយជំនួសគឺដើម្បីចម្លងអត្ថបទនៅក្នុងប្រអប់ខាងលើនិងបិទភ្ជាប់វាទៅក្នុងឯកសារ​ "local/config/database.inc.php" (ប្រុងប្រយ័ត្ន: database.inc.php ត្រូវតែមានតែមួយគត់នូវអ្វីដែលមានក្នុង textarea, គ្មានបន្ទាត់ត្រឡប់ ឬចន្លោះតួអក្សរ';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'អ្នកគួរតែយោងទៅលើជំនួយរបស់អ្នកផ្តល់សេវាបង្ហោះរបស់អ្នក និងរកមើលពីរបៀបដែលអ្នកអាចប្ដូរទៅកម្មវិធី PHP 5.2 បានដោយខ្លួនឯង';
\ No newline at end of file
diff --git a/sources/language/km_KH/upgrade.lang.php b/sources/language/km_KH/upgrade.lang.php
index 5163f3d..124f302 100755
--- a/sources/language/km_KH/upgrade.lang.php
+++ b/sources/language/km_KH/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/kn_IN/admin.lang.php b/sources/language/kn_IN/admin.lang.php
index 6431c60..82e7c9d 100755
--- a/sources/language/kn_IN/admin.lang.php
+++ b/sources/language/kn_IN/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/kn_IN/common.lang.php b/sources/language/kn_IN/common.lang.php
index 5cd93b1..8288748 100644
--- a/sources/language/kn_IN/common.lang.php
+++ b/sources/language/kn_IN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: ಕನ್ನಡ [IN]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=693
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/kn_IN/install.lang.php b/sources/language/kn_IN/install.lang.php
index 4ddad7b..0954d79 100755
--- a/sources/language/kn_IN/install.lang.php
+++ b/sources/language/kn_IN/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -45,24 +45,23 @@ $lang['Creation of config file local/config/database.inc.php failed.'] = 'local/
 $lang['Database configuration'] = 'ಡೇಟಾಬೇಸ್ ಕಾರ್ಯ ಸಿದ್ಧತೆಗಳು (Database configuration)';
 $lang['Download the config file'] = 'ಕಾರ್ಯಸಿದ್ಧತೆ ಕಡತ (config file) ವನ್ನು ಇಳಿಸಿಕೊಳ್ಳಿ';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'ಗಮನಿಸಿ : ನಿಮ್ಮ ಕಾರ್ಯ ಸಿದ್ಧತೆಗಳನ್ನು ನೀವೇ ಬದಲಾಯಿಸಬಹುದು ಮತ್ತು ಆನಂತರ ಅದರ ಬಳಕೆಗಾಗಿ Piwigo ಅನ್ನು ಮರುಚಾಲಿಸಿ.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = '.htaccess ಕಡತವನ್ನು ರೂಪಿಸುವುದರ ಅಥವಾ ಮಾರ್ಪಡಿಸುವುದರ ಮೂಲಕ Piwigo ನಿಮ್ಮ ಕಾರ್ಯ ಸಿದ್ಧತೆಗಳನ್ನು  PHP 5 ಗೆ ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ಗೆ PHP 5  ಅನ್ನು ಸಿಧ್ಧಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.';
-$lang['Try to configure PHP 5'] = 'PHP 5  ಅನ್ನು ಸಿಧ್ಧಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = '.htaccess ಕಡತವನ್ನು ರೂಪಿಸುವುದರ ಅಥವಾ ಮಾರ್ಪಡಿಸುವುದರ ಮೂಲಕ Piwigo ನಿಮ್ಮ ಕಾರ್ಯ ಸಿದ್ಧತೆಗಳನ್ನು  PHP 5.2 ಗೆ ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ಗೆ PHP 5.2  ಅನ್ನು ಸಿಧ್ಧಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.';
+$lang['Try to configure PHP 5'] = 'PHP 5.2  ಅನ್ನು ಸಿಧ್ಧಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ.';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'ಸ್ಥ್ಪಾಪನಾ ಕಾರ್ಯದಲ್ಲಿ, ನೀವು ಕಾರ್ಯಸಿದ್ಧತೆ ಕಡತ ವನ್ನು ಇಳಿಸಿಕೊಳ್ಳಬಹುದು ಮತ್ತು ಅದನ್ನು local/config ಡೈರಕ್ಟರಿಗೆ ವರ್ಗಾಯಿಸಬಹುದು.';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning: database.inc.php must only contain what is in the textarea, no line return or space character)';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'ಡೇಟಾಬೇಸ್ ಟೇಬಲ್ ಗಳ ಹೆಸರುಗಳಿಗೆ ಪೂರ್ವಪ್ರತ್ಯಯ ( prefix ) ಗಳನ್ನು ಅಳವಡಿಸುತ್ತದೆ. (ಟೇಬಲ್ ಗಳನ್ನು ಉತ್ತಮ ರೀತಿಯಲ್ಲಿ ನಿರ್ವಹಿಸಲು ಇದು ನಿಮಗೆ ಸಹಾಯಕ)';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'ಯಾವುದೇ ಬಗೆಯ ಸಹಾಯಕ್ಕೆ ನಮ್ಮ ಈ ಚರ್ಚಾವೇದಿಕೆ (forum) ಗಳನ್ನು ಬಳಸುವಲ್ಲಿ ಹಿಂಜರಿಯಬೇಡಿ : %s';
 $lang['Database table prefix'] = 'ಡೇಟಾಬೇಸ್ ಟೇಬಲ್ ಗಳ ಪೂರ್ವಪ್ರತ್ಯಯ ( prefix )';
 $lang['Password ']['confirm'] = 'ಪ್ರವೇಶಪದ [ಖಾತ್ರಿ]';
-$lang['PHP 5 is required'] = 'PHP 5 ಅತ್ಯಗತ್ಯವಾಗಿದೆ.';
+$lang['PHP 5 is required'] = 'PHP 5.2 ಅತ್ಯಗತ್ಯವಾಗಿದೆ.';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'ಈ ವಿವರಗಳನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಇಡಿ, ಇದು ನಿಮಗೆ ನಿರ್ವಹಣಾ ಪ್ಯಾನೆಲ್ ಅನ್ನು ಬಳಸುವಾಗ ಉಪಯೊಗಕ್ಕೆ ಬರುತ್ತದೆ.';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'ಈ ವಿವರಗಳು ನೋಡುಗರಿಗೆ ಲಭ್ಯವಿರುತ್ತವೆ, ಜಾಲತಾಣ ನಿರ್ವಹಣಾ ಕಾರ್ಯಕ್ಕೆ ಇದು ಅತ್ಯಗತ್ಯ.';
 $lang['It appears your webhost is currently running PHP %s.'] = 'ನಿಮ್ಮ ವೆಬ್ ಹೋಸ್ಟ್ ಸಧ್ಯಕ್ಕೆ PHP %s ಅನ್ನು ಬಳಸುತ್ತಿದೆ.';
 $lang['Hope to see you back soon.'] = 'ಮತ್ತೆ ಸಧ್ಯದಲ್ಲೇ ಭೇಟಿಯಾಗೋಣ.';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'ಸರ್ವರ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ, ಆದರೆ ಡೇಟಾಬೇಸ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'ತಾಣ ನಿರ್ವಹಣೆಗಾರರ (ಸೈಟ್ ಅಡ್ಮಿನ್) ನ್ನು ಸಂಪರ್ಕಿಸಲು ಬಳಕೆದಾರರು/ನೋಡುಗರು ಈ ಮಿಂಚೆ ವಿಳಾಸವನ್ನು ಬಳಸಬಹುದಾಗಿದೆ';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'PHP 5 ಗೆ ನೀವು ಹೇಗೆ ಬದಲಾಯಿಸಿಕೊಳ್ಳ ಬಹುದು ಎಂಬುದರ ವಿವರಗಳನ್ನು ನಿಮ್ಮ ಹೋಸ್ಟಿಂಗ್ ಪ್ರೊವೈಡರ್ ಅವರ ಸಹಾಯದಲ್ಲಿ ನೋಡಿರಿ.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'PHP 5.2 ಗೆ ನೀವು ಹೇಗೆ ಬದಲಾಯಿಸಿಕೊಳ್ಳ ಬಹುದು ಎಂಬುದರ ವಿವರಗಳನ್ನು ನಿಮ್ಮ ಹೋಸ್ಟಿಂಗ್ ಪ್ರೊವೈಡರ್ ಅವರ ಸಹಾಯದಲ್ಲಿ ನೋಡಿರಿ.';
 $lang['also given by your host provider'] = 'ಹಾಗೂ ನಿಮ್ಮ ಹೋಸ್ಟಿಂಗ್ ಪ್ರೊವೈಡರ್ ಅವರಿಂದ ಪೂರೈಸಿದೆ';
 $lang['webmaster login can\'t contain characters \' or "'] = 'ವೆಬ್ ಮಾಸ್ಟರ್ ಲಾಗಿನ್ \' ಅಥವಾ " ಸಂಕೇತಾಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬಾರದು';
-$lang['localhost or other, supplied by your host provider'] = 'ನಿಮ್ಮ ಹೋಸ್ಟ್ ಪ್ರೊವೈಡರ್ ಒದಗಿಸಿರುವ ಲೋಕಲ್ ಹೋಸ್ಟ್ ಅಥವಾ ಇತರೆ';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'ನಿಮ್ಮ ಹೋಸ್ಟ್ ಪ್ರೊವೈಡರ್ ಒದಗಿಸಿರುವ ಲೋಕಲ್ ಹೋಸ್ಟ್ ಅಥವಾ ಇತರೆ';
\ No newline at end of file
diff --git a/sources/language/kn_IN/upgrade.lang.php b/sources/language/kn_IN/upgrade.lang.php
index c8e84f1..3d4bc93 100755
--- a/sources/language/kn_IN/upgrade.lang.php
+++ b/sources/language/kn_IN/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ko_KR/admin.lang.php b/sources/language/ko_KR/admin.lang.php
index 22dad06..898c8ca 100755
--- a/sources/language/ko_KR/admin.lang.php
+++ b/sources/language/ko_KR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -52,11 +52,447 @@ $lang['show details'] = '자세히 보기';
 $lang['user_status_guest'] = '손님';
 $lang['Add a user'] = '사용자 추가';
 $lang['Activate'] = '활성화';
-$lang['Active Languages'] = '활성 언어';
+$lang['Active Languages'] = '활성화된 언어';
 $lang['Active Plugins'] = '활성 플러그인';
 $lang['Add'] = '추가';
 $lang['Add New Language'] = '새로운 언어 추가';
 $lang['Add New Theme'] = '새로운 테마 추가';
 $lang['Add a filter'] = '필터 추가';
 $lang['Add a tag'] = '태그 추가';
-?>
\ No newline at end of file
+$lang['You are running the latest version of Piwigo.'] = '최신 버전의 Piwigo가 동작 중입니다.';
+$lang['Ignore this update'] = '이 업데이트 무시';
+$lang['Add Photos'] = '사진 추가';
+$lang['Add to caddie'] = '캐디에 추가';
+$lang['Change password'] = '비밀번호 변경';
+$lang['Edit album permissions'] = '앨범 권한 수정';
+$lang['Manage Permissions'] = '권한 관리하기';
+$lang['Manage permissions for group "%s"'] = '"%s" 그룹의 권한을 관리';
+$lang['Manage permissions for user "%s"'] = '"%s" 사용자의 권한을 관리';
+$lang['Purge search history'] = '검색 기록 비우기';
+$lang['Remove from caddie'] = '캐디에서 제거';
+$lang['Synchronize metadata'] = '메타데이터 동기화';
+$lang['Update albums informations'] = '앨범 정보 업데이트하기';
+$lang['Update photos information'] = '사진 정보 업데이트하기';
+$lang['add new photos to caddie'] = '캐디에 새로운 사진 추가';
+$lang['apply automatic sort order'] = '자동정렬 적용';
+$lang['jump to album'] = '앨범으로 이동';
+$lang['manage sub-albums'] = '하위 앨범 관리하기';
+$lang['Numeric identifier : %d'] = '숫자 식별자 : %d';
+$lang['This album contains no photo.'] = '이 앨범에는 등록된 사진이 없습니다.';
+$lang['Can\'t create temporary file.'] = '임시파일을 생성할 수 없습니다.';
+$lang['Create'] = '만들기';
+$lang['create a new album'] = '새 앨범 만들기';
+$lang['create a new site'] = '새 사이트 만들기';
+$lang['created'] = '생성됨';
+$lang['Update Complete'] = '업데이트 완료';
+$lang['Password confirmation is missing. Please confirm the chosen password.'] = '비밀번호 확인란이 비었습니다. 비밀번호 확인란을 입력하십시오.';
+$lang['Password is missing. Please enter the password.'] = '비밀번호란이 비었습니다. 비밀번호를 입력하십시오.';
+$lang['Password updated'] = '비밀번호가 변경됨';
+$lang['User "%s" created with "%s" like password'] = '"%s" 비밀번호를 사용하는 "%s" 사용자가 생성됨';
+$lang['No user selected of %d users'] = '%d 사용자 중 선택된 사용자가 없음';
+$lang['No user selected, no action possible.'] = '선택된 사용자가 없어서 사용 가능한 동작이 없습니다.';
+$lang['%d members'] = '%d 구성원';
+$lang['Members'] = '구성원';
+$lang['No members to manage'] = '관리할 구성원이 없습니다';
+$lang['Please select at least two groups'] = '두 개 이상의 그룹을 선택하십시오';
+$lang['Send an information email to group members'] = '그룹의 구성원에게 정보를 이메일로 발송';
+$lang['Authorized'] = '허용됨';
+$lang['Permissions'] = '권한';
+$lang['Basic settings'] = '기본 설정';
+$lang['General'] = '일반';
+$lang['Configuration'] = '환경설정';
+$lang['Piwigo configuration'] = 'Piwigo 환경설정';
+$lang['Options'] = '옵션';
+$lang['History'] = '기록';
+$lang['Permalink history'] = '퍼머링크 기록';
+$lang['Metadata synchronization results'] = '메타데이터 동기화 결과';
+$lang['Synchronize'] = '동기화하기';
+$lang['Other private albums'] = '다른 개인 앨범';
+$lang['Private'] = '개인';
+$lang['private'] = '개인';
+$lang['Public'] = '공개';
+$lang['Public / Private'] = '공개 / 개인';
+$lang['Caddie'] = '캐디';
+$lang['Caddie management'] = '캐디 관리';
+$lang['Empty caddie'] = '캐디 비우기';
+$lang['Who can see this photo?'] = '누가 이 사진을 볼 수 있나요?';
+$lang['Manage authorizations for selected albums'] = '선택한 앨범의 권한 관리';
+$lang['Error list'] = '오류 목록';
+$lang['Plugin list'] = '플러그인 목록';
+$lang['User list'] = '사용자 목록';
+$lang['All plugins are up to date.'] = '모든 플러그인이 최신입니다.';
+$lang['Inactive Plugins'] = '비활성 플러그인';
+$lang['Plugins'] = '플러그인';
+$lang['Restore'] = '복원';
+$lang['Restore default configuration. You will lose your plugin settings!'] = '기본 환경설정으로 복원합니다. 플러그인 설정이 없어집니다!';
+$lang['Administration Home'] = '관리자 홈';
+$lang['Change Admin Colors'] = '관리자 색상 변경';
+$lang['user_status_admin'] = '관리자';
+$lang['Default user does not exist'] = '기본 사용자가 없습니다';
+$lang['Default user cannot be deleted'] = '기본 사용자는 삭제할수 없습니다.';
+$lang['Database'] = '데이터베이스';
+$lang['Database synchronization with files'] = '파일과 데이터베이스 동기화';
+$lang['Dump Database'] = '데이터베이스 덤프하기';
+$lang['Information data registered in database'] = '데이터베이스에 정보 데이터가 등록됨';
+$lang['Repair and optimize database'] = '데이터베이스 복구 및 최적화';
+$lang['Unable to dump database.'] = '데이터베이스를 덤프 할 수 없습니다.';
+$lang['albums added in the database'] = '데이터베이스에 앨범이 추가됨';
+$lang['albums deleted in the database'] = '데이터베이스에서 앨범이 삭제됨';
+$lang['photos added in the database'] = '데이터베이스에 사진이 추가됨';
+$lang['photos deleted from the database'] = '데이터베이스에서 사진이 삭제됨';
+$lang['photos updated in the database'] = '데이터베이스에 사진이 변경됨';
+$lang['FTP + Synchronization'] = 'FTP + 동기화';
+$lang['Quick Local Synchronization'] = '빠른 로컬 동기화';
+$lang['errors during synchronization'] = '동기화 중에 오류';
+$lang['Deactivate'] = '비활성화';
+$lang['Deactivate all'] = '전체 비활성화';
+$lang['Check for updates'] = '업데이트 확인';
+$lang['Check for upgrade'] = '업그레이드 확인';
+$lang['Check for upgrade failed for unknown reasons.'] = '알수없는 이유로 업그레이드 확인이 실패하였습니다.';
+$lang['Are you sure you want to delete this plugin?'] = '이 플러그인을 삭제하시겠습니까?';
+$lang['Are you sure you want to install this plugin?'] = '이 플러그인을 설치하시겠습니까?';
+$lang['Authorize users to add comments on selected albums'] = '선택한 앨범에 댓글 쓰기를 사용자에게 허용';
+$lang['Automatic correction'] = '자동 수집';
+$lang['Automatic sort order'] = '자동 정렬 순서';
+$lang['Available only with HTML format'] = 'HTML 포맷만 가능합니다';
+$lang['Average rate'] = '평균 등급';
+$lang['Can\'t connect to server.'] = '사용할 수 없는 서버에 연결';
+$lang['Photo Properties'] = '사진 속성';
+$lang['Properties'] = '속성';
+$lang['Cannot delete the old permalink !'] = '오래된 퍼머링크가 삭제되지 않음!';
+$lang['Permalink'] = '퍼머링크';
+$lang['Permalinks'] = '퍼머링크';
+$lang['List'] = '목록';
+$lang['Album list management'] = '앨범 목록 관리';
+$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture는 맥에서 사진을 보정하고 대규모 라이브러리를 관리하기 위한 강력한 툴입니다.';
+$lang['Group management'] = '그룹 관리';
+$lang['Manage'] = '관리하기';
+$lang['Manage tags'] = '태그 관리하기';
+$lang['Manage the members'] = '구성원 관리하기';
+$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = '리눅스에서 패키지 관리자로 간단히 Shotwell를 설치 한 다음 Piwigo의 게시 옵션을 활성화하십시오.';
+$lang['Permission management'] = '권한 설정';
+$lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwell 리눅스에서 실행되는 오픈 소스 디지털 사진 정리도구입니다. 우분투와 페도라의 기본 사진 관리자입니다.';
+$lang['Site manager'] = '사이트 관리자';
+$lang['digiKam is an advanced digital photo management free software for Linux, Windows, and MacOSX.'] = 'digiKam은 리눅스, 윈도우즈 와 맥 OSX를 위한 고급 디지털 사진 관리용 무료 소프트웨어입니다.';
+$lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = 'digiKam이 사진을 보기, 관리, 편집, 향상, 정리, 태그과 공유를 하려는 사진작가를 위해 설계되었습니다.';
+$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto는 맥 OSX의 기본 사진 관리자입니다. Piwigo의 익스포트 플러그인은 새로운 앨범을 생성하고 iPhone에서 Piwigo 사진 갤러리로 바로 익스포트 할 수 있도록 합니다.';
+$lang['manage album photos'] = '앨번 사진 관리하기';
+$lang['Groups and users'] = '그룹과 사용자';
+$lang['Send mail to users'] = '사용자에게 메일 발송';
+$lang['Users'] = '사용자';
+$lang['%d mail was not sent.'] = '%d 메일이 발송 안됨';
+$lang['%d mail was sent.'] = '%d 메일이 발송됨';
+$lang['%d mails were not sent.'] = '%d 메일이 발송 안됨';
+$lang['%d mails were sent.'] = '%d 메일이 발송됨';
+$lang['%d user comments rejected'] = '%d 사용자 댓글 거부됨';
+$lang['%d photo was deleted'] = '%d 사진이 삭제됨';
+$lang['%d photos uploaded'] = '%d 사진이 업로드됨';
+$lang['%d photos were deleted'] = '%d 사진이 삭제됨';
+$lang['%d tag'] = '%d 태그';
+$lang['%d tags'] = '%d 태그';
+$lang['%d user'] = '%d 사용자';
+$lang['%d user comment rejected'] = '%d 사용자 댓글 거부됨';
+$lang['%d user comment validated'] = '%d 사용자 댓글 허용됨';
+$lang['%d user comments validated'] = '%d 사용자 댓글 허용됨';
+$lang['%d user deleted'] = '%d 사용자 삭제됨';
+$lang['%d users'] = '%d 사용자';
+$lang['%d users deleted'] = '%d 사용자 삭제됨';
+$lang['%d second'] = '%d 초';
+$lang['%d seconds'] = '%d 초';
+$lang['%d minute'] = '%d 분';
+$lang['%d minutes'] = '%d 분';
+$lang['%d month'] = '%d 개월';
+$lang['%d months'] = '%d 개월';
+$lang['%d anomalies have been detected corrected.'] = '%d 이상이 검출되었고 해결되었습니다.';
+$lang['%d anomalies have been detected.'] = '%d 이상이 검출되었습니다.';
+$lang['%d anomalies have been ignored.'] = '%d 이상이 무시되었습니다.';
+$lang['%d anomalies have not been corrected.'] = '%d 이상이 해결되었습니다.';
+$lang['%d anomaly has been corrected.'] = '%d 이상이 해결되었습니다.';
+$lang['%d anomaly has been detected.'] = '%d 이상이 검출되었습니다.';
+$lang['%d anomaly has been ignored.'] = '%d 이상이 무시되었습니다.';
+$lang['%d anomaly has not been corrected.'] = '%d 이상이 해결되지 않았습니다.';
+$lang['only perform a simulation (no change in database will be made)'] = '시뮬레이션만 실행 (데이터베이스는 변경되지 않음)';
+$lang['%d album moved'] = '%d 앨범 이동됨';
+$lang['%d albums moved'] = '%d 앨범 이동됨';
+$lang['Piwigo Administration'] = 'Piwigo 관리';
+$lang['Switch to clear or dark colors for administration'] = '관리자 화면을 밝거나 어두운 색상으로 전환합니다.';
+$lang['Templates configuration has been recorded.'] = '템플릿 환경설정이 기록됨.';
+$lang['Your configuration settings are saved'] = '환경 설정이 저장됨';
+$lang['Save Settings'] = '설정 저장';
+$lang['Save Template Directory'] = '템플릿 디렉토리 저장';
+$lang['Save order'] = '순서 저장';
+$lang['Save to permalink history'] = '퍼머링크 기록에 저장하';
+$lang['first photo added on %s'] = '%s 에 첫 사진이 등록됨';
+$lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture는 iPhoto를 단순화한 전문 사진작가를 위해 설계되었습니다.';
+$lang['Piwigo export plugin for Aperture'] = 'Aperture용 Piwigo 익스포트 플러그인';
+$lang['Piwigo publish plugin for digiKam'] = 'dikiKam용 Piwigo 배포 플러그인';
+$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'digiKam에서 Piwigo로 사진을 내보내려면, digiKam 및 Kipi 플러그인을 설치하면 됩니다.';
+$lang['<em>Piwigo for iOS</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = '<em>iOS용 Piwigo</em> 앱은 iPhone, iPad 또는 iPod Touch에서 Piwigo 갤러리에 연결하고 앨범을 생성하고 한번에 여러 사진을 업로드 할 수 있도록 합니다.';
+$lang['<em>Piwigo for Android</em> application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = '<em>안드로이드용 Piwigo</em> 앱은 안드로이드 폰과 태블릿에서 Piwigo 갤러리에 연결하고 앨범을 생성하고 한번에 여러 사진을 업로드 할 수 있도록 합니다.';
+$lang['Piwigo for Android'] = '안드로이드용 Piwigo';
+$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'iOS용 Piwigo (iPhone, iPad, iPod Touch)';
+$lang['Available versions for'] = '가능한 버전';
+$lang['Piwigo Uploader'] = 'Piwigo 업로더';
+$lang['pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader는 <em>Piwigo 업로더</em>를 의미합니다. 컴퓨터에서 pLoader은 사진을 준비하고 Piwigo 사진 갤러리로 전송합니다.';
+$lang['Allowed file types: %s.'] = '가능한 파일 종류: %s.';
+$lang['Maximum file size: %sB.'] = '최대 파일 크기: %sB.';
+$lang['Select files'] = '파일 선택';
+$lang['Applications'] = '어플리케이션';
+$lang['Web Form'] = '웹 폼';
+$lang['Start Upload'] = '업로드 시작';
+$lang['Unknown upload error'] = '알 수 없는 업로드 오류';
+$lang['Upload'] = '업로드';
+$lang['Upload Photos'] = '사진 업로드';
+$lang['Upload in progress'] = '업로드 진행 중';
+$lang['Uploaded Photos'] = '사진 업로드 됨';
+$lang['Delete selected photos'] = '선택한 사진을 삭제';
+$lang['Manage photos'] = '사진 관리';
+$lang['New photos were added'] = '새로운 사진이 등록됨';
+$lang['Photos'] = '사진';
+$lang['Delete multiple size images'] = '여러 크기의 이미지를 삭제';
+$lang['Purge compiled templates'] = '컴파일된 템플릿을 비우기';
+$lang['Purge history summary'] = '기록 요약정보 비우기';
+$lang['Purge never used notification feeds'] = '사용되지 않은 알림 피드 비우기';
+$lang['Purge sessions'] = '세션 비우기';
+$lang['Purge user cache'] = '사용자 캐시 비우기';
+$lang['Purge history detail'] = '기록 상세정보 비우기';
+$lang['Delete orphan tags'] = '사용되지 않는 태그 삭제';
+$lang['Orphan tags deleted'] = '사용되지 않는 태그가 삭제됨';
+$lang['You have %d orphan tags: %s.'] = '사용되지 않는 %d개의 태그가 있습니다: %s.';
+$lang['Lock gallery'] = '갤러리 잠그기';
+$lang['No group is permitted to see this private album'] = '이 개인 앨범을 볼 수 있는 그룹이 없습니다.';
+$lang['Only private albums are listed'] = '개인 앨범만 표시됨';
+$lang['All extensions are up to date.'] = '모든 확장기능이 최신입니다.';
+$lang['Exif extension not available, admin should disable exif use'] = 'Exif 확장기능을 사용할 수 없습니다. exif 사용을 비활성화 해야합니다';
+$lang['Extensions Update'] = '확장기능 업데이트';
+$lang['Some upgrades are available for extensions.'] = '확장기능을 위한 업데이트를 사용할 수 있습니다.';
+$lang['%d user was not updated.'] = '%d 사용자가 변경되지 않음.';
+$lang['%d user was updated.'] = '%d 사용자가 변경됨.';
+$lang['%d users were not updated.'] = '%d 사용자가 변경되지 않음.';
+$lang['Album updated successfully'] = '앨범이 정상적으로 업데이트 됨';
+$lang['Photo informations updated'] = '사진 정보 변경됨';
+$lang['Piwigo Update'] = 'Piwigo 업데이트';
+$lang['Update All'] = '모두 업데이트';
+$lang['Update to Piwigo %s'] = 'Piwigo %s로 업데이트';
+$lang['Update user'] = '사용자 업데이트';
+$lang['Updates'] = '업데이트';
+$lang['General statistics'] = '일반 통계';
+$lang['Statistics'] = '통계';
+$lang['All themes are up to date.'] = '모든 테마가 최신입니다.';
+$lang['Delete this theme'] = '이 테마 삭제';
+$lang['Following themes may not be compatible with the new version of Piwigo:'] = '다음 테마는 Piwigo의 새로운 버전과 호환되지 않을 수 있습니다:';
+$lang['Forbid this theme to users'] = '사용자가 이 테마를 사용할 수 없게 함';
+$lang['Impossible to activate this theme, the parent theme is missing: %s'] = '이 테마를 활성화할 수 없습니다. 부모 테마가 없습니다: %s';
+$lang['Impossible to deactivate this theme, you need at least one theme.'] = '이 테마를 비활성화할 수 없습니다. 최소한 하나의 테마가 필요합니다.';
+$lang['Impossible to delete this theme. Other themes depends on it: %s'] = '이 테마를 삭제할 수 없습니다. 다른 테마와 의존성이 있습니다: %s';
+$lang['Make this theme available to users'] = '사용자가 이 테마를 사용할 수 있게 함';
+$lang['Set as default theme for unregistered and new users'] = '등록되지 않거나 새로운 사용자에게 기본 테마로 설정';
+$lang['Some themes and plugins may be not available yet.'] = '일부 테마와 플러그인이 아직 사용할 수 있지 않습니다.';
+$lang['Theme has been successfully installed'] = '테마가 성공적으로 설치됨';
+$lang['Themes which need upgrade'] = '업그레이드가 필요한 테마';
+$lang['There is no other theme available.'] = '사용 가능한 다른 테마가 없습니다.';
+$lang['Visit theme site'] = '테마 사이트 방문';
+$lang['You can activate only one mobile theme.'] = '모바일 테마는 하나만 활성화 할 수 있습니다.';
+$lang['Impossible to deactivate this language, first set another language as default.'] = '이 언어를 비활성화하지 못합니다. 먼저 다른 언어를 기본으로 설정하십시오.';
+$lang['Impossible to deactivate this language, you need at least one language.'] = '이 언어를 비활성화하지 못합니다. 최소한 하나의 언어는 필요합니다.';
+$lang['Language has been successfully installed'] = '언어가 성공적으로 설치되었음';
+$lang['Languages which need upgrade'] = '업그레이드가 필요한 언어';
+$lang['There is no other language available.'] = '사용가능한 다른 언어가 없습니다';
+$lang['Inactive Languages'] = '비활성화된 언어';
+$lang['Inactive Themes'] = '비활성화된 테마';
+$lang['Active Themes'] = '활성화된 테마';
+$lang['Installed Themes'] = '설치된 테마';
+$lang['Themes'] = '테마';
+$lang['Install'] = '설치';
+$lang['Uninstall'] = '제거';
+$lang['Actions'] = '동작';
+$lang['GD version'] = 'GD 버전';
+$lang['New Version'] = '새로운 버전';
+$lang['Piwigo version'] = 'Piwigo 버전';
+$lang['Version'] = '버전';
+$lang['All languages are up to date.'] = '모든 언어가 최신입니다.';
+$lang['Delete this language'] = '이 언어 삭제';
+$lang['Forbid this language to users'] = '사용자에게 이 언어를 사용하지 못하도록 함';
+$lang['Make this language available to users'] = '사용자에게 이 언어를 사용할 수 있도록 함';
+$lang['Set as default language for unregistered and new users'] = '등록되지 않는 신규 사용자에게 이 언어를 기본으로 설정';
+$lang['Installed Languages'] = '설치된 언어';
+$lang['Languages'] = '언어';
+$lang['Replacement of original templates by customized templates from template-extension subfolder'] = '원본 템플릿을 템플릿 확장 하위폴더의 사용자 템플릿으로 교체';
+$lang['Templates'] = '템플릿';
+$lang['Hide'] = '숨기기';
+$lang['Guest Settings'] = '손님 설정';
+$lang['Allow users to add a link to their website'] = '웹사이트 링크를 추가 할 수 있도록 허용';
+$lang['Allow users to delete their own comments'] = '사용자의 댓글 삭제 허용';
+$lang['Allow users to edit their own comments'] = '사용자의 댓글 수정 허용';
+$lang['Validation'] = '유효성 검사';
+$lang['Default comments order'] = '기본 댓글 순서';
+$lang['Number of comments per page'] = '페이지당 댓글 수';
+$lang['Comments for all'] = '모두에게 댓글 허용';
+$lang['Show menubar'] = '메뉴바 표시';
+$lang['Activate Navigation Thumbnails'] = '썸네일 네비게이션 활성화';
+$lang['Activate comments'] = '댓글 활성화';
+$lang['Activate Navigation Bar'] = '네비게이션 바 활성화';
+$lang['Number of albums per page'] = '한 페이지의 앨범 수';
+$lang['Activate icon "new" next to albums and pictures'] = '앨범 및 사진 옆에 "새로 만들기" 아이콘 활성화';
+$lang['new'] = '새로 만들기';
+$lang['Activate icon "%s"'] = '"%s" 아이콘 활성화';
+$lang['Photo Page'] = '사진 페이지';
+$lang['Main Page'] = '메인 페이지';
+$lang['Select a file'] = '파일 선택';
+$lang['Opacity'] = '투명도';
+$lang['middle'] = '중간';
+$lang['bottom left corner'] = '좌하단';
+$lang['bottom right corner'] = '우하단';
+$lang['top left corner'] = '좌상단';
+$lang['top right corner'] = '우상단';
+$lang['custom'] = '사용자 지정';
+$lang['Position'] = '위치';
+$lang['Apply watermark if height is bigger than'] = '워터마크를 적용할 최소 세로길이';
+$lang['Apply watermark if width is bigger than'] = '워터마크를 적용할 최소 가로길이';
+$lang['Watermark'] = '워터마크';
+$lang['add a new watermark'] = '새로운 워터마크 추가';
+$lang['Image Quality'] = '사진 품질';
+$lang['The original image quality must be a number between %d and %d'] = '원본 사진 품질은 %d ~ %d 사이 값이어야 합니다.';
+$lang['Resize after upload'] = '업로드 후에 리사이즈';
+$lang['Resize after upload disabled due to the use of GD as graphic library'] = '그래픽 라이브러리로 GD를 사용할 때까지 업로드 후 리사이즈 불가';
+$lang['Original Size'] = '원본 크기';
+$lang['Gallery title'] = '갤러리 제목';
+$lang['With blank value, gallery title will be used'] = '비어있으면, 갤러리 제목이 사용됩니다';
+$lang['Page banner'] = '페이지 배너';
+$lang['Default photos order'] = '사진 정렬 기본 순서';
+$lang['delete'] = '삭제';
+$lang['delete album'] = '앨범 삭제';
+$lang['delete photo'] = '사진 삭제';
+$lang['deleted'] = '삭제됨';
+$lang['Add a criteria'] = '기준 추가';
+$lang['Mail address is mandatory for registration'] = '등록시 메일 주소가 필수';
+$lang['Email admins when a new user registers'] = '새로운 사용자를 등록하면 관리자에게 메일 발송하기';
+$lang['Rating by guests'] = '손님에게 평점 허용';
+$lang['Allow rating'] = '평점 허용';
+$lang['Allow user customization'] = '사용자 개인화 허용';
+$lang['Allow user registration'] = '사용자 등록 허용';
+$lang['Mail theme'] = '메일 테마';
+$lang['Save visits in history for'] = '방문기록 저장: ';
+$lang['Week starts on'] = '한 주의 시작';
+$lang['Miscellaneous'] = '기타';
+$lang['simple visitors'] = '단순 방문자';
+$lang['No photo selected, no action possible.'] = '선택된 사진이 없어서 사용 가능한 동작이 없습니다.';
+$lang['Apply action'] = '동작 적용';
+$lang['Tools'] = '도구';
+$lang['Searching...'] = '검색중...';
+$lang['Representant'] = '앨범 썸네일';
+$lang['Representation of albums'] = '앨범 썸네일';
+$lang['Representative'] = '앨범 썸네일';
+$lang['Piwigo export plugin for iPhoto'] = 'iPhoto용 Piwigo 익스포트 플러그인';
+$lang['Piwigo publish plugin for Shotwell'] = 'Shotwell용 Piwigo 배포 플러그인';
+$lang['Photo name'] = '사진 이름';
+$lang['Original file : %s'] = '원본 파일: %s';
+$lang['Panorama'] = '파노라마';
+$lang['Parent album'] = '부모 앨범';
+$lang['Path'] = '경로';
+$lang['New photos added'] = '새로운 사진이 등록됨';
+$lang['New tag'] = '새 태그';
+$lang['No results'] = '결과 없음';
+$lang['Name'] = '이름';
+$lang['New name'] = '새 이름';
+$lang['Loading...'] = '로딩중...';
+$lang['Instructions to use Piwigo'] = 'Piwigo 사용 방법';
+$lang['Informations'] = '정보';
+$lang['Height'] = '세로';
+$lang['Hour'] = '시';
+$lang['IP'] = 'IP';
+$lang['Ignore All'] = '모두 무시';
+$lang['Ignore selected anomalies'] = '선택된 문제점 무시';
+$lang['GD library is missing'] = 'GD 라이브러리가 없음';
+$lang['Graphics Library'] = '그래픽 라이브러리';
+$lang['Failed to write file to disk'] = '파일을 디스크에 기록하지 못함';
+$lang['File'] = '파일';
+$lang['File/directory read error'] = '파일/디렉토리 읽기 오류';
+$lang['Forbidden'] = '금지됨';
+$lang['Edit album'] = '앨범 수정';
+$lang['Edit photo'] = '사진 수정';
+$lang['Edit ranks'] = '등급 수정';
+$lang['Edit selected tags'] = '선택된 태그 수정';
+$lang['Edit tags'] = '태그 수정';
+$lang['Detailed informations'] = '상세 정보';
+$lang['Directory'] = '디렉토리';
+$lang['Directory does not exist'] = '디렉토리가 존재하지 않음';
+$lang['Downloads'] = '다운로드';
+$lang['Drop into album'] = '앨범 선택';
+$lang['ERROR'] = 'ERROR';
+$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'ERROR: 이 플러그인은 설치되었으나 찾을 수 없습니다! 지금 삭제하세요.';
+$lang['Delete Representant'] = '앨범 썸네일 삭제';
+$lang['Delete selected tags'] = '선택된 태그 삭제';
+$lang['Delete selected users'] = '선택된 사용자 삭제';
+$lang['An error has occured during upgrade.'] = '업데이트 중에 오류가 발생하였습니다.';
+$lang['%d week'] = '%d 주';
+$lang['%d weeks'] = '%d 주';
+$lang['%d year'] = '%d 년';
+$lang['%d years'] = '%d 년';
+$lang['%d member'] = '%d 구성원';
+$lang['Change username'] = '사용자 이름 변경';
+$lang['Level 0'] = '권한없음';
+$lang['Level 1'] = '지인';
+$lang['Level 2'] = '친구';
+$lang['Level 4'] = '가족';
+$lang['Level 8'] = '관리자';
+$lang['All %d users are selected'] = '모두 %d 사용자가 선택됨';
+$lang['Invert'] = '반전';
+$lang['None'] = '없음';
+$lang['none'] = '없음';
+$lang['Showing %s to %s of %s users'] = '%s ~ %s 보기 (전체 %s 사용자)';
+$lang['Cancel'] = '취소';
+$lang['Send connection settings by email'] = '접속 정보를 메일로 발송';
+$lang['Send'] = '발송';
+$lang['%d users were updated.'] = '%d 사용자가 변경됨.';
+$lang['User %s [%s] was not added to the subscription list.'] = '%s [%s] 사용자는 구독자 목록에 추가하지 못했습니다.';
+$lang['Error when sending email to %s [%s].'] = '%s [%s] 에게 메일 발송 중 오류 발생함.';
+$lang['Subscribed'] = '구독';
+$lang['Unsubscribed'] = '수신거부';
+$lang['Warning: subscribing or unsubscribing will send mails to users'] = '주의: 구독 또는 수신거부의 상태변경은 사용자에게 메일이 발송됩니다';
+$lang['Subscribe/unsubscribe users'] = '구독/수신 거부 사용자';
+$lang['Include display of recent photos grouped by dates'] = '날짜별 최신 사진을 표시';
+$lang['Complementary mail content'] = '대체할 메일 내용';
+$lang['Add detailed content'] = '상세내용을 포함';
+$lang['Send mail as'] = '다음 제목으로 메일 발송:';
+$lang['Send mail on HTML format'] = 'HTML 포맷으로 메일 보내기';
+$lang['%d parameter was updated.'] = '%d 파라미터가 변경됨.';
+$lang['%d parameters were updated.'] = '%d 파라미터가 변경됨.';
+$lang['Parameters'] = '파라미터';
+$lang['There is no available subscribers to mail.'] = '메일로 공지를 받는 사용자가 없습니다.';
+$lang['No group selected, no action possible.'] = '선택된 그룹이 없어서 사용 가능한 동작이 없습니다.';
+$lang['Group'] = '그룹';
+$lang['Group name'] = '그룹 이름';
+$lang['Groups'] = '그룹';
+$lang['Move albums'] = '앨범 이동';
+$lang['New parent album'] = '새로운 부모 앨범';
+$lang['Virtual albums to move'] = '이동할 가상 앨범';
+$lang['Move'] = '이동';
+$lang['date & time'] = '날짜와 시간';
+$lang['file name'] = '파일이름';
+$lang['Batch Manager'] = '배치 관리자';
+$lang['Guest cannot be deleted'] = '손님 계정은 삭제할 수 없음';
+$lang['Guests'] = '손님';
+$lang['Rate'] = '등급';
+$lang['Rate date'] = '평가 날짜';
+$lang['Number of rates'] = '평가 수';
+$lang['Sum of rates'] = '평가 합계';
+$lang['Operating system'] = '운영체제';
+$lang['Rating'] = '평점';
+$lang['Menu Management'] = '메뉴 관리';
+$lang['Reinitialize check integrity'] = '무결성 검사 재초기화';
+$lang['Maintenance'] = '유지보수';
+$lang['overrides existing values with empty ones'] = '빈 값에 대해서도 기존 값을 덮어씀';
+$lang['even already synchronized photos'] = '이미 동기화된 사진 포함';
+$lang['Action'] = '동작';
+$lang['Choose an action'] = '동작 선택';
+$lang['Choose an option'] = '옵션 선택';
+$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = '최대값 정보 표시 (추가된 앨범과 사진, 삭제된 앨범과 사진)';
+$lang['Everybody'] = '모두';
+$lang['Who can see these photos?'] = '누가 이 사진들을 볼 수 있나요?';
+$lang['directories + files'] = '디렉토리 + 파일';
+$lang['only directories'] = '디렉토리만';
+$lang['nothing'] = '없음';
+$lang['synchronize files structure with database'] = '파일 구조를 데이터베이스와 동기화';
+$lang['Environment'] = '환경';
+$lang['Show info'] = '정보 보기';
\ No newline at end of file
diff --git a/sources/language/ko_KR/common.lang.php b/sources/language/ko_KR/common.lang.php
index 5760055..41dd0e7 100644
--- a/sources/language/ko_KR/common.lang.php
+++ b/sources/language/ko_KR/common.lang.php
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: 한국어 [KR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=509
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -72,7 +72,7 @@ $lang['Each listed rule must be satisfied.'] = '각각의 기준을 만족해야
 $lang['Email address'] = '메일 주소';
 $lang['Enter your personnal informations'] = '개인 정보를 입력해 주세요';
 $lang['Error sending email'] = '메일을 보내는 중 오류가 발생하였습니다';
-$lang['File name'] = '파일명';
+$lang['File name'] = '파일 이름';
 $lang['File'] = '파일';
 $lang['Filesize'] = '파일 크기';
 $lang['Filter and display'] = '필터 후 표시';
@@ -110,7 +110,7 @@ $lang['Tags'] = '태그';
 $lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'RSS 피드 알림은 이 사이트의 새 사진, 댓글, 업데이트된 앨범에 대해 알려줍니다. RSS 리더와 함께 사용하세요.';
 $lang['Unknown feed identifier'] = '알 수 없는 피드 식별자입니다';
 $lang['User comments'] = '사용자 댓글';
-$lang['Username'] = '사용자명';
+$lang['Username'] = '사용자 이름';
 $lang['Visits'] = '방문자';
 $lang['Webmaster'] = '웹마스터';
 $lang['Week %d'] = '이번주 %d';
@@ -317,7 +317,7 @@ $lang['N/A'] = 'N/A';
 $lang['Not repeat the slideshow'] = '슬라이드쇼 반복하지 않기';
 $lang['Number of photos per page'] = '페이지상 사진 수';
 $lang['Page not found'] = '페이지를 찾을 수 없습니다';
-$lang['Username: %s'] = '사용자명: %s';
+$lang['Username: %s'] = '사용자 이름: %s';
 $lang['Website'] = '웹사이트';
 $lang['You will receive a link to create a new password via email.'] = '이메일로 새로운 암호 설정을 위한 링크가 전송되었습니다.';
 $lang['Your password has been reset'] = '암호가 초기화 되었습니다.';
@@ -331,7 +331,7 @@ $lang['slideshow'] = '슬라이드쇼';
 $lang['square'] = '사각형';
 $lang['stop the slideshow'] = '슬라이드쇼 정지';
 $lang['the beginning'] = '시작';
-$lang['the username must be given'] = '사용자명이 필요합니다';
+$lang['the username must be given'] = '사용자 이름이 필요합니다';
 $lang['this email address is already in use'] = '이미 사용중인 이메일입니다';
 $lang['thumb'] = '대표사진';
 $lang['today'] = '오늘';
@@ -344,9 +344,9 @@ $lang['The passwords do not match'] = '암호가 일치하지 않습니다';
 $lang['Thumbnails'] = '썸네일';
 $lang['User "%s" has no email address, password reset is not possible'] = '사용자 "%s"의 이메일 정보가 없어, 암호 초기화가 불가능합니다.';
 $lang['User: %s'] = '사용자: %s';
-$lang['Username is mandatory'] = '사용자명은 필수 항목입니다.';
-$lang['Username modification'] = '사용자명 변경';
-$lang['Username or email'] = '사용자명 혹은 이메일';
+$lang['Username is mandatory'] = '사용자 이름은 필수 항목입니다.';
+$lang['Username modification'] = '사용자 이름 변경';
+$lang['Username or email'] = '사용자 이름 혹은 이메일';
 $lang['mandatory'] = '필수';
 $lang['Password: %s'] = '암호: %s';
 $lang['Pause of slideshow'] = '슬라이드쇼 일시정지';
@@ -360,8 +360,8 @@ $lang['Original'] = '원본';
 $lang['Mobile'] = '모바일';
 $lang['Bad request'] = '잘못된 요청';
 $lang['Email'] = '이메일';
-$lang['File name, A &rarr; Z'] = '파일명, A &rarr; Z';
-$lang['File name, Z &rarr; A'] = '파일명, Z &rarr; A';
+$lang['File name, A &rarr; Z'] = '파일 이름, A &rarr; Z';
+$lang['File name, Z &rarr; A'] = '파일 이름, Z &rarr; A';
 $lang['Go back to the album'] = '앨범으로 돌아가기';
 $lang['Last Page'] = '마지막 페이지';
 $lang['return to the display of all photos'] = '모든 사진 보기로 돌아가기';
@@ -392,17 +392,17 @@ $lang['Photo title, Z &rarr; A'] = '사진 제목, Z->A';
 $lang['Rating score, high &rarr; low'] = '평점, 내림차순';
 $lang['Rating score'] = '평점';
 $lang['useful when password forgotten'] = '암호를 잊은 경우를 대비';
-$lang['Username "%s" on gallery %s'] = '갤러리 %s에 있는 사용자명 "%s"';
+$lang['Username "%s" on gallery %s'] = '갤러리 %s에 있는 사용자 이름 "%s"';
 $lang['Tag results for'] = '태그 겸색 결과 : ';
 $lang['The number of photos per page must be a not null scalar'] = '페이지당 사진 수는 0이 아닌 정수여야 합니다';
 $lang['Password reset is not allowed for this user'] = '해당 사용자는 암호 초기화를 할 수 없습니다.';
-$lang['Please enter your username or email address.'] = '사용자명 혹은 이메일 주소를 입력하십시오.';
+$lang['Please enter your username or email address.'] = '사용자 이름 혹은 이메일 주소를 입력하십시오.';
 $lang['Specials'] = '특집';
 $lang['Registration of %s'] = '%s 등록';
 $lang['Search for all terms'] = '모든 단어로 검색';
 $lang['Search for any term'] = '아무 단어나 검색';
 $lang['Search for words'] = '단어로 검색';
-$lang['Your username has been successfully changed to : %s'] = '성공적으로 사용자명을 %s로 변경하였습니다.';
+$lang['Your username has been successfully changed to : %s'] = '성공적으로 사용자 이름을 %s로 변경하였습니다.';
 $lang['Numeric identifier, 1 &rarr; 9'] = '숫자 식별자, 1 &rarr; 9';
 $lang['Numeric identifier, 9 &rarr; 1'] = '숫자 식별자,  9 &rarr; 1';
 $lang['SQL queries in'] = 'SQL 쿼리에 ';
@@ -418,4 +418,10 @@ $lang['Password confirmation is missing. Please confirm the chosen password.'] =
 $lang['Password is missing. Please enter the password.'] = '암호가 입력되지 않았습니다. 암호를 입력하십시오.';
 $lang['%d photos per page'] = '페이지당 %d 개의 사진';
 $lang['Theme'] = '테마';
-?>
+$lang['Apply on properties'] = '속성 적용';
+$lang['Album name, A &rarr; Z'] = '앨범 이름, A &rarr; Z';
+$lang['Album name, Z &rarr; A'] = '앨범 이름, Z &rarr; A';
+$lang['Link: %s'] = '링크: %s';
+$lang['Photo description'] = '사진 설명';
+$lang['Photo title'] = '사진 제목';
+$lang['No results for'] = '다음의 검색 결과가 없음';
\ No newline at end of file
diff --git a/sources/language/ko_KR/install.lang.php b/sources/language/ko_KR/install.lang.php
index e45fb81..a9af4fb 100755
--- a/sources/language/ko_KR/install.lang.php
+++ b/sources/language/ko_KR/install.lang.php
@@ -1,24 +1,24 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 $lang['also given by your host provider'] = '호스팅 공급자가 제공';
 $lang['enter a login for webmaster'] = '웹마스터 사용자명을 입력하십시오';
@@ -33,15 +33,15 @@ $lang['Visitors will be able to contact site administrator with this mail'] = '
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = '데이터베이스 테이블 이름 앞에 추가됩니다 (데이터베이스 테이블을 잘 관리할 수 있도록 해 줍니다)';
 $lang['verification'] = '확인';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = '도움이 필요하신가요? <a href="%s">Piwigo message board</a>에 물어보세요.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'PHP5 설정에 실패했습니다';
-$lang['Try to configure PHP 5'] = 'PHP5 설정 시도중';
+$lang['Piwigo was not able to configure PHP 5.'] = 'PHP5.2 설정에 실패했습니다';
+$lang['Try to configure PHP 5'] = 'PHP5.2 설정 시도중';
 $lang['Welcome to my photo gallery'] = '사진 갤러리에 오신 것을 환영합니다';
 $lang['please enter your password again'] = '암호를 다시 입력하십시오';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = '또다른 방법으로는 위의 텍스트 상자에 있는 문장을 복사하여 "local/config/database.inc.php"에 복사하는 방법입니다.
 (경고: database.inc.php는 줄바꿈이나 스페이스 없이 위 텍스트 상자에 있는 내용만 포함해야 합니다. ';
 $lang['Congratulations, Piwigo installation is completed'] = '축하합니다, Piwigo설치가 끝났습니다';
 $lang['Default gallery language'] = '기본 언어';
-$lang['PHP 5 is required'] = 'PHP5가 필요합니다';
+$lang['PHP 5 is required'] = 'PHP5.2가 필요합니다';
 $lang['Password ']['confirm'] = '암호 [확인]';
 $lang['Sorry!'] = '죄송합니다!';
 $lang['Start Install'] = '설치 시작';
@@ -57,4 +57,11 @@ $lang['Download the config file'] = '설정파일 다운로드';
 $lang['Host'] = '트명호스트';
 $lang['Installation'] = '설치';
 $lang['It appears your webhost is currently running PHP %s.'] = '웹서버가 PHP %s를 사용중입니다';
-?>
\ No newline at end of file
+$lang['Hope to see you back soon.'] = '곧 다시 만나기를 바랍니다.';
+$lang['It will be shown to the visitors. It is necessary for website administration'] = '방문자에게 표시됩니다. 웹사이트 관리를 위해서 필요합니다.';
+$lang['Just another Piwigo gallery'] = '다른 Piwigo 갤러리';
+$lang['Keep it confidential, it enables you to access administration panel'] = '기밀 유지 하십시오. 관리자 패널에 접근할 수 있습니다.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo는 .htaccess 파일을 생성하거나 수정하여 PHP 5.2 구성으로 전환하려고 시도 할 수 있습니다.';
+$lang['Welcome to your new installation of Piwigo!'] = '새로 설치된 Piwigo에 오신 것을 환영합니다.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '호스팅 제공 업체의 지원 내용을 참고하여 직접 PHP 5.2로 전환하는 방법을 찾아야 합니다.';
+$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '참고 : 직접 구성을 변경한 다음 Piwigo를 다시 시작할 수 있습니다.';
\ No newline at end of file
diff --git a/sources/language/ko_KR/upgrade.lang.php b/sources/language/ko_KR/upgrade.lang.php
index 41f34da..601f884 100755
--- a/sources/language/ko_KR/upgrade.lang.php
+++ b/sources/language/ko_KR/upgrade.lang.php
@@ -1,24 +1,24 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 $lang['Only administrator can run upgrade: please sign in below.'] = '관리자만 업그레이드를 수행 할 수 있습니다: 로그인하십시오.';
 $lang['SQL queries'] = 'SQL 쿼리';
@@ -29,4 +29,11 @@ $lang['Upgrade informations'] = '업그레이드 정보';
 $lang['You do not have access rights to run upgrade'] = '업그레이드를 수행 할 권한이 없습니다';
 $lang['total SQL time'] = '총 SQL 수행시간';
 $lang['total upgrade time'] = '총 업그레이드 수행시간';
-?>
\ No newline at end of file
+$lang['This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).'] = '이 페이지는 이전 버전의 Piwigo에서 새 버전으로 데이터베이스로 업그레이드할 것을 제안합니다. 업그레이드 도우미가 <strong>정식 버전 %s</strong> (또는 유사한 버전)이 동작 중인 것으로 확인됩니다.';
+$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = '문제가 발생하었다면 [관리>도구>유지보수]에서 유지보수 점검을 실행하십시오.';
+$lang['User permissions and group permissions have been erased'] = '사용자와 그룹의 권한이 제거됨';
+$lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = '이전 환경설정에서 썸네일의 접두어와 웹마스터의 메일 주소만 저장되었습니다';
+$lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = '예방을 위해서 다음의 플러그인들이 비활성화되었습니다. 플러그인들을 재활성화하기 전에 업그레이드할 수 있는지 확인해야 합니다:';
+$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = '예방을 위해서 다음의 테마들이 비활성화되었습니다. 테마들을 재활성화하기 전에 업그레이드할 수 있는지 확인해야 합니다:';
+$lang['All sub-albums of private albums become private'] = '비공개 앨범의 모든 하위 앨범들은 비공개가 됩니다';
+$lang['In <i>%s</i>, before <b>?></b>, insert:'] = '<i>%s</i>에서 <b>?></b>전에 입력:';
diff --git a/sources/language/kok_IN/common.lang.php b/sources/language/kok_IN/common.lang.php
index be5de6f..c77eb43 100644
--- a/sources/language/kok_IN/common.lang.php
+++ b/sources/language/kok_IN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: कोंकणी [IN]
-Version: 2.5.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=660
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/lb_LU/common.lang.php b/sources/language/lb_LU/common.lang.php
index 9fc19a5..96c5619 100644
--- a/sources/language/lb_LU/common.lang.php
+++ b/sources/language/lb_LU/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Lëtzebuergesch [LU]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=715
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -366,4 +366,19 @@ $lang['display most recent photos'] = 'Weist déi neisten Fotoen';
 $lang['from %s to %s'] = 'vun %s bis %s';
 $lang['posted after %s (%s)'] = 'agesat nom %s (%s)';
 $lang['posted before %s (%s)'] = 'agesat virum  %s (%s)';
-$lang['posted on %s'] = 'agesat den %s';
\ No newline at end of file
+$lang['posted on %s'] = 'agesat den %s';
+$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'E-Mail-Adresse muss dem Muster xxx@yyy.eee (Beispiel: jack@altern.org) entspriechen';
+$lang['delete this photo from your favorites'] = 'Dës Foto aus de Favoritten läschen';
+$lang['delete all photos from your favorites'] = 'All Fotoen aus de Favoritten läschen';
+$lang['created before %s (%s)'] = 'erstallt virum %s (%s)';
+$lang['created between %s (%s) and %s (%s)'] = 'erstallt tëschent dem %s (%s) an dem %s (%s)';
+$lang['You will receive a link to create a new password via email.'] = 'Dir kritt e Link per E-mail fir e neit Passwuert ze erstellen';
+$lang['Your comment has been registered'] = 'Äre Kommentar ass gespäichert';
+$lang['created after %s (%s)'] = 'erstallt nom %s (%s)';
+$lang['Photo title'] = 'Bildtitel';
+$lang['Photo description'] = 'Bildbeschreiwung';
+$lang['Link: %s'] = 'Adress: %s';
+$lang['End-Date'] = 'Enddatum';
+$lang['Apply on properties'] = 'Eegenschaften iwerhuelen';
+$lang['Album name, Z &rarr; A'] = 'Albumnumm, Z &rarr; A';
+$lang['Album name, A &rarr; Z'] = 'Albumnumm, A &rarr; Z';
\ No newline at end of file
diff --git a/sources/language/lt_LT/admin.lang.php b/sources/language/lt_LT/admin.lang.php
index 77f130f..310faf4 100755
--- a/sources/language/lt_LT/admin.lang.php
+++ b/sources/language/lt_LT/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -455,7 +455,6 @@ $lang['Number of albums per page'] = 'Albumų skaičius puslapyje';
 $lang['Number of comments per page'] = 'Komentarų skaičius puslapyje';
 $lang['Number of downloads'] = 'Atsisiuntimų skaičius';
 $lang['Number of rates'] = 'Įvertinimų kiekis';
-$lang['Number of thumbnails to create'] = 'Sukurti piktogramų';
 $lang['Numeric identifier : %d'] = 'Skaitinis identifikatorius: %d';
 $lang['Obsolete Plugins'] = 'Pasenę priedai';
 $lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'Linux\'e paketu menedžerio pagalba tiesiog instaliuokite Shotwell, tuomet aktyvuokite "Piwigo publishing" parinktį.';
@@ -529,7 +528,6 @@ $lang['Lock'] = 'Užrakinti';
 $lang['Lock albums'] = 'Užrakinti albumus';
 $lang['Lock gallery'] = 'Užrakinti galerijas';
 $lang['Locked'] = 'Užrakinta';
-$lang['Mail address is obligatory for all users'] = 'Pašto adresas privalomas visiems vartotojams';
 $lang['Mail content'] = 'Pranešimo turinys';
 $lang['Mail sent to %s [%s].'] = 'Pranešimas išsiųstas %s [%s].';
 $lang['Main "guest" user does not exist'] = 'Pagrindinis "guest" vartotojas neegzistuoja';
@@ -629,7 +627,6 @@ $lang['new'] = 'nauja';
 $lang['no write access'] = 'nėra rašymo teisių';
 $lang['none'] = 'nė vienas';
 $lang['nothing'] = 'niekas';
-$lang['number of miniaturized photos'] = 'sukurta piktogramų';
 $lang['display'] = 'rodyti';
 $lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'rodyti maksimaliai informacijos (pridėti/pašalinti albumai ir nuotraukos)';
 $lang['dissociate from group'] = 'atskirti nuo grupės';
@@ -967,4 +964,16 @@ $lang['Users modified'] = 'Vartotojo informacija pakeista';
 $lang['Close user details'] = 'Užverti vartotojo detales';
 $lang['Open user details'] = 'Atverti vartotojo detales';
 $lang['close'] = 'uždaryti';
-$lang['Activate it now'] = 'Aktyvuoti dabar';
\ No newline at end of file
+$lang['Activate it now'] = 'Aktyvuoti dabar';
+$lang['No and unlock sub-albums'] = 'Ne ir atrakinti subalbumus';
+$lang['Allow users to add a link to their website'] = 'Leisti vartotojams pridėti nuorodą į savo puslapį';
+$lang['Empty caddie'] = 'Krepšelis tuščias';
+$lang['Impossible to deactivate the default theme.'] = 'Neįmanoma išjungti numatytosios temos.';
+$lang['Mail address is mandatory for registration'] = 'El. pašto adresas būtinas registracijai';
+$lang['The settings for the guest are from the %s user'] = 'Svečio nustatymai nustatyti iš %s vartotojo';
+$lang['Upload in progress'] = 'Įkeliama';
+$lang['based on'] = 'remiantis';
+$lang['between %s and %s MB'] = 'tarp %s ir %s MB';
+$lang['date & time'] = 'data ir laikas';
+$lang['file name'] = 'failo pavadinimas';
+$lang['width & height'] = 'plotis ir dydis';
\ No newline at end of file
diff --git a/sources/language/lt_LT/common.lang.php b/sources/language/lt_LT/common.lang.php
index c4422e9..ca847a2 100644
--- a/sources/language/lt_LT/common.lang.php
+++ b/sources/language/lt_LT/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Lietuviu [LT]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=648
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -432,4 +432,10 @@ $lang['Password confirmation is missing. Please confirm the chosen password.'] =
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Nav paroles apstiprinājuma. Lūdzu apstipriniet paroli.';
 $lang['%d photos per page'] = '%d nuotr. puslapyje';
 $lang['Theme'] = 'Tema';
-$lang['No results for'] = 'Nėra rezultatų';
\ No newline at end of file
+$lang['No results for'] = 'Nėra rezultatų';
+$lang['Album name, A &rarr; Z'] = 'Albumo pavadinimas, A &rarr; Ž';
+$lang['Album name, Z &rarr; A'] = 'Albumo pavadinimas, Ž &rarr; A';
+$lang['Apply on properties'] = 'Taikyti pakeitimus';
+$lang['Link: %s'] = 'Nuoroda: %s';
+$lang['Photo description'] = 'Nuotraukos aprašymas';
+$lang['Photo title'] = 'Nuotraukos pavadinimas';
\ No newline at end of file
diff --git a/sources/language/lt_LT/install.lang.php b/sources/language/lt_LT/install.lang.php
index f071681..0c48864 100755
--- a/sources/language/lt_LT/install.lang.php
+++ b/sources/language/lt_LT/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -27,24 +27,24 @@ $lang['Congratulations, Piwigo installation is completed'] = 'Sveikiname, Piwigo
 $lang['enter a login for webmaster'] = 'įveskite webmasterio vartotojo vardą';
 $lang['webmaster login can\'t contain characters \' or "'] = 'webmasterio vartotojo vardas negali turėti simbolių \' ar "';
 $lang['Start Install'] = 'Pradėti įdiegimą';
-$lang['Try to configure PHP 5'] = 'Pabandyti sukonfigūruoti PHP 5';
+$lang['Try to configure PHP 5'] = 'Pabandyti sukonfigūruoti PHP 5.2';
 $lang['Welcome to your new installation of Piwigo!'] = 'Prašom užeiti į naują Piwigo svetainę!';
 $lang['also given by your host provider'] = 'taip pat teikiamas Jūsų hostingo paslaugų tiekėjo';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Alternatyvus būdas - tai nukopijuoti tekstą iš lauko aukščiau ir įrašyti jį į "local/config/database.inc.php" failą. Dėmesio! database.inc.php turi būti įrašyta tik tai, kas yra textarea laukelyje, jokių tuščių eilučių ir tarpų.';
 $lang['user login given by your host provider'] = 'login, kurį davė jūsų paslaugų tiekėjas';
 $lang['user password given by your host provider'] = 'slaptažodis, kurį davė jūsų paslaugų tiekėjas';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Lankytojai šiuo el-pašto adresu galės susisiekti su administratorium';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Jūs turėtumėte kreiptis pagalbos į savo paslaugų tiekėją, kaip perjungti į PHP 5 pačiam.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Jūs turėtumėte kreiptis pagalbos į savo paslaugų tiekėją, kaip perjungti į PHP 5.2 pačiam.';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'šį prefiksą turės duomenų bazės lentelės (tai padeda geriau valdyti lenteles)';
 $lang['please enter your password again'] = 'dar sykį įveskite savo slaptažodį';
 $lang['verification'] = 'patikrinimas';
 $lang['Hope to see you back soon.'] = 'Iki greito pasimatymo.';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Reikia pagalbos ? Užduokite klausimą <a href="%s">Piwigo pranešimų lentoje</a>.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Dėmesio, jūs galite pakeisti savo konfigūraciją pats ir tada perkrauti Piwigo.';
-$lang['PHP 5 is required'] = 'reikalingas PHP 5';
+$lang['PHP 5 is required'] = 'reikalingas PHP 5.2';
 $lang['Password ']['confirm'] = 'Slaptažodis [pakartoti]';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo gali pamėginti perjungti Jūsų konfigūraciją į PHP5 sukuriant, ar modifikuojant, .htaccess failą.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo negalėjo sukonfigūruoti PHP 5';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo gali pamėginti perjungti Jūsų konfigūraciją į PHP5.2 sukuriant, ar modifikuojant, .htaccess failą.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo negalėjo sukonfigūruoti PHP 5.2';
 $lang['Sorry!'] = 'Apgailestaujame!';
 $lang['User'] = 'Vartotojas';
 $lang['Welcome to my photo gallery'] = 'Sveiki atvykę į mano foto galeriją';
@@ -64,5 +64,4 @@ $lang['It appears your webhost is currently running PHP %s.'] = 'Jūsų webhost\
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Tai bus rodoma lankytojams. Tai būtina puslapio administracijai';
 $lang['Just another Piwigo gallery'] = 'Tiesiog dar viena Piwigo galerija';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Saugokite tai slaptai, nes tai leidžia prisijungti prie administratoriaus valdymo skydo.';
-$lang['localhost or other, supplied by your host provider'] = 'localhost arba kitas, suteiktas jūsų paslaugų tiekėjo';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost arba kitas, suteiktas jūsų paslaugų tiekėjo';
\ No newline at end of file
diff --git a/sources/language/lt_LT/upgrade.lang.php b/sources/language/lt_LT/upgrade.lang.php
index 409323b..954833a 100755
--- a/sources/language/lt_LT/upgrade.lang.php
+++ b/sources/language/lt_LT/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/lv_LV/admin.lang.php b/sources/language/lv_LV/admin.lang.php
index 245c25c..2facc88 100644
--- a/sources/language/lv_LV/admin.lang.php
+++ b/sources/language/lv_LV/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -977,4 +977,13 @@ $lang['between %s and %s MB'] = 'starp %s un %s MB';
 $lang['width & height'] = 'platums&augstums';
 $lang['file name'] = 'faila nosaukums';
 $lang['date & time'] = 'datums&laiks';
-$lang['Upload in progress'] = 'Notiek augšupielāde';
\ No newline at end of file
+$lang['Upload in progress'] = 'Notiek augšupielāde';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Katram nosūtītajam e-pastam būs sava automātiskā autentifikācijas atslēga saitēm, derīga %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Drošības apsvērumu dēļ, autentifikācijas atslēgas nestrādā administratoriem.';
+$lang['No user is permitted to see this private album'] = 'Nevienam lietotājam nav atļauts redzēt šo privāto albumu';
+$lang['Y Repeat'] = 'YAtkārtojumi';
+$lang['Recipients'] = 'Saņēmēji';
+$lang['Orphans'] = 'Nezināmie';
+$lang['No recipient selected'] = 'Nav izvēlēts neviens saņēmējs';
+$lang['Edit user'] = 'Rediģēt lietotāju';
+$lang['Delete %d orphan photos'] = 'Dzēst %d nezināmos foto ';
\ No newline at end of file
diff --git a/sources/language/lv_LV/common.lang.php b/sources/language/lv_LV/common.lang.php
index 9553d94..0434d5d 100644
--- a/sources/language/lv_LV/common.lang.php
+++ b/sources/language/lv_LV/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Latviešu [LV]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=427
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -425,4 +425,5 @@ $lang['Photo title'] = 'Foto nosaukums';
 $lang['Photo description'] = 'Foto apraksts';
 $lang['Album name, A &rarr; Z'] = 'Albūma nosaukums, A &rarr; Z ';
 $lang['Album name, Z &rarr; A'] = 'Albūma nosaukums, Z &rarr; A ';
-$lang['Link: %s'] = 'Saite: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Saite: %s';
+$lang['Your authentication key is no longer valid.'] = 'Jūsu autentifikācijas atslēga vairs nav derīga';
\ No newline at end of file
diff --git a/sources/language/lv_LV/help/photos_add_ftp.html b/sources/language/lv_LV/help/photos_add_ftp.html
index 3f380df..76ccd4c 100644
--- a/sources/language/lv_LV/help/photos_add_ftp.html
+++ b/sources/language/lv_LV/help/photos_add_ftp.html
@@ -25,43 +25,39 @@
 
 <p>Kategoriju mapes atrodas Piwigo mapē "galleries". Tālāk seko ļoti mazas (bet ar ļoti daudz iespējām) galerijas mapju koks:</ p>
 
-<pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+
+    <pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
 </li>
 
-<li>Izņemot ar nosaukumu "thumbnail", "pwg_high" vai "pwg_representative" (skatīt skaidrojumu zemāk), katra mape zem "galleries" veido kategoriju. To dziļumam nav ierobežojumu.</li>
+<li>Izņemot ar nosaukumu "pwg_representative" vai "pwg_format (skatīt skaidrojumu zemāk), katra mape zem "galleries" veido kategoriju. To dziļumam nav ierobežojumu.</li>
 
 <li>Pamatā elementu pārstāv fails. Fails var būt Piwigo elements, ja tā paplašinājums ir starp <code>file_ext</code> konfigurācijas parametru iespējām (skatīt <span class="filename">include/config_default.inc.php</span> failu). Fails var būt attēls, ja tā paplašinājums ir starp <code>picture_ext</code> konfigurācijas parametru iespējām.</li>
 
@@ -71,6 +67,8 @@
 
 <li>Pēc noklusējuma ikonai, kas pārstāv faila nosaukuma paplašinājumu, nav nekādu papildus attēla elementu (video, skaņu, tekstu, jebkas...) . Ar papildus izvēli, Jūs varat sasaistīt sīkbildi un pārstāvošo failu (skatīt video.avi augstāk piemērā).</li>
 
+<li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
 <li><em>Brīdinājums</em>: mapju un failu nosaukumi jāveido tikai no burtiem, cipariem, "-", "_" vai ".". Nav pieļaujami tukšumi vai apakšsvītras.</li>
 
 <li>Kolīdz faili, sīkbildes un pārstāvības ir korekti saliktas mapēs, ejam uz: <span class="pwgScreen">Administrēšanu &raquo; Kategorijām &raquo; Sinchronizšānu</span></li>
diff --git a/sources/language/lv_LV/index.php b/sources/language/lv_LV/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/lv_LV/index.php
+++ b/sources/language/lv_LV/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/lv_LV/install.lang.php b/sources/language/lv_LV/install.lang.php
index 094ce46..bf72b9c 100644
--- a/sources/language/lv_LV/install.lang.php
+++ b/sources/language/lv_LV/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "Parole [apstiprinat]";
 $lang['verification'] = "parbaude";
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = "Vajag palidzibu? Uzdodiet savu jautajumu <a href=\"%s\">Piwigo sludinajumos</a>.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "Apmekletaji vares izmantot šo e-pastu, lai sazinatos ar lapas administratoru";
-$lang['PHP 5 is required'] = "nepieciešams PHP 5 ";
+$lang['PHP 5 is required'] = 'nepieciešams PHP 5.2 ';
 $lang['It appears your webhost is currently running PHP %s.'] = "Jusu webhosts patlaban izmanto PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo var meginat parslegt Jusu konfiguraciju uz  PHP 5 izveidojot vai modificejot  a .htaccess failu.";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo var meginat parslegt Jusu konfiguraciju uz  PHP 5.2 izveidojot vai modificejot  a .htaccess failu.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Jus varat izmanit savu konfiguraciju pats un pec tam parstartet Piwigo.";
-$lang['Try to configure PHP 5'] = "Meginiet nokonfiguret PHP 5";
+$lang['Try to configure PHP 5'] = 'Meginiet nokonfiguret PHP 5.2';
 $lang['Sorry!'] = "Atvainojiet!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo nevar nokonfiguret PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Jums javeršas pie Jusu hostinga pakalpojuma sniedzeja pec palidzibas un pašam jamegina parslegties uz PHP 5 atbalstu.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nevar nokonfiguret PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Jums javeršas pie Jusu hostinga pakalpojuma sniedzeja pec palidzibas un pašam jamegina parslegties uz PHP 5.2 atbalstu.';
 $lang['Hope to see you back soon.'] = "Ceram Jus redzet atkal.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Apsveicam, Piwigo instalacija ir pabeigta';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = ' Alternativa ir iekopet tekstu lodzina augšpuse un ielimet to faila "local/config/database.inc.php" (Uzmanibu : database.inc.php drikst saturet tikai to kas ir teksta lodzina, ne enter ne tukšumus)';
@@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Vēl viena Piwigo galerija';
 $lang['Welcome to my photo gallery'] = 'Laipni lūgti manā foto galerijā';
 $lang['Welcome to your new installation of Piwigo!'] = 'Laipni lūgti Jūsu Piwigo jaunajā instalācijā!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Nevilcinieties izmantot mūsu forumu palīdzību: %s';
-$lang['localhost or other, supplied by your host provider'] = 'vietējais pakalpojuma sniedzējs vai cits, tas ko atbalsta vietējais pakalpojuma sniedzējs';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'vietējais pakalpojuma sniedzējs vai cits, tas ko atbalsta vietējais pakalpojuma sniedzējs';
\ No newline at end of file
diff --git a/sources/language/lv_LV/upgrade.lang.php b/sources/language/lv_LV/upgrade.lang.php
index 0bbd253..79cfe56 100644
--- a/sources/language/lv_LV/upgrade.lang.php
+++ b/sources/language/lv_LV/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/mk_MK/admin.lang.php b/sources/language/mk_MK/admin.lang.php
index 2650bb1..696ad10 100644
--- a/sources/language/mk_MK/admin.lang.php
+++ b/sources/language/mk_MK/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/mk_MK/common.lang.php b/sources/language/mk_MK/common.lang.php
index 15a9153..a370bce 100644
--- a/sources/language/mk_MK/common.lang.php
+++ b/sources/language/mk_MK/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Македонски [MK]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=428
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/mk_MK/index.php b/sources/language/mk_MK/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/mk_MK/index.php
+++ b/sources/language/mk_MK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/mk_MK/install.lang.php b/sources/language/mk_MK/install.lang.php
index 02b43ab..1bea637 100755
--- a/sources/language/mk_MK/install.lang.php
+++ b/sources/language/mk_MK/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -31,6 +31,5 @@ $lang['Hope to see you back soon.'] = 'Се надеваме дека ќе се
 $lang['Installation'] = 'Инсталација';
 $lang['Sorry!'] = 'Извини !';
 $lang['Start Install'] = 'Стартувај ја инсталацијата';
-$lang['Try to configure PHP 5'] = 'Пробај да го сетираш PHP 5';
-$lang['User'] = 'Корисник';
-?>
\ No newline at end of file
+$lang['Try to configure PHP 5'] = 'Пробај да го сетираш PHP 5.2';
+$lang['User'] = 'Корисник';
\ No newline at end of file
diff --git a/sources/language/mn_MN/admin.lang.php b/sources/language/mn_MN/admin.lang.php
index a550e61..0782ce5 100755
--- a/sources/language/mn_MN/admin.lang.php
+++ b/sources/language/mn_MN/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -41,7 +41,7 @@ $lang['other'] = 'бусад';
 $lang['photos per page'] = '(нэг хуудсанд харагдах зураг)';
 $lang['ranks'] = 'түвшин';
 $lang['registered users'] = 'бүртгүүлсэн хэрэглэгчид';
-$lang['registration date'] = 'бүртгүүлсэн огноо';
+$lang['registration date'] = 'Бүртгүүлсэн огноо';
 $lang['remove tags'] = 'түлхүүр үгийг хасах';
 $lang['remove this filter'] = 'энэ сонголтыг хасах';
 $lang['test'] = 'шалгах';
@@ -311,8 +311,8 @@ $lang['Activate'] = 'Идэвхжүүлэх';
 $lang['Watermark'] = 'Усан хээ';
 $lang['Rename'] = 'Нэрийг солих';
 $lang['Position'] = 'Байршил';
-$lang['Number of comments per page'] = 'Нэг хуудасанд харуулах сэтгэгдэлийн тоо';
-$lang['Number of albums per page'] = 'Нэг хуудасанд харуулах цомгийн тоо';
+$lang['Number of comments per page'] = 'Нэг хуудсанд харуулах сэтгэгдэлийн тоо';
+$lang['Number of albums per page'] = 'Нэг хуудсанд харуулах цомгийн тоо';
 $lang['Number of rates'] = 'Үнэлсэн тоо';
 $lang['Main Page'] = 'Үндсэн хуудас';
 $lang['Activate comments'] = 'Сэтгэгдэлийг идэвхжүүлэх';
@@ -645,7 +645,7 @@ $lang['between %.2f and %.2f'] = '%.2f-с %.2f-н хооронд';
 $lang['between %d and %d pixels'] = '%d-с %d пикселийн хооронд';
 $lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'Зургийн хэмжээ %dx%d пиксель болж багсана.';
 $lang['Summary'] = 'Дүгнэлт';
-$lang['Show %s users'] = '%s хэрэглэгчдийг харуулах';
+$lang['Show %s users'] = '%s хэрэглэгчийг харуулах';
 $lang['Random photo'] = 'Дурын зураг';
 $lang['Name of the duplicate'] = 'Давхардсан нэр';
 $lang['Manage the members'] = 'Гишүүдийг зохицуулах';
@@ -744,4 +744,6 @@ $lang['high'] = 'өндөр';
 $lang['remove creation date'] = 'үүсгэсэн огноог хасах';
 $lang['unknown'] = 'үлмэдэгдэх';
 $lang['width & height'] = 'өргөн & өндөр';
-$lang['width must be a number superior to'] = 'өргөний хамгийн бага хэмжээ';
\ No newline at end of file
+$lang['width must be a number superior to'] = 'өргөний хамгийн бага хэмжээ';
+$lang['Opacity'] = 'Хамрах хүрээ';
+$lang['Mail address is mandatory for registration'] = 'Бүртгүүлэхэд имэйл хаяг заавал шаардах';
\ No newline at end of file
diff --git a/sources/language/mn_MN/common.lang.php b/sources/language/mn_MN/common.lang.php
index 0fe4068..eca165d 100644
--- a/sources/language/mn_MN/common.lang.php
+++ b/sources/language/mn_MN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Монгол [MN]
-Version: 2.7.2
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=696
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -237,7 +237,7 @@ $lang['delete this photo from your favorites'] = 'энэ зургийг дурт
 $lang['display your favorites photos'] = 'дуртай зурагнуудаа харах';
 $lang['The number of photos per page must be a not null scalar'] = 'Нэг хуудсанд харуулах зургийн тоо 0-с их байх ёстой';
 $lang['I want to add photos'] = 'Би зураг оруулмаар байна';
-$lang['Number of photos per page'] = 'Нэг хуудасанд харагдах зургын тоо';
+$lang['Number of photos per page'] = 'Нэг хуудсанд харагдах зургын тоо';
 $lang['%d photo is also linked to current tags'] = '%d зураг энэ түлхүүр үгтэй холбоотой байна';
 $lang['%d photos are also linked to current tags'] = '%d зураг энэ түлхүүр үгтэй холбоотой байна';
 $lang['Update your rating'] = 'Үнэлгээгээ шинэчлэх';
@@ -415,7 +415,7 @@ $lang['Go back to the album'] = 'Цомог уруу буцах';
 $lang['Last Page'] = 'сүүлийн хуудас';
 $lang['Password is missing. Please enter the password.'] = 'Уучлаарай. Нууц үгээ оруулна уу.';
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Нууц үгээ баталгаажуулж давтан оруулна уу.';
-$lang['%d photos per page'] = 'Нэг хуудасанд %d зураг';
+$lang['%d photos per page'] = 'Нэг хуудсанд %d зураг';
 $lang['Theme'] = 'Загвар';
 $lang['Photo description'] = 'Зургийн тайлбар';
 $lang['Photo title'] = 'Зургийн нэр';
@@ -423,4 +423,5 @@ $lang['Apply on properties'] = 'Тохиргоог хадгалах';
 $lang['No results for'] = 'Ийм үр дүн олдсонгүй';
 $lang['Album name, A &rarr; Z'] = 'Цомогын нэр, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Цомогын нэр, Z &rarr; A';
-$lang['Link: %s'] = 'Холбоос: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Холбоос: %s';
+$lang['Your authentication key is no longer valid.'] = 'Хүчингүй болсон баталгаажуулах код байна';
\ No newline at end of file
diff --git a/sources/language/mn_MN/install.lang.php b/sources/language/mn_MN/install.lang.php
index c9b3792..7ae8195 100755
--- a/sources/language/mn_MN/install.lang.php
+++ b/sources/language/mn_MN/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,10 +22,10 @@
 // +-----------------------------------------------------------------------+
 
 $lang['It appears your webhost is currently running PHP %s.'] = 'Таны вэбсервер PHP %s хувилбарыг ашиглаж байна';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo PHP 5-г тохиргоог өөрчилж чадсангүй';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo PHP 5.2-г тохиргоог өөрчилж чадсангүй';
 $lang['Congratulations, Piwigo installation is completed'] = 'Танд баяр хүргэе, Piwigo амжилттай сууж дууслаа.';
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Сервертэй амжилттай холбогдсон боловч мэдээллийн сантай холбогдох үед алдаа гарлаа.';
-$lang['Try to configure PHP 5'] = 'PHP 5 тохиргоогоо өөрчилж үзнэ үү';
+$lang['Try to configure PHP 5'] = 'PHP 5.2 тохиргоогоо өөрчилж үзнэ үү';
 $lang['User'] = 'Хэрэглэгч';
 $lang['Just another Piwigo gallery'] = 'Piwigo-н галерей нэгээр нэмэгдлээ';
 $lang['Database configuration'] = 'Мэдээллийн сангийн тохиргоо';
@@ -37,7 +37,7 @@ $lang['Password ']['confirm'] = 'Нууц үгээ давтах';
 $lang['Can\'t connect to server'] = 'Сервертэй холбогдож чадахгүй байна';
 $lang['Database name'] = 'Мэдээллийн сангын нэр';
 $lang['Default gallery language'] = 'Үндсэн хэл';
-$lang['PHP 5 is required'] = 'PHP 5 шаардлагатай';
+$lang['PHP 5 is required'] = 'PHP 5.2 шаардлагатай';
 $lang['Download the config file'] = 'Тохиргооны файлыг татах';
 $lang['Admin configuration'] = 'Админий тохиргоо';
 $lang['Basic configuration'] = 'Үндсэн тохиргоо';
@@ -59,5 +59,4 @@ $lang['You can download the config file and upload it to local/config directory
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Тохиргоогоо өөрөө өөрчлөөд Piwigo-г дахин ачаалж болно гэдгийг санаарай.';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Тусламж хэрэгтэй бол манай онлайн форумд хандаарай: %s';
 $lang['Host'] = 'Байршуулах компьютер';
-$lang['Installation'] = 'Суулгац';
-?>
\ No newline at end of file
+$lang['Installation'] = 'Суулгац';
\ No newline at end of file
diff --git a/sources/language/mn_MN/upgrade.lang.php b/sources/language/mn_MN/upgrade.lang.php
index eb3f3ca..e4a1a17 100755
--- a/sources/language/mn_MN/upgrade.lang.php
+++ b/sources/language/mn_MN/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ms_MY/common.lang.php b/sources/language/ms_MY/common.lang.php
index ccaaad6..92e0ca6 100644
--- a/sources/language/ms_MY/common.lang.php
+++ b/sources/language/ms_MY/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Malay [MY]
-Version: 2.5.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=645
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/nb_NO/admin.lang.php b/sources/language/nb_NO/admin.lang.php
index 4d8b0dc..4acf3b3 100644
--- a/sources/language/nb_NO/admin.lang.php
+++ b/sources/language/nb_NO/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -96,9 +96,9 @@ $lang['Linked albums'] = 'Linkede album';
 $lang['Lock gallery'] = 'Lås galleri';
 $lang['Maintenance'] = 'Vedlikehold';
 $lang['Edit album permissions'] = 'Rediger album rettigheter';
-$lang['Manage permissions for group "%s"'] = 'Behandle tillatelser for gruppen "%s"';
-$lang['Manage permissions for user "%s"'] = 'Behandle tillatelser for bruker "%s"';
-$lang['Manage tags'] = 'Behandle tags';
+$lang['Manage permissions for group "%s"'] = 'Rediger tillatelser for gruppen "%s"';
+$lang['Manage permissions for user "%s"'] = 'Rediger tillatelser for bruker "%s"';
+$lang['Manage tags'] = 'Rediger tagger';
 $lang['Members'] = 'Medlemmer';
 $lang['Metadata synchronized from file'] = 'Metadata synkronisert fra fil';
 $lang['Move albums'] = 'Flytt album';
@@ -181,7 +181,7 @@ $lang['Private'] = 'Privat';
 $lang['Public'] = 'Offentlig';
 $lang['Find a new representant by random'] = 'Finn en ny tilfeldig representant';
 $lang['Public / Private'] = 'Offentlig / Privat';
-$lang['Manage authorizations for selected albums'] = 'Behandle autorisasjoner for valgt album';
+$lang['Manage authorizations for selected albums'] = 'Rediger autorisasjoner for valgt album';
 $lang['Virtual album added'] = 'Virtuelt album lagt til';
 $lang['Virtual album deleted'] = 'Virtuelt album slettet';
 $lang['Access type'] = 'Tilgangstype type';
@@ -215,7 +215,7 @@ $lang['Lock'] = 'Lås';
 $lang['Locked'] = 'Låst';
 $lang['manage album photos'] = 'behandle album elementer';
 $lang['manage sub-albums'] = 'behandle grunn-album';
-$lang['Manage'] = 'Behandle';
+$lang['Manage'] = 'Rediger';
 $lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Prossessen svarer ikke, behandling fortsetter [Estimert tid: %d sekund].';
 $lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Prossessen svarer ikke, behandling fortsetter [Estimert tid: %d sekunder].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Tiden å forberede liste over brukere som vil bli mailet er begrenset. Andre brukere er ikke listet.';
@@ -508,7 +508,7 @@ $lang['Optimizations have been completed with some errors.'] = 'Optimalisering h
 $lang['Modify information'] = 'Endre informasjon';
 $lang['nothing'] = 'ingen ting';
 $lang['overrides existing values with empty ones'] = 'overskriver eksisterende verdier med tomme';
-$lang['Manage photo ranks'] = 'Behandle bilde rangering';
+$lang['Manage photo ranks'] = 'Rediger bilde rangering';
 $lang['Edit ranks'] = 'Rediger rangering';
 $lang['No photo in this album'] = 'Ingen elementer i dette album';
 $lang['Images manual order was saved'] = 'Bilders manuelle rekkefølge lagret';
@@ -560,7 +560,7 @@ $lang['Uploaded Photos'] = 'Opplastede bilder';
 $lang['%d photos uploaded'] = '%d foto opplastet';
 $lang['Privacy level set to "%s"'] = 'Privat nivå satt til "%s"';
 $lang['Album "%s" now contains %d photos'] = 'Album "%s" består nå av %d bilder';
-$lang['Manage this set of %d photos'] = 'Behandle disse %d bildene';
+$lang['Manage this set of %d photos'] = 'Rediger disse %d bildene';
 $lang['Select files'] = 'Velg filer';
 $lang['Everybody'] = 'Alle';
 $lang['Who can see these photos?'] = 'Hvem kan se disse bildene?';
@@ -596,7 +596,7 @@ $lang['Switch to clear or dark colors for administration'] = 'Bytt til lyse elle
 $lang['Theme has been successfully installed'] = 'Temaet er installert';
 $lang['Visit Gallery'] = 'Besøk galleriet';
 $lang['Visit Piwigo project website'] = 'Besøk Piwigo prosjektets webside';
-$lang['pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader står for <em>Piwigo Opplaster</em>. Fra din maskin, pLoader klargjør dine bilder og overfører demtil ditt Piwigo photo galleri.';
+$lang['pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader står for <em>Piwigo Opplaster</em>. Fra din maskin, pLoader klargjør dine bilder og overfører dem til ditt Piwigo photo galleri.';
 $lang['Guest Settings'] = 'Instillinger for gjester';
 $lang['Main Page'] = 'Hovedside';
 $lang['Photo Page'] = 'Bilde side';
@@ -758,7 +758,7 @@ $lang['I decide to update anyway'] = 'Jeg vil oppgradere allikevel';
 $lang['Ignore All'] = 'Ignorer alle';
 $lang['Ignore this update'] = 'Ignorer denne oppdatering';
 $lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Inkluder historisk data (Advarsel: serverens minne kan overstiges)';
-$lang['Manage Permissions'] = 'Behandle rettigheter';
+$lang['Manage Permissions'] = 'Rediger rettigheter';
 $lang['Maximum file size: %sB.'] = 'Maksimal filstørrelse: %sB.';
 $lang['Merge selected tags'] = 'Flett merkede bildetags';
 $lang['Merge tags'] = 'Flett bildetags';
@@ -917,7 +917,7 @@ $lang['Name of the duplicate'] = 'Navn på duplikater';
 $lang['Source tag'] = 'Kildetagg';
 $lang['Tag "%s" is now a duplicate of "%s"'] = 'Tagg "%s" er nå en duplikat av "%s"';
 $lang['Landscape'] = 'Liggende';
-$lang['Manage photos'] = 'Behandle bilder';
+$lang['Manage photos'] = 'Rediger bilder';
 $lang['Minimum height'] = 'Minimum høyde';
 $lang['Minimum width'] = 'Minimum bredde';
 $lang['Number of albums per page'] = 'Antall album pr side';
@@ -926,7 +926,7 @@ $lang['Portrait'] = 'Portrett';
 $lang['View in gallery'] = 'Se i galleri';
 $lang['Ratio'] = 'Ratio';
 $lang['Duplicate'] = 'Duplikat';
-$lang['Manage the members'] = 'Behandle medlemmene';
+$lang['Manage the members'] = 'Administrer medlemmer';
 $lang['Merge selected groups'] = 'Flett markerte grupper';
 $lang['No group selected, no action possible.'] = 'Ingen gruppe markert, kan ikke gjøre noe.';
 $lang['No members to manage'] = 'Ingen medlemmer å behandle';
@@ -978,4 +978,13 @@ $lang['based on'] = 'basert på';
 $lang['between %s and %s MB'] = 'mellom%s og %s MB';
 $lang['date & time'] = 'dato og klokkeslett';
 $lang['file name'] = 'filnavn';
-$lang['width & height'] = 'bredde og høyde';
\ No newline at end of file
+$lang['width & height'] = 'bredde og høyde';
+$lang['Delete %d orphan photos'] = 'Slett %d eierløse bilder';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Hver e-post som sendes vil inneholde sin egen automatiske autentiseringsnøkkel til lenker, gyldig for %s.';
+$lang['Edit user'] = 'Rediger bruker';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Av sikkerhetsmessige årsaker vil ikke autentiseringsnøkler fungere for administratorer.';
+$lang['No recipient selected'] = 'Ingen mottaker er valgt';
+$lang['No user is permitted to see this private album'] = 'Ingen brukeren har tillatelse til å se denne private album';
+$lang['Orphans'] = 'Eierløs';
+$lang['Recipients'] = 'Mottakere';
+$lang['Y Repeat'] = 'Y Gjenta';
\ No newline at end of file
diff --git a/sources/language/nb_NO/common.lang.php b/sources/language/nb_NO/common.lang.php
index db1ccf2..62ce74a 100644
--- a/sources/language/nb_NO/common.lang.php
+++ b/sources/language/nb_NO/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Norsk bokmål [NO]
-Version: 2.7.2
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=483
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -46,7 +46,7 @@ $lang['User: %s'] = "Bruker: %s";
 $lang['Email: %s'] = 'E-post: %s';
 $lang['Admin: %s'] = "Admin: %s";
 $lang['Registration of %s'] = "Registrering av %s";
-$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Feil status for bruker \"gjest\", default status vil bli brukt. Vennligst kontakt webmaster.";
+$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Feil status for bruker "gjest", standard status vil bli brukt. Vennligst kontakt webmaster.';
 $lang['this email address is already in use'] = 'En annen bruker har allerede denne e-postadressem';
 $lang['Tag results for'] = "Tag resultat for";
 $lang['from %s to %s'] = "fra %s til %s";
@@ -54,9 +54,9 @@ $lang['Play of slideshow'] = 'Start slideshow';
 $lang['Pause of slideshow'] = "Pause slideshow";
 $lang['Repeat the slideshow'] = "Gjenta slideshow";
 $lang['Not repeat the slideshow'] = "Ikke repeter slideshow";
-$lang['Reduce diaporama speed'] = "Reduser slideshow hastighet";
-$lang['Accelerate diaporama speed'] = "Øk slideshow hastighet";
-$lang['Submit'] = "Send";
+$lang['Reduce diaporama speed'] = 'Reduser hastighet på slideshow';
+$lang['Accelerate diaporama speed'] = 'Øk hastighet på slideshow';
+$lang['Submit'] = 'Lagre';
 $lang['Yes'] = "Ja";
 $lang['No'] = "Nei";
 $lang['%d photo'] = "%d bilde";
@@ -64,7 +64,7 @@ $lang['%d photos'] = "%d bilder";
 $lang['%d photo is also linked to current tags'] = '%d bilde er også linket til gjeldende stikkord';
 $lang['%d photos are also linked to current tags'] = '%d bilder er også linket til gjeldende stikkord';
 $lang['display photos linked to this tag'] = 'Se kun bilder linket til gjeldende stikkord';
-$lang['photos posted during the last %d days'] = "bilder postet innen de siste %d dager";
+$lang['photos posted during the last %d days'] = 'opplastede bilder de siste %d dager';
 $lang['Piwigo Help'] = "Piwigo hjelp";
 $lang['Rank'] = "Rangering";
 $lang['group by letters'] = "ordne etter bokstav";
@@ -74,7 +74,7 @@ $lang['cloud'] = 'sky';
 $lang['Reset to default values'] = "Sett tilbake til standard verdier";
 $lang['delete all photos from your favorites'] = "slett alle bilder fra dine favoritter";
 $lang['Sent by'] = "Sendt av";
-$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "Cookies er blokkert eller ikke støttet av din nettleser. Du må aktivere cookies for å logge inn.";
+$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Informasjonskapsler er blokkert eller ikke støttet av din nettleser. Du må aktivere informasjonskapsler for å logge inn.';
 $lang['day'][0] = 'Søndag';
 $lang['day'][1] = 'Mandag';
 $lang['day'][2] = 'Tirsdag';
@@ -99,7 +99,7 @@ $lang['Album'] = 'Album';
 $lang['Close this window'] = 'Lukk dette vinduet';
 $lang['Complete RSS feed (photos, comments)'] = 'Komplett RSS mating (bilder, kommentarer)';
 $lang['Confirm Password'] = 'Bekreft Passord';
-$lang['Connection settings'] = 'Tilkoblings innstillinger';
+$lang['Connection settings'] = 'Tilkoblingsinnstillinger';
 $lang['Login'] = 'Logg inn';
 $lang['Contact webmaster'] = 'Kontakt webmaster';
 $lang['Create a new account'] = 'Opprett ny konto';
@@ -112,13 +112,13 @@ $lang['Each listed rule must be satisfied.'] = 'Alle listede krav må være oppf
 $lang['Email address'] = 'E-postadresse';
 $lang['Enter your personnal informations'] = 'Skriv inn dine personlige data';
 $lang['Error sending email'] = 'Feil ved sending av e-post';
-$lang['File name'] = 'Fil navn';
+$lang['File name'] = 'Filnavn';
 $lang['File'] = 'Fil';
 $lang['Filesize'] = 'Filstørrelse';
 $lang['Filter and display'] = 'Filtrer og vis';
 $lang['Filter'] = 'Filter';
 $lang['Forgot your password?'] = 'Glemt passord?';
-$lang['Go through the gallery as a visitor'] = 'Naviger galleriet som gjest';
+$lang['Go through the gallery as a visitor'] = 'Naviger i galleriet som gjest';
 $lang['Help'] = 'Hjelp';
 $lang['Identification'] = 'Identifikasjon';
 $lang['Photos only RSS feed'] = 'Bare bilder RSS feed';
@@ -183,10 +183,10 @@ $lang['all'] = 'alle';
 $lang['ascending'] = 'stigende';
 $lang['author(s) : %s'] = 'forfatter(e) : %e';
 $lang['Expand all albums'] = 'Vis alle album';
-$lang['posted after %s (%s)'] = 'postet etter %s (%s)';
-$lang['posted before %s (%s)'] = 'postet before %s (%s)';
-$lang['posted between %s (%s) and %s (%s)'] = 'postet mellom %s (%s) og %s (%s)';
-$lang['posted on %s'] = 'postet den %s';
+$lang['posted after %s (%s)'] = 'opplastet etter %s (%s)';
+$lang['posted before %s (%s)'] = 'opplastet before %s (%s)';
+$lang['posted between %s (%s) and %s (%s)'] = 'opplastet mellom %s (%s) og %s (%s)';
+$lang['posted on %s'] = 'opplastet den %s';
 $lang['Best rated'] = 'Best rangert';
 $lang['display best rated photos'] = 'vis de best rangerte bildene';
 $lang['Calendar'] = 'Kalender';
@@ -201,17 +201,17 @@ $lang['comment date'] = 'Kommentert dato';
 $lang['Comment'] = 'kommentar';
 $lang['Your comment has been registered'] = 'Din kommentar er registrert';
 $lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Overbuffringsvern : Vennligst vent før du prøver å legge til den ny kommentar';
-$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Din kommentar har IKKE blitt registrert da den ikke ble validert';
+$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Din kommentar har IKKE blitt registrert da den ikke ble godkjent';
 $lang['An administrator must authorize your comment before it is visible.'] = 'En administrator må godkjenne din kommentar før den blir synlig.';
 $lang['This login is already used by another user'] = 'Denne innloggingen er allerede i bruk.';
 $lang['Comments'] = 'Kommentarer';
 $lang['Add a comment'] = 'Legg til en kommentar';
-$lang['created after %s (%s)'] = 'oprettet etter %s (%s)';
+$lang['created after %s (%s)'] = 'opprettet etter %s (%s)';
 $lang['created before %s (%s)'] = 'opprettet før %s (%s)';
 $lang['created between %s (%s) and %s (%s)'] = 'opprettet mellom %s (%s) og %s (%s)';
 $lang['created on %s'] = 'opprettet den %s';
-$lang['Customize'] = 'Egendefinert';
-$lang['Your Gallery Customization'] = 'Ditt galleri egendefinert';
+$lang['Customize'] = 'Tilpass';
+$lang['Your Gallery Customization'] = 'Innstillinger for ditt galleri';
 $lang['Default'] = 'Standard';
 $lang['delete this photo from your favorites'] = 'slett bildet fra dine favoritter';
 $lang['Delete'] = 'Slett';
@@ -258,8 +258,8 @@ $lang['New password'] = 'Nytt passord';
 $lang['Rate this photo'] = 'Gi karakter på dette bildet';
 $lang['Next'] = 'Neste';
 $lang['no rate'] = 'ingen karakter';
-$lang['Photos posted within the last %d day.'] = 'Elementer posted kun de %d siste dager.';
-$lang['Photos posted within the last %d days.'] = 'Elementer posted kun de %d siste dager.';
+$lang['Photos posted within the last %d day.'] = 'Kun opplastede bilder den %d siste dagen.';
+$lang['Photos posted within the last %d days.'] = 'Kun opplastede bilder de %d siste dager.';
 $lang['password updated'] = 'passord oppdatert';
 $lang['Recent period must be a positive integer value'] = 'Siste periode må være en positiv verdi';
 $lang['photo'] = 'bilde';
@@ -277,10 +277,10 @@ $lang['Recent photos'] = 'Siste bilder';
 $lang['display most recent photos'] = 'Viser de sist sette bilder';
 $lang['Redirection...'] = 'Videresender...';
 $lang['Please, enter a login'] = 'Vennligst logg inn';
-$lang['login mustn\'t end with a space character'] = 'login må ikke ende med et mellomrom';
-$lang['login mustn\'t start with a space character'] = 'login må ikke starte med et mellomrom';
+$lang['login mustn\'t end with a space character'] = 'brukernavn kan ikke ende med et mellomrom';
+$lang['login mustn\'t start with a space character'] = 'brukernavn kan ikke starte med et mellomrom';
 $lang['this login is already used'] = 'denne innloggingen er allerede i bruk';
-$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'mail addresse må være tilsvarende xxx@yyy.eee (eksempel : jack@altern.org)';
+$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'mailaddresse må være tilsvarende xxx@yyy.eee (eksempel : jack@altern.org)';
 $lang['Auto login'] = 'Auto innlogging';
 $lang['%d Kb'] = '%d Kb';
 $lang['Week %d'] = 'Uke %d';
@@ -300,7 +300,7 @@ $lang['Search results'] = 'Søke resultat';
 $lang['Search in sub-albums'] = 'Søk i under-album';
 $lang['searched words : %s'] = 'søkte ord : %';
 $lang['Contact'] = 'Kontakt';
-$lang['set as album representative'] = 'sett som album representant';
+$lang['set as album representative'] = 'bruk som albumets miniatyrbilde';
 $lang['Show number of comments'] = 'Vis antall kommentarer';
 $lang['Show number of hits'] = 'Vis antall treff';
 $lang['slideshow'] = 'slideshow';
@@ -322,10 +322,10 @@ $lang['Edit a comment'] = 'Endre en kommentar';
 $lang['Are you sure?'] = 'Er du sikker?';
 $lang['(!) This comment requires validation'] = '(!) Denne kommentaren krever godkjenning';
 $lang['Welcome'] = 'Velkommen';
-$lang['Welcome to your Piwigo photo gallery!'] = 'Velkommen til din Piwigo photo gallery!';
+$lang['Welcome to your Piwigo photo gallery!'] = 'Velkommen til ditt Piwigo bildegalleri!';
 $lang['... or browse your empty gallery'] = '... eller bla i ditt tomme galleri';
 $lang['... or please deactivate this message, I will find my way by myself'] = '... eller vennligst deaktiver denne beskjeden, jeg vil finne ut av det selv';
-$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hallo %, ditt Piwigo photo gallery er tomt!';
+$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hallo %s, ditt Piwigo bildegalleri er tomt!';
 $lang['I want to add photos'] = 'Jeg vil legge til foto';
 $lang['Manage this user comment: %s'] = 'Behandle denne brukers kommentar: %s';
 $lang['Email address is missing. Please specify an email address.'] = 'E-postadresse mangler. Vennligst skriv en e-postadresse.';
@@ -338,7 +338,7 @@ $lang['Enter your new password below.'] = 'Skriv inn ditt nye passord.';
 $lang['EXIF Metadata'] = 'Avansert bildedata';
 $lang['Hello %s,'] = 'Hei %s,';
 $lang['html tags are not allowed in login'] = 'html-kode er ikke lov i brukernavn/passord';
-$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Hvis dette var en feiltagelse, bare ignorer denne epost, ingen ting vil skje.';
+$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Hvis dette var en feiltagelse, bare ignorer denne epost, ingenting vil skje.';
 $lang['Invalid key'] = 'Feil nøkkel';
 $lang['Invalid username or email'] = 'Feil brukernavn eller passord';
 $lang['IPTC Metadata'] = 'Bildedata';
@@ -424,4 +424,5 @@ $lang['Photo description'] = 'Bildebeskrivelse';
 $lang['Photo title'] = 'Bildetittel';
 $lang['Album name, A &rarr; Z'] = 'Albumnavn, A %rarr; Å';
 $lang['Album name, Z &rarr; A'] = 'Albumnavn, Å %rarr; A';
-$lang['Link: %s'] = 'Lenke: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Lenke: %s';
+$lang['Your authentication key is no longer valid.'] = 'Din autentiseringsnøkkel er ikke lenger gyldig.';
\ No newline at end of file
diff --git a/sources/language/nb_NO/help/photos_add_ftp.html b/sources/language/nb_NO/help/photos_add_ftp.html
index 50028f0..dbbd9b4 100644
--- a/sources/language/nb_NO/help/photos_add_ftp.html
+++ b/sources/language/nb_NO/help/photos_add_ftp.html
@@ -36,42 +36,36 @@ Gratulerer! Du har nå laget ditt første album i ditt foto galleri.
 galleri (men bruker mange muligheter):</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- gallerier
-|   |-- album-1
-|   |   |-- album-1.1
-|   |   |   |-- album-1.1.1
-|   |   |   |   |-- album-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- miniatyrbilder
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- album-1.1.1.2
-|   |   |   +-- album-1.1.2
-|   |   |-- album-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- miniatyrbilder
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- album-1.3
-|   +-- album-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- miniatyrbilder
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
-
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
   </li>
 
-  <li>Untagen de med navnet "miniatyrbilder", "pwg_high" eller "pwg_representative" (se forklaring
+  <li>Untagen de med navnet "pwg_representative" eller "pwg_format" (se forklaring
 
 under), vil hver mappe under "gallerier" representerer et album. Det er ingen begrensning på dybden
 
@@ -98,6 +92,8 @@ standard med et icon tillhørende fil endelsen. Valgfritt, kan du assosiere et m
 
 og en representativ fil (se video.avi i eksempelet over).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Advarsel</em>: navnet på mapper og filer må kun inneholde bokstaver, figurer, "-", "_"
 
 eller ".". Ingen tomme mellomrom, ei heller opphøyde karakterer.</li>
@@ -109,35 +105,3 @@ class="pwgScreen">Administrasjon &raquo; Verktøy &raquo;
 
 </ul>
 </fieldset>
-
-<fieldset>
-  <legend>Miniatyr bilder</legend>
-<ul>
-
-  <li>Hvert bilde må ha sitt miniatyr bilde.</li>
-
-  <li>Miniatyr bilde blir lagret i "miniatyrbilde " under mappe i album
-  mappen. Miniatyr bildene har det samme filnavnet som bildet det passer opp mot, med konfigurasjons
-
-parametrene <code>prefix_thumbnail</code> som prefix (se <span
-
-class="filename">inkluder/config.inc.php</span>).</li>
-
-  <li>Miniatyr bilde filer bør ikke nødvendigvis ha samme fil endelse som det assosierte bildet (Eks
-
-".jpg" bilde kan ha ".GIF" endelse).</li>
-
-  <li>Det anbefales å bruker en ekstern modul for å lage miniatyr bilder.</li>
-
-  <li>Bruken av miniatyr bilde oprettelses verktøyet integrert i Piwigo er ikke anbefalt, Dette
-
-fordi den resulterte kvaliteten kan være skuffende og den vil bruke mye server ressurser (Dette kan
-
-være et stort problem på en delt server).
-
-  <li>Om du vleger å bruker web serveren til å lage miniatyr bilder, må du gi skrive rettigheter på
-
-alle album mappene.</li>
-
-</ul>
-</fieldset>
\ No newline at end of file
diff --git a/sources/language/nb_NO/index.php b/sources/language/nb_NO/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/nb_NO/index.php
+++ b/sources/language/nb_NO/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/nb_NO/install.lang.php b/sources/language/nb_NO/install.lang.php
index 57f4c8c..6d50f9d 100644
--- a/sources/language/nb_NO/install.lang.php
+++ b/sources/language/nb_NO/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Passord [bekreft]';
 $lang['verification'] = 'verifisering';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Trenger du hjelp? Still et spørsmål på <a href="%s">Piwigo message board</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Besøkende vil kunne bruke denne mailen for å kontakte side administrator.';
-$lang['PHP 5 is required'] = 'PHP 5 er nødvendig';
+$lang['PHP 5 is required'] = 'PHP 5.2 er nødvendig';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Det kan se ut som om din leverandør kjører PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve å endre din konfigurasjon til PHP 5 ved å lage eller modifisere en .htaccess fil.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve å endre din konfigurasjon til PHP 5.2 ved å lage eller modifisere en .htaccess fil.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Merk, du kan endre din konfigurasjon selv og restarte Piwigo etter dette.';
-$lang['Try to configure PHP 5'] = 'Prøve å konfigurere PHP 5';
+$lang['Try to configure PHP 5'] = 'Prøve å konfigurere PHP 5.2';
 $lang['Sorry!'] = 'Beklager!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke i stand til å konfigurere PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du kan sjekke din web tilbyder\'e support og se om du kan endre til PHP 5 selv.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke i stand til å konfigurere PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du kan sjekke din web tilbyder\'e support og se om du kan endre til PHP 5.2 selv.';
 $lang['Hope to see you back soon.'] = 'Håper vi sees snart.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gratulerer, Piwigo installasjonen er ferdig';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'En alternativ løsning er å kopiere teksten fra tekst boksen over og lime det inn i filen "local/config/database.inc.php" (Advarsel: database.inc.php må kun inneholde hva som ligger i tekstområdet, ingen ny linje eller mellomrom)';
@@ -64,5 +64,4 @@ $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Ikke nøl me
 $lang['Just another Piwigo gallery'] = 'Enda et Piwigo bildegalleri';
 $lang['Welcome to my photo gallery'] = 'Velkommen til mitt bildegalleri';
 $lang['Welcome to your new installation of Piwigo!'] = 'Velkommen til din nye installasjon av Piwigo!';
-$lang['localhost or other, supplied by your host provider'] = 'lokal tjener eller annen tjenesteleverandør';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'lokal tjener eller annen tjenesteleverandør';
\ No newline at end of file
diff --git a/sources/language/nb_NO/upgrade.lang.php b/sources/language/nb_NO/upgrade.lang.php
index 7d053af..85da5ca 100644
--- a/sources/language/nb_NO/upgrade.lang.php
+++ b/sources/language/nb_NO/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/nl_NL/admin.lang.php b/sources/language/nl_NL/admin.lang.php
index 722228a..63a46a5 100644
--- a/sources/language/nl_NL/admin.lang.php
+++ b/sources/language/nl_NL/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -286,7 +286,7 @@ $lang['no write access'] = 'geen schrijftoegang';
 $lang['Permissions'] = 'Rechten';
 $lang['private'] = 'Privé';
 $lang['public'] = 'Publiek';
-$lang['Purge never used notification feeds'] = 'Verwijder feeds met nooit met gebruikte meldingen';
+$lang['Purge never used notification feeds'] = 'Verwijder feeds met nooit gebruikte meldingen';
 $lang['Purge sessions'] = 'Verwijder sessies';
 $lang['randomly represented'] = 'willekeurig album-klikplaatje';
 $lang['registration date'] = 'Registratiedatum';
@@ -410,8 +410,8 @@ $lang['guest'] = 'gast';
 $lang['default values'] = 'Standaard waarden';
 $lang['Guest cannot be deleted'] = 'Gast kan niet verwijderd worden';
 $lang['Default user cannot be deleted'] = 'Standaard gebruiker kan niet verwijderd worden';
-$lang['Purge history detail'] = 'Details van de filtergeschiedenis';
-$lang['Purge history summary'] = 'Overzicht van de filtergeschiedenis';
+$lang['Purge history detail'] = 'Verwijder details van de geschiedenis';
+$lang['Purge history summary'] = 'Verwijder overzicht van de geschiedenis';
 $lang['Check integrity'] = 'Controleer integriteit';
 $lang['Anomaly'] = 'Onregelmatigheid';
 $lang['Correction'] = 'Correctie';
@@ -525,7 +525,7 @@ $lang['Piwigo Announcements Newsletter'] = 'Piwigo Aankondigings Nieuwsbrief';
 $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Hou contact met het Piwigo project, abonneer u op de Piwigo Aankondigings Nieuwsbrief. Dan ontvangt u een email wanneer een nieuwe Piwigo-release beschikbaar komt, wanneer een belangrijke beveiligings bugfix nodig is of wanneer belangrijke ontwikkelingen binnen het Piwigo-project plaatsvinden. Alles bij elkaar een paar emails per jaar.';
 $lang['Subscribe %s'] = 'Abonneer %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonneer %s op de Piwigo Aankondigings Nieuwsbrief';
-$lang['Purge search history'] = 'Verwijder de Zoek-geschiedenis';
+$lang['Purge search history'] = 'Verwijder de zoek-geschiedenis';
 $lang['Hide'] = 'Verberg';
 $lang['Password is missing. Please enter the password.'] = 'Wachtwoord ontbreekt. Geef uw wachtwoord aub.';
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Wachtwoord-bevestiging ontbreekt. Bevestig aub uw gekozen wachtwoord.';
@@ -982,4 +982,13 @@ $lang['width & height'] = 'breedte & hoogte';
 $lang['date & time'] = 'datum & tijd';
 $lang['between %s and %s MB'] = 'tussen %s en %s MB';
 $lang['based on'] = 'gebaseerd op';
-$lang['Upload in progress'] = 'Bezig met uploaden';
\ No newline at end of file
+$lang['Upload in progress'] = 'Bezig met uploaden';
+$lang['Y Repeat'] = 'Y Herhaal';
+$lang['Orphans'] = 'Wezen';
+$lang['No user is permitted to see this private album'] = 'Geen enkele gebruiker heeft toelating dit private album te bekijken';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Om veiligheidsredenen werken authenticatiesleutels niet voor beheerders.';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Elke verzonden email zal in de links automatisch een authenticatiesleutel krijgen die geldig is voor %s.';
+$lang['Delete %d orphan photos'] = 'Verwijder %d achtergebleven foto\'s';
+$lang['Recipients'] = 'Ontvangers';
+$lang['Edit user'] = 'Wijzig gebruiker';
+$lang['No recipient selected'] = 'Geen ontvanger geselecteerd';
\ No newline at end of file
diff --git a/sources/language/nl_NL/common.lang.php b/sources/language/nl_NL/common.lang.php
index 60ef2de..c42b9d8 100644
--- a/sources/language/nl_NL/common.lang.php
+++ b/sources/language/nl_NL/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Nederlands [NL]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=429
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -232,8 +232,8 @@ $lang['Show file metadata'] = 'Laat bestandsmetadata zien';
 $lang['Powered by'] = 'Mede mogelijk gemaakt door';
 $lang['Preferences'] = 'Voorkeuren';
 $lang['Previous'] = 'Vorige';
-$lang['Random photos'] = 'Onwillekeurige foto\'s';
-$lang['display a set of random photos'] = 'Geef een aantal onwillekeurig gekozen foto\'s weer';
+$lang['Random photos'] = 'Willekeurige foto\'s';
+$lang['display a set of random photos'] = 'Geef een aantal willekeurig gekozen foto\'s weer';
 $lang['Recent albums'] = 'Recente albums';
 $lang['display recently updated albums'] = 'geef recent bijgewerkte albums weer';
 $lang['Recent period'] = 'Recente periode';
@@ -391,14 +391,14 @@ $lang['File name, Z &rarr; A'] = 'Bestandsnaam, Z &rarr; A';
 $lang['Manual sort order'] = 'Handmatige sorteervolgorde';
 $lang['Numeric identifier, 1 &rarr; 9'] = 'Nummers, 1 &rarr; 9';
 $lang['Numeric identifier, 9 &rarr; 1'] = 'Nummers, 9 &rarr; 1';
-$lang['Photo title, A &rarr; Z'] = 'Fototitle, A &rarr; Z';
+$lang['Photo title, A &rarr; Z'] = 'Fototitel, A &rarr; Z';
 $lang['Photo title, Z &rarr; A'] = 'Fototitel, Z &rarr; A';
 $lang['Rating score, high &rarr; low'] = 'Waarderingsscore, hoog &rarr; laag';
 $lang['Rating score, low &rarr; high'] = 'Waarderingsscore, laag &rarr; hoog';
 $lang['Visits, high &rarr; low'] = 'Bezoeken, hoog &rarr; laag';
 $lang['Visits, low &rarr; high'] = 'Bezoeken, laag %rarr; hoog';
 $lang['xsmall'] = 'XS - extra klein';
-$lang['%d rate'] = '%d tarief';
+$lang['%d rate'] = '%d stem(men)';
 $lang['Bad request'] = 'Foutief verzoek';
 $lang['Forbidden'] = 'Verboden';
 $lang['Page not found'] = 'Pagina niet gevonden';
@@ -444,4 +444,5 @@ $lang['month']['5'] = 'Mei';
 $lang['month']['6'] = 'Juni';
 $lang['month']['7'] = 'Juli';
 $lang['month']['8'] = 'Augustus';
-$lang['month']['9'] = 'September';
\ No newline at end of file
+$lang['month']['9'] = 'September';
+$lang['Your authentication key is no longer valid.'] = 'Uw authenticatie sleutel is niet langer geldig.';
\ No newline at end of file
diff --git a/sources/language/nl_NL/help/index.php b/sources/language/nl_NL/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/nl_NL/help/index.php
+++ b/sources/language/nl_NL/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/nl_NL/help/photos_add_ftp.html b/sources/language/nl_NL/help/photos_add_ftp.html
index b9997a9..262f2db 100644
--- a/sources/language/nl_NL/help/photos_add_ftp.html
+++ b/sources/language/nl_NL/help/photos_add_ftp.html
@@ -26,38 +26,33 @@
     <p>Categorie mappen zijn in de Piwigo map "galleries". Bekijk de mapstructuur van een kleine gallerie (maar met een hoop mogelijkheden) :</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- categorie-1
-|   |   |-- categorie-1.1
-|   |   |   |-- categorie-1.1.1
-|   |   |   |   |-- categorie-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- categorie-1.1.1.2
-|   |   |   +-- categorie-1.1.2
-|   |   |-- categorie-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- categorie-1.3
-|   +-- categorie-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
diff --git a/sources/language/nl_NL/index.php b/sources/language/nl_NL/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/nl_NL/index.php
+++ b/sources/language/nl_NL/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/nl_NL/install.lang.php b/sources/language/nl_NL/install.lang.php
index 22a95bc..8228d61 100644
--- a/sources/language/nl_NL/install.lang.php
+++ b/sources/language/nl_NL/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Bevestig wachtwoord';
 $lang['verification'] = 'verificatie';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Hulp nodig ? Stel uw vraag op het <a href="%s" target="_blank">Piwigo forum</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Met dit email-adres kunnen bezoekers contact opnemen met de beheerder';
-$lang['PHP 5 is required'] = 'PHP 5 is vereist';
+$lang['PHP 5 is required'] = 'PHP 5.2 is vereist';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Het lijkt er op dat uw webhost momenteel gebruik maakt van PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan proberen uw configuratie om te zetten naar PHP 5 door het aanmaken of wijzigen van een .htaccess bestand.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan proberen uw configuratie om te zetten naar PHP 5.2 door het aanmaken of wijzigen van een .htaccess bestand.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Opmerking: u kunt uw configuratie ook zelf aanpassen en daarna Piwigo opnieuw opstarten.';
-$lang['Try to configure PHP 5'] = 'Probeer PHP 5 te configureren';
+$lang['Try to configure PHP 5'] = 'Probeer PHP 5.2 te configureren';
 $lang['Sorry!'] = 'Sorry!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kon PHP 5 niet configureren.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Neem contact op met de support van uw hosting provider en probeer met hen te bepalen hoe u kunt omschakelen naar PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kon PHP 5.2 niet configureren.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Neem contact op met de support van uw hosting provider en probeer met hen te bepalen hoe u kunt omschakelen naar PHP 5.2';
 $lang['Hope to see you back soon.'] = 'Hoop u snel weer te zien op deze site !.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gefeliciteerd, de Piwigo installatie is afgerond';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Als alternatieve oplossing kunt u de tekst in de bovenstaande box kopiëren en plakken in bestand "local/config/database.inc.php" (Opgelet : in database.inc.php mag alleen datgene staan dat in het tekstgebied staat, geen return- of spatie-tekens)';
@@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Alweer een Piwigo galerie';
 $lang['Welcome to my photo gallery'] = 'Welkom bij mijn foto galerie';
 $lang['Welcome to your new installation of Piwigo!'] = 'Welkom bij uw nieuwe installatie van Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Aarzel niet om onze forum\'s te raadplegen voor hulp: %s';
-$lang['localhost or other, supplied by your host provider'] = 'localhost of andere, geleverd door uw provider';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost of andere, geleverd door uw provider';
\ No newline at end of file
diff --git a/sources/language/nl_NL/upgrade.lang.php b/sources/language/nl_NL/upgrade.lang.php
index 4bde42f..2336ebf 100644
--- a/sources/language/nl_NL/upgrade.lang.php
+++ b/sources/language/nl_NL/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/nn_NO/admin.lang.php b/sources/language/nn_NO/admin.lang.php
index 21e5459..b5b39f0 100755
--- a/sources/language/nn_NO/admin.lang.php
+++ b/sources/language/nn_NO/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -882,7 +882,6 @@ $lang['Piwigo export plugin for iPhoto'] = 'Piwigo tilleggsprogram for eksport f
 $lang['Piwigo publish plugin for Shotwell'] = 'Piwigo tilleggsprogram for eksport frå Shotwell';
 $lang['Piwigo publish plugin for digiKam'] = 'Piwigo tilleggsprogram for eksport frå digiKam';
 $lang['Predefined filter'] = 'Førehandsdefinera filter';
-$lang['Mail address is obligatory for all users'] = 'E-postadresse er påkrevd for alle brukarar';
 $lang['Main "guest" user does not exist'] = 'Hovudbrukaren "gjest" finst ikkje';
 $lang['Main "guest" user status is incorrect'] = 'Hovudbrukaren "gjest" sin status er feil';
 $lang['Main "webmaster" user does not exist'] = 'Hovudbrukaren "webmaster" finst ikkje';
@@ -966,4 +965,15 @@ $lang['Close user details'] = 'Lukk brukardetaljar';
 $lang['Open user details'] = 'Opne brukardetaljar';
 $lang['close'] = 'lukk';
 $lang['Activate it now'] = 'Aktiver nå';
-$lang['Allow users to add a link to their website'] = 'Gje brukarar mogleghet til å legge inn lenke til si nettside';
\ No newline at end of file
+$lang['Allow users to add a link to their website'] = 'Gje brukarar mogleghet til å legge inn lenke til si nettside';
+$lang['Empty caddie'] = 'Tøm caddie';
+$lang['Impossible to deactivate the default theme.'] = 'Ikkje mogleg å deaktivere standard utsjånad';
+$lang['Mail address is mandatory for registration'] = 'E-post adresse er påkrevd for å registrere';
+$lang['No and unlock sub-albums'] = 'Nei og lås opp del-album';
+$lang['The settings for the guest are from the %s user'] = 'Instillingar for gjest er frå brukar %s';
+$lang['Upload in progress'] = 'Opplasting i gang';
+$lang['based on'] = 'med utgangspunkt i';
+$lang['between %s and %s MB'] = 'mellom %s og %s MB';
+$lang['date & time'] = 'dato og tid';
+$lang['file name'] = 'filnamn';
+$lang['width & height'] = 'breidde og høgde';
\ No newline at end of file
diff --git a/sources/language/nn_NO/common.lang.php b/sources/language/nn_NO/common.lang.php
index 15faeac..4a474c0 100644
--- a/sources/language/nn_NO/common.lang.php
+++ b/sources/language/nn_NO/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Norwegian nynorsk [NO]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=689
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/nn_NO/help/photos_add_ftp.html b/sources/language/nn_NO/help/photos_add_ftp.html
index f44c646..486c383 100755
--- a/sources/language/nn_NO/help/photos_add_ftp.html
+++ b/sources/language/nn_NO/help/photos_add_ftp.html
@@ -42,11 +42,20 @@ galleries
     |-- video-fraa-fly.avi
     +-- pwg_representative
         +-- video-fraa-fly.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Bortsett frå "pwg_representative" (sjå forklaring under), vil kvar mappe under "galleries" lage eit album. Det er ingen avgrensing på djubde.</li>
+  <li>Bortsett frå "pwg_representative" and "pwg_format" (sjå forklaring under), vil kvar mappe under "galleries" lage eit album. Det er ingen avgrensing på djubde.</li>
 
   <li>Som utgangspunkt er eit element representera av ei file. Ei fil kan vera eit
   Piwigo element om filtypa er blant <code>file_ext</code>
@@ -57,10 +66,12 @@ galleries
 
   <li>Ingen bilet-element (video, lyd, tekstfiler, eller kva som helst...) er som standard vist med eit ikon som samsvarar med filtypa. Valfritt, kan du knytte til ei miniatyrbilete og ein representatnt--fil til ei fil (sjå video.avi i dømet over).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Varsel</em>: namn på mapper og filer kan bare innehalde bokstavar (a - z, A - Z), tal, "-", "_" or ".". Ikkje bruk mellomrom eller spesielle tegn.</li>
 
   <li>Når bilete er plassera korrekt i mapper, gå til: <span class="pwgScreen">Administrasjon &raquo; Verktøy &raquo;
   Synkroniser</span></li>
 
 </ul>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/sources/language/nn_NO/install.lang.php b/sources/language/nn_NO/install.lang.php
index ee6a8f2..9dac0ab 100755
--- a/sources/language/nn_NO/install.lang.php
+++ b/sources/language/nn_NO/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -23,7 +23,7 @@
 
 $lang['Database name'] = 'Databasenamn';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Du kan endre konfigurasjonen sjølv og ta omstart på Piwigo etterpå.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du bør sjekke med dei som leverar nett-tenaren om korleis du kan byte til PHP5.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du bør sjekke med dei som leverar nett-tenaren om korleis du kan byte til PHP5.2';
 $lang['also given by your host provider'] = 'er og levera av den som leverar nett-tenaren';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'namna på databasetabellane vil verta prefiksa med dette (gjev deg mogleghet til å handtere databasetabellane betre)';
 $lang['enter a login for webmaster'] = 'skriv inn brukarnamn for webmaster';
@@ -33,13 +33,13 @@ $lang['user password given by your host provider'] = 'passord du har fått av de
 $lang['verification'] = 'sjekk';
 $lang['webmaster login can\'t contain characters \' or "'] = 'brukarnamn for webmaster kan ikkje innehalde tegna \' eller "';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Ikkje vent med å sjå på foruma våre for hjelp: %s';
-$lang['PHP 5 is required'] = 'PHP5 er påkrevd';
+$lang['PHP 5 is required'] = 'PHP5.2 er påkrevd';
 $lang['Password ']['confirm'] = 'Passord [stadfest]';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve å byte din konfigurasjon til PHP5 ved å lage eller endre fila .htaccess.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo greidde ikkje å konfigurere PHP5.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve å byte din konfigurasjon til PHP5.2 ved å lage eller endre fila .htaccess.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo greidde ikkje å konfigurere PHP5.2';
 $lang['Sorry!'] = 'Orsak!';
 $lang['Start Install'] = 'Start installasjon';
-$lang['Try to configure PHP 5'] = 'Prøv å konfigurere PHP5';
+$lang['Try to configure PHP 5'] = 'Prøv å konfigurere PHP5.2';
 $lang['User'] = 'Brukar';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Dei som vitjar nettsida kan bruke denne e-postadressa for å kontakte administrator for nettsida';
 $lang['Welcome to my photo gallery'] = 'Velkomen til mitt biletgalleri';
@@ -64,5 +64,4 @@ $lang['It will be shown to the visitors. It is necessary for website administrat
 $lang['Just another Piwigo gallery'] = 'Enda eit Piwigo galleri';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Hald dette hemmeleg, det gjev deg tilgang til administrasjonspanelet';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Treng du hjelp? Still spørsmålet ditt på <a href="%s"> Piwigo sitt forum</a>.';
-$lang['localhost or other, supplied by your host provider'] = 'localhost eller servernamn gjeve av administrator for server';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost eller servernamn gjeve av administrator for server';
\ No newline at end of file
diff --git a/sources/language/nn_NO/upgrade.lang.php b/sources/language/nn_NO/upgrade.lang.php
index 830b779..836e09e 100755
--- a/sources/language/nn_NO/upgrade.lang.php
+++ b/sources/language/nn_NO/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/pl_PL/admin.lang.php b/sources/language/pl_PL/admin.lang.php
index 2f01fe9..f3aa8b6 100644
--- a/sources/language/pl_PL/admin.lang.php
+++ b/sources/language/pl_PL/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/pl_PL/common.lang.php b/sources/language/pl_PL/common.lang.php
index c123857..bf153dd 100644
--- a/sources/language/pl_PL/common.lang.php
+++ b/sources/language/pl_PL/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Polski [PL]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=430
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/pl_PL/help/photos_add_ftp.html b/sources/language/pl_PL/help/photos_add_ftp.html
index 60919d2..e3ec6c1 100644
--- a/sources/language/pl_PL/help/photos_add_ftp.html
+++ b/sources/language/pl_PL/help/photos_add_ftp.html
@@ -43,11 +43,20 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
   
-  <li>Poza "pwg_representative" (wyjaśnienie poniżej), każdy podkatalog w katalogu "galleries" tworzy kategorię. Nie ma limitu na poziomy zagłębień katalogów.</li>
+  <li>Poza "pwg_representative" and "pwg_format" (wyjaśnienie poniżej), każdy podkatalog w katalogu "galleries" tworzy kategorię. Nie ma limitu na poziomy zagłębień katalogów.</li>
 
   <li>Ogólnie element jest reprezentowany przez plik. Plik może być elementem
   Piwigo jeżeli jego rozszerzenie jest zawarte <code>file_ext</code>
@@ -59,6 +68,8 @@ galleries
   <li>Domyślnie, pliki nie będące obrazami (filmy, dźwięki, tekst, cokolwiek innego...), są przedstawiane przy pomocy ikon z rozszerzeniem pliku
   Opcjonalnie można powiązać miniaturę przez pwg_representative.
   Przyjrzyj się przykładowi powyżej dla video.avi.</li>
+
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
   
   <li><em>Ostrzeżenie</em>: nazwy katalogów oraz plików mogą zawierać tylko litery, cyfry oraz znaki "-", "_" lub ".". Nie mogą zawierać innych znaków, znaku spacji ani polskich liter.
 
@@ -67,4 +78,4 @@ galleries
   Synchronizacja</span></li>
 
 </ul>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/sources/language/pl_PL/index.php b/sources/language/pl_PL/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/pl_PL/index.php
+++ b/sources/language/pl_PL/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/pl_PL/install.lang.php b/sources/language/pl_PL/install.lang.php
index 815deba..7a9c65a 100644
--- a/sources/language/pl_PL/install.lang.php
+++ b/sources/language/pl_PL/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Hasło [potwierdź]';
 $lang['verification'] = 'weryfikacja';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Potrzebujesz pomocy ? Zadaj pytanie na <a href="%s">Forum Piwigo</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Z jego pomocą odwiedzający będą mogli się skontaktować z administratorem strony';
-$lang['PHP 5 is required'] = 'PHP 5 jest wymagane';
+$lang['PHP 5 is required'] = 'PHP 5.2 jest wymagane';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Twój serwer aktualnie używa PHP w wersji %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo może spróbować przełączyć Twoją konfigurację do PHP 5 poprzez modyfikację pliku .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo może spróbować przełączyć Twoją konfigurację do PHP 5.2 poprzez modyfikację pliku .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Możesz również zmienić tę konfigurację sam, a następnie uruchomić ponownie Piwigo.';
-$lang['Try to configure PHP 5'] = 'Spróbuj skonfigurować PHP 5';
+$lang['Try to configure PHP 5'] = 'Spróbuj skonfigurować PHP 5.2';
 $lang['Sorry!'] = 'Niestety!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nie mógł skonfigurować Twojego PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Możesz skontaktować się z działem wsparcia Twojego providera aby dowiedzieć się jak włączyć PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nie mógł skonfigurować Twojego PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Możesz skontaktować się z działem wsparcia Twojego providera aby dowiedzieć się jak włączyć PHP 5.2';
 $lang['Hope to see you back soon.'] = 'Do zobaczenia wkrótce.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gratulacje, instalacja Piwigo zakończona sukcesem';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Alternatywnym rozwiązaniem jest skopiować tekst z powyższego textbox i wkleić do pliku "local/config/database.inc.php" (Uwaga : database.inc.php musi zawierać to co jest w textbox i nie może zawierać znaków spacji oraz enter)';
@@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Kolejna galeria Piwigo';
 $lang['Welcome to my photo gallery'] = 'Witaj w mojej galerii zdjęć';
 $lang['Welcome to your new installation of Piwigo!'] = 'Witamy w Towjej nowej instalacji Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Nie obawiaj się kontaktu na forum w celu skorzystania z pomocy: %s';
-$lang['localhost or other, supplied by your host provider'] = 'localhost lub iny, dostarczone przez Twojego dostawcę';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost lub iny, dostarczone przez Twojego dostawcę';
\ No newline at end of file
diff --git a/sources/language/pl_PL/upgrade.lang.php b/sources/language/pl_PL/upgrade.lang.php
index 6826611..00c7fec 100644
--- a/sources/language/pl_PL/upgrade.lang.php
+++ b/sources/language/pl_PL/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/pt_BR/about.html b/sources/language/pt_BR/about.html
index b0bf3c6..fb385f0 100644
--- a/sources/language/pt_BR/about.html
+++ b/sources/language/pt_BR/about.html
@@ -1,15 +1,16 @@
-  <li>Piwigo é uma aplicação web que permite a criação de uma galeria de imagens on line.</li>
+  <li>Esta galeria de fotos é baseada no Piwigo.</li>
 
-  <li>Piwigo é desenvolevido em PHP com uma base de dados MySQL.</li>
+  <li>Piwigo é desenvolvido em PHP com uma base de dados MySQL.</li>
 
-  <li>Se houver sugestões ou comentários, visite o <a
-  href="http://piwigo.org">sitio oficial</a> e <a href="http://br.piwigo.org/forum">seu forum</a>.</li>
+  <li>Piwigo é uma aplicação web que permite a criação de uma galeria de imagens on line. Existem diversas extensões  que permitem personalizar sua galeria facilmente.
+<a href="http://br.piwigo.org">Piwigo</a> é um software livre, ou seja, você pode usá-lo da forma que quiser. Ele foi construído por uma comunidade ativa de usuários e desenvolvedores.</li>
 
-<p>A tradução Brasil é mantida por (em ordem alfabética):
+<p>Piwigo utiliza linguagem PHP com uma base de dados MySQL. Se houver sugestões ou comentários, visite o sitio oficial e seu forum. A tradução Brasil é mantida por (em ordem alfabética):
 
 	<ul>
 		<li><a href="http://piwigo.org/forum/profile.php?id=18215">flaviove</a></li>
 		<li><a href="http://piwigo.org/forum/profile.php?id=17804">glaucio</a></li>
+		<li><a href="http://piwigo.org/forum/profile.php?id=19522">msakik</a></li>
 		<li><a href="http://piwigo.org/forum/profile.php?id=17057">oigreslima</a></li>
 		<li><a href="http://piwigo.org/forum/profile.php?id=17030">PabloBSantiago</a></li>
 	</ul>
diff --git a/sources/language/pt_BR/admin.lang.php b/sources/language/pt_BR/admin.lang.php
index e23d04b..fbdfba8 100644
--- a/sources/language/pt_BR/admin.lang.php
+++ b/sources/language/pt_BR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -973,7 +973,7 @@ $lang['Activate it now'] = 'Ativar agora';
 $lang['Allow users to add a link to their website'] = 'Permitir usuários adicionar um link em seus websites';
 $lang['Impossible to deactivate the default theme.'] = 'Imposível desativar o tema padrão';
 $lang['Mail address is mandatory for registration'] = 'Para registro o email é obrigatório';
-$lang['Empty caddie'] = 'Carrinho vazio';
+$lang['Empty caddie'] = 'Esvaziar carrinho';
 $lang['No and unlock sub-albums'] = 'Não e desbloquear sub-álbuns';
 $lang['The settings for the guest are from the %s user'] = 'As configurações para o convidado são definidas pelo usuário %s';
 $lang['based on'] = 'baseado em';
@@ -981,4 +981,14 @@ $lang['between %s and %s MB'] = 'entre %s e %s MB';
 $lang['date & time'] = 'dia & hora';
 $lang['file name'] = 'nome do arquivo';
 $lang['width & height'] = 'largura & comprimento';
-$lang['Upload in progress'] = 'Upload em progresso';
\ No newline at end of file
+$lang['Upload in progress'] = 'Upload em progresso';
+$lang['Delete %d orphan photos'] = 'Apagar %d fotos órfãs';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada e-mail enviado conterá sua própria chave de autenticação automática em links, válido para %s.';
+$lang['Edit user'] = 'Editar usuário';
+$lang['For security reason, authentication keys do not work for administrators.'] = '
+Por razões de segurança, chaves de autenticação não funcionam para os administradores.';
+$lang['No recipient selected'] = 'Nenhum recipiente selecionado';
+$lang['No user is permitted to see this private album'] = 'Nenhum usuário tem permissão para ver este álbum privado';
+$lang['Orphans'] = 'Órfãos';
+$lang['Recipients'] = 'Recipiente';
+$lang['Y Repeat'] = 'Repetir Y';
\ No newline at end of file
diff --git a/sources/language/pt_BR/common.lang.php b/sources/language/pt_BR/common.lang.php
index 11a8499..d5e819e 100644
--- a/sources/language/pt_BR/common.lang.php
+++ b/sources/language/pt_BR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Brasil [BR]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=431
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -426,4 +426,5 @@ $lang['Photo description'] = 'Descrição da foto';
 $lang['Photo title'] = 'Título da foto';
 $lang['Album name, A &rarr; Z'] = 'Nome do álbum, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Nome do álbum, Z &rarr; A';
-$lang['Link: %s'] = 'Link: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Link: %s';
+$lang['Your authentication key is no longer valid.'] = 'Sua chave de autenticação não é mais válida.';
\ No newline at end of file
diff --git a/sources/language/pt_BR/help/photos_add_ftp.html b/sources/language/pt_BR/help/photos_add_ftp.html
index 21d5581..e408fa0 100644
--- a/sources/language/pt_BR/help/photos_add_ftp.html
+++ b/sources/language/pt_BR/help/photos_add_ftp.html
@@ -26,38 +26,33 @@
     usando muitos recursos) :</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -77,6 +72,8 @@
   <li>Outros itens (video, sons, arquivos de texto, o que você quiser...) são
   por padrão representados por um ícone correspondente à extensão do nome de arquivo. Você tem a opção de associar uma miniatura e um arquivo representativo (veja video.avi no exemplo acima).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Atenção</em>: o nome dos diretórios e dos arquivos devem conter apenas letras, números, "-", "_" ou ".". Não use espaço em branco e nem caracteres acentuados.</li>
 
   <li>Uma vez que os arquivos, as miniaturas e representativos estiverem corretamente alocados nos diretórios,
@@ -86,21 +83,3 @@
 </ul>
 
 </fieldset>
-<fieldset>
-  <legend>Miniaturas (Thumbnails)</legend>
-<ul>
-
-  <li>Cada foto deve ter a sua miniatura.</li>
-
-  <li>As miniaturas estão armazenadas no subdiretório "thumbnail" no diretório das categorias. 
-      A miniatura tem o mesmo nome de arquivo que a foto correspondente, com <em>TN-</em> como prefixo.</li>
-
-  <li><em>Aviso</em>: use um módulo externo para a criação das miniaturas.</li>
-
-  <li>Mesmo se isto não é recomendado (qualidade da imagem, carregamento do servidor, etc), você pode usar a página<span>
-  class="pwgScreen">Administração &raquo; Imagens &raquo; Miniaturas</span> para criar as miniaturas.</li>
-
-  <li>Dê acesso de escrita para todos os diretórios das categorias.</li>
-
-</ul>
-</fieldset>
\ No newline at end of file
diff --git a/sources/language/pt_BR/index.php b/sources/language/pt_BR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/pt_BR/index.php
+++ b/sources/language/pt_BR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/pt_BR/install.lang.php b/sources/language/pt_BR/install.lang.php
index 0934344..336d27a 100644
--- a/sources/language/pt_BR/install.lang.php
+++ b/sources/language/pt_BR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Senha [confirmar]';
 $lang['verification'] = 'verificação';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Precisa de ajuda ? Faça a sua pergunta no <a href="%s">Piwigo message board</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Os visitantes poderão entrar em contato com o administrador do site através desse email';
-$lang['PHP 5 is required'] = 'É necessário PHP 5';
+$lang['PHP 5 is required'] = 'É necessário PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Parece que a sua hospedagem está atualmente usando PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tentar mudar sua configuração para PHP 5 através da criação ou modificação de um arquivo .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tentar mudar sua configuração para PHP 5.2 através da criação ou modificação de um arquivo .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note que você pode alterar sua configuração por conta própria e reiniciar o Piwigo depois disso.';
-$lang['Try to configure PHP 5'] = 'Tentar configurar PHP 5';
+$lang['Try to configure PHP 5'] = 'Tentar configurar PHP 5.2';
 $lang['Sorry!'] = 'Lamento!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não teve condições de configurar o PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não teve condições de configurar o PHP 5.2';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Você deve entrar em contato com o suporte do seu provedor e ver como você poderia mudar para PHP 5 por conta própria.";
 $lang['Hope to see you back soon.'] = 'Espero te ver de volta em breve.';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Uma solução alternativa é copiar o texto na caixa acima e cole-o no arquivo "local/config/database.inc.php" (Atenção: database.inc.php deve conter apenas o que está na área de texto, sem retorno de linha ou caractere de espaço)';
@@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Bem-Vindo a minha galeria de fotos.';
 $lang['Welcome to your new installation of Piwigo!'] = 'Bem-Vindo a sua nova instalação do Piwigo.';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Você pode baixar o arquivo de configuração e colocá-lo na pasta local/config de sua instalação.';
 $lang['localhost or other, supplied by your host provider'] = 'localhost ou outro, fornecido pelo seu provedor de hospedagem';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Você deve entrar em contato com o suporte do seu provedor e ver como você poderia mudar para PHP 5.2 por conta própria.';
\ No newline at end of file
diff --git a/sources/language/pt_BR/upgrade.lang.php b/sources/language/pt_BR/upgrade.lang.php
index 26e9fe8..e73b30a 100644
--- a/sources/language/pt_BR/upgrade.lang.php
+++ b/sources/language/pt_BR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/pt_PT/admin.lang.php b/sources/language/pt_PT/admin.lang.php
index 749ec35..145ba61 100644
--- a/sources/language/pt_PT/admin.lang.php
+++ b/sources/language/pt_PT/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -979,4 +979,14 @@ $lang['between %s and %s MB'] = 'Entre %s e %s MB';
 $lang['date & time'] = 'Data e hora';
 $lang['file name'] = 'Nome do arquivo';
 $lang['width & height'] = 'Largura & altura';
-$lang['Upload in progress'] = 'Carregamento em progresso';
\ No newline at end of file
+$lang['Upload in progress'] = 'Carregamento em progresso';
+$lang['Delete %d orphan photos'] = 'Apagar %d fotos órfãos';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada e-mail enviado conterá sua própria chave de autenticação automática de links, válido para %s.';
+$lang['Edit user'] = 'Editar usuário';
+$lang['For security reason, authentication keys do not work for administrators.'] = '
+Por razões de segurança, chaves de autenticação não funcionam para os administradores.';
+$lang['No recipient selected'] = 'Nenhum destinatário seleccionado';
+$lang['No user is permitted to see this private album'] = 'Nenhum usuário tem permissão para ver este álbum privado';
+$lang['Orphans'] = 'Órfãos';
+$lang['Recipients'] = 'Destinatários';
+$lang['Y Repeat'] = 'Y Repetir';
\ No newline at end of file
diff --git a/sources/language/pt_PT/common.lang.php b/sources/language/pt_PT/common.lang.php
index 3d6f3b8..c819072 100644
--- a/sources/language/pt_PT/common.lang.php
+++ b/sources/language/pt_PT/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Português [PT]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=432
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -429,4 +429,5 @@ $lang['Album name, Z &rarr; A'] = 'Nome do album, de A a Z';
 $lang['Apply on properties'] = 'Aplicar nas propriedades';
 $lang['Link: %s'] = 'Link: %s';
 $lang['Photo description'] = 'Descrição da foto';
-$lang['Photo title'] = 'Título da foto';
\ No newline at end of file
+$lang['Photo title'] = 'Título da foto';
+$lang['Your authentication key is no longer valid.'] = 'Sua chave de autenticação não é mais válida.';
\ No newline at end of file
diff --git a/sources/language/pt_PT/help/cat_options.html b/sources/language/pt_PT/help/cat_options.html
new file mode 100644
index 0000000..b807633
--- /dev/null
+++ b/sources/language/pt_PT/help/cat_options.html
@@ -0,0 +1,23 @@
+<h2>Opções do Album</h2>
+
+<p>Opções aplicáveis a vários albuns em simultâneo.</p>
+
+<dl>
+
+<dt>Comentários</dt>
+<dd>Uma fotografia pode ser comentada pelos visitantes se estiver num album com os comentários activados.</dd>
+
+<dt>Descativa</dt>
+<dd>Albuns são desactivados para manutenção. Só os administradores podem aceder-lhes a partir da galeria de imagens (do site).</dd>
+
+<dt>Público / privado</dt>
+<dd>Num album definido como Privado, dê direitos de acesso a registados e a grupos</dd>
+
+<dt>Símbolo</dt>
+<dd>Esta opção está disponível quando o define na configuração
+<code>permite o uso duma imagem aleatória como símbolo</code> (see <span
+ class="filename">include/config_defaults.inc.php</span>) to
+<em>true</em>. Cada album pode ser representado por uma fotografia aleatória ou por uma única fotografia previamente seleccionada.</dd>
+
+
+</dl>
diff --git a/sources/language/pt_PT/help/cat_perm.html b/sources/language/pt_PT/help/cat_perm.html
new file mode 100644
index 0000000..78a36d2
--- /dev/null
+++ b/sources/language/pt_PT/help/cat_perm.html
@@ -0,0 +1,11 @@
+<h2>Edita as permissões dos albuns</h2>
+
+<p>Esta quadro apenas está disponível para albuns privados. Aqui pode escolher os registados e os grupos autorizados a aceder a um album.</p>
+
+<h3>Grupos</h3>
+
+<p>Pode recusar ou permitir que grupos tenham acesso ao album corrente. Alterando as autorizações de grupos, os registados que pertencem a esses grupos serão impedidos ou autorizados a aceder ao album.</p>
+
+<h3>Registados</h3>
+
+<p>Pode impedir ou permitr o acesso individual de registados. Registados que tenham acesso por pertencerem a um grupo, poderão ser impedidos a título de excepção.</p>
diff --git a/sources/language/pt_PT/help/permalinks.html b/sources/language/pt_PT/help/permalinks.html
new file mode 100644
index 0000000..1de1516
--- /dev/null
+++ b/sources/language/pt_PT/help/permalinks.html
@@ -0,0 +1,7 @@
+<h2>Permalinks</h2>
+
+<p>Permalinks são usados para melhorar os endereços dos albuns. Quando se define o permalink de um album, o id do album não volta a ser necessário no endereço.</p>
+
+<p>Quando se apaga o permalink, pode guardar-se no hisórico dos permalink, e assim os links exteriores às páginas de Piwigo continuam a funcionar. Na tabela do histórico dos permalinks pode ver a data em que um permalink foi apagado, a última vez em que foi usado e o número de vezes que um permalink foi usado.</p>
+
+<p>Atenção que cada album terá de ter o seu próprio permalink. No histórico dos permalinks também não pode repetir um permalink que já tenha sido definido.</p>
diff --git a/sources/language/pt_PT/help/photos_add_ftp.html b/sources/language/pt_PT/help/photos_add_ftp.html
index 1d63f81..f519449 100644
--- a/sources/language/pt_PT/help/photos_add_ftp.html
+++ b/sources/language/pt_PT/help/photos_add_ftp.html
@@ -25,38 +25,33 @@ Parab&eacute;ns! Voc&ecirc; acabou de criar o primeiro &aacute;lbum da sua galer
 	<p>As pastas dos &aacute;lbums est&atilde;o na pasta "galleries" no Piwigo. Segue aqui a &aacute;rvore de pastas de uma pequena galeria (mas usando muitos recursos) :</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -70,6 +65,8 @@ Parab&eacute;ns! Voc&ecirc; acabou de criar o primeiro &aacute;lbum da sua galer
 
   <li>Outros itens (video, sons, arquivos de texto, o que voc&ecirc; quiser...) s&atilde;o por padr&atilde;o representados por um &iacute;cone correspondente &agrave; extens&atilde;o do nome de arquivo. Voc&ecirc; tem a op&ccedil;&atilde;o de associar uma miniatura e um ficheiro representativo (veja video.avi no exemplo acima).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Aten&ccedil;&atilde;o</em>: o nome das pastas e dos ficheiros devem conter apenas letras, n&uacute;meros, "-", "_" ou ".". N&atilde;o use espa&ccedil;o em branco e nem caracteres acentuados.</li>
 
   <li>Uma vez que os ficheiros, as miniaturas e representativos estiverem corretamente alocados nas pastas,v&aacute; at&eacute; : <span class="pwgScreen">Ferramentas &raquo; Sincronizar</span></li>
@@ -77,20 +74,3 @@ Parab&eacute;ns! Voc&ecirc; acabou de criar o primeiro &aacute;lbum da sua galer
 </ul>
 
 </fieldset>
-<fieldset>
-  <legend>Miniaturas (Thumbnails)</legend>
-<ul>
-
-  <li>Cada foto deve ter a sua miniatura.</li>
-
-  <li>As miniaturas est&atilde;o armazenadas na subpasta "thumbnail" na pasta das categorias. 
-      A miniatura tem o mesmo nome de ficheiro que a foto correspondente, com <em>TN-</em> como prefixo.</li>
-
-  <li><em>Aten&ccedil;&atilde;o</em>: use um m&oacute;dulo externo para a cria&ccedil;&atilde;o das miniaturas.</li>
-
-  <li>Embora n&atilde;o seja recomendado (qualidade da imagem, carga do servidor, etc), pode usar a p&aacute;gina <span class="pwgScreen">Ferramentas &raquo; Miniaturas</span> para criar as miniaturas.</li>
-
-  <li>D&ecirc; permiss&otilde;es de escrita para todas as pastas dos albums.</li>
-
-</ul>
-</fieldset>
diff --git a/sources/language/pt_PT/index.php b/sources/language/pt_PT/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/pt_PT/index.php
+++ b/sources/language/pt_PT/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/pt_PT/install.lang.php b/sources/language/pt_PT/install.lang.php
index 62ae5b2..89ab8ed 100644
--- a/sources/language/pt_PT/install.lang.php
+++ b/sources/language/pt_PT/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Palavra-passe [confirmação]';
 $lang['verification'] = 'Verificar Senha inserida';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Precisa de ajuda? Faça a sua pergunta no <a href="%s">Fórum Piwigo</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Os visitantes poderão entrar em contacto com o administrador da galeria através deste email';
-$lang['PHP 5 is required'] = 'PHP 5 é necessário';
+$lang['PHP 5 is required'] = 'PHP 5.2 é necessário';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Parece que o seu provedor de hospedagem usa actualmente PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tentar mudar a sua configuração para PHP 5 através da criação ou modificação de um arquivo .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tentar mudar a sua configuração para PHP 5.2 através da criação ou modificação de um arquivo .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note que você pode alterar sua configuração por conta própria e reiniciar o Piwigo depois disso.';
-$lang['Try to configure PHP 5'] = 'Tentar configurar PHP 5';
+$lang['Try to configure PHP 5'] = 'Tentar configurar PHP 5.2';
 $lang['Sorry!'] = 'Lamentamos!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não pôde configurar o PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não pôde configurar o PHP 5.2';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Você deve entrar em contacto com o suporte do seu provedor e saber como pode mudar para PHP 5.";
 $lang['Hope to see you back soon.'] = 'Desejamos volte em breve.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Parabéns, a sua instalação Piwigo está completa';
@@ -64,7 +64,6 @@ $lang['Just another Piwigo gallery'] = 'Apenas mais uma galeria Piwigo';
 $lang['Welcome to my photo gallery'] = 'Bem-vindo à minha galeria de fotos';
 $lang['Welcome to your new installation of Piwigo!'] = 'Bem-vindo à sua nova instalação do Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Não hesite em visitar nossos foruns para qualquer ajuda: %s';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Você deve entrar em contacto com o suporte do seu fornecedor de alojamento e saber como pode mudar para PHP 5.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Você deve entrar em contacto com o suporte do seu fornecedor de alojamento e saber como pode mudar para PHP 5.2';
 $lang['Password ']['confirm'] = 'Senha [confirme]';
-$lang['localhost or other, supplied by your host provider'] = 'hospedeiro local ou outro, fornecido pelo seu alojador';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'hospedeiro local ou outro, fornecido pelo seu alojador';
\ No newline at end of file
diff --git a/sources/language/pt_PT/upgrade.lang.php b/sources/language/pt_PT/upgrade.lang.php
index b37028d..b2f804e 100644
--- a/sources/language/pt_PT/upgrade.lang.php
+++ b/sources/language/pt_PT/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ro_RO/admin.lang.php b/sources/language/ro_RO/admin.lang.php
index 6da3095..cb978a0 100644
--- a/sources/language/ro_RO/admin.lang.php
+++ b/sources/language/ro_RO/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -985,4 +985,13 @@ $lang['based on'] = 'bazat pe';
 $lang['width & height'] = 'latime & inaltime';
 $lang['file name'] = 'numele fisierului';
 $lang['date & time'] = 'data & ora';
-$lang['Upload in progress'] = 'Incarcare in desfasurare';
\ No newline at end of file
+$lang['Upload in progress'] = 'Incarcare in desfasurare';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Fiecare email trimis va conține cheia de autentificare automată în link, valabilă pentru %s ';
+$lang['No user is permitted to see this private album'] = 'Niciunui utilizator nu îi este permis să vadă acest album';
+$lang['No recipient selected'] = 'Nu a fost selectat nici un destinatar';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Din motive de securitate, cheile de autentificare nu funcţionează pentru administratori';
+$lang['Recipients'] = 'Destinatari';
+$lang['Edit user'] = 'Editează utilizatorul';
+$lang['Y Repeat'] = 'Y Repetare';
+$lang['Delete %d orphan photos'] = 'Sterge %d fotografii orfane';
+$lang['Orphans'] = 'Orfane';
\ No newline at end of file
diff --git a/sources/language/ro_RO/common.lang.php b/sources/language/ro_RO/common.lang.php
index 9613581..9a924bc 100644
--- a/sources/language/ro_RO/common.lang.php
+++ b/sources/language/ro_RO/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Română [RO]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=433
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -426,4 +426,6 @@ $lang['Photo description'] = 'Descriere fotografie';
 $lang['No results for'] = 'Nici un rezultat pentru';
 $lang['Apply on properties'] = 'Aplica la proprietati';
 $lang['Album name, A &rarr; Z'] = 'Nume album, A & rarr; Z';
-$lang['Link: %s'] = 'Legatura: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Legatura: %s';
+$lang['Your authentication key is no longer valid.'] = '
+Cheia dvs. de autentificare nu mai este valabilă.';
\ No newline at end of file
diff --git a/sources/language/ro_RO/index.php b/sources/language/ro_RO/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/ro_RO/index.php
+++ b/sources/language/ro_RO/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ro_RO/install.lang.php b/sources/language/ro_RO/install.lang.php
index 9fe9571..3cca38a 100755
--- a/sources/language/ro_RO/install.lang.php
+++ b/sources/language/ro_RO/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -47,13 +47,13 @@ $lang['Keep it confidential, it enables you to access administration panel'] = '
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Ai nevoie de ajutor? Intreaba pe <a href="%s">Forumul Piwigo</a>.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Poti sa schimbi configuratia manual si sa restartezi Piwigo dupa aceea.';
 $lang['Password [confirm]'] = 'Parola [confirma]';
-$lang['PHP 5 is required'] = 'PHP5 este necesar';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va incerca sa treaca configuratia ta la PHP5 folosind o fila  .htaccess';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nu a putut sa configureze PHP5';
+$lang['PHP 5 is required'] = 'PHP5.2 este necesar';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va incerca sa treaca configuratia ta la PHP5.2 folosind o fila  .htaccess';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nu a putut sa configureze PHP5.2';
 $lang['please enter your password again'] = 'Introduce parola inca o data';
 $lang['Sorry!'] = 'Imi pare rau!';
 $lang['Start Install'] = 'Incepe instalarea';
-$lang['Try to configure PHP 5'] = 'Incearca sa configurezi PHP5';
+$lang['Try to configure PHP 5'] = 'Incearca sa configurezi PHP5.2';
 $lang['user login given by your host provider'] = 'Userul oferit de providerul de host.';
 $lang['user password given by your host provider'] = 'Parola oferita de providerul de host';
 $lang['User'] = 'User';
@@ -63,6 +63,5 @@ $lang['webmaster login can\'t contain characters \' or "'] = 'Userul nu poate sa
 $lang['Welcome to my photo gallery'] = 'Bine ati venit la galeria mea foto';
 $lang['Welcome to your new installation of Piwigo!'] = 'Bine ai venit la noua instalare Piwigo!';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Poti sa descarci fila de configurare si sa o uploadezi in folderul local/config al instalarii.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Ar trebui sa te adresezi hostului si sa intrebi cum poti sa treci la PHP5';
-$lang['localhost or other, supplied by your host provider'] = 'localhost sau alta, furnizat de furnizorul de găzduire';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Ar trebui sa te adresezi hostului si sa intrebi cum poti sa treci la PHP5.2';
+$lang['localhost or other, supplied by your host provider'] = 'localhost sau alta, furnizat de furnizorul de găzduire';
\ No newline at end of file
diff --git a/sources/language/ro_RO/upgrade.lang.php b/sources/language/ro_RO/upgrade.lang.php
index de0c4a7..713096f 100755
--- a/sources/language/ro_RO/upgrade.lang.php
+++ b/sources/language/ro_RO/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ru_RU/admin.lang.php b/sources/language/ru_RU/admin.lang.php
index 05146c1..e2a19b1 100644
--- a/sources/language/ru_RU/admin.lang.php
+++ b/sources/language/ru_RU/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -983,4 +983,13 @@ $lang['date & time'] = 'дата и время';
 $lang['file name'] = 'имя файла';
 $lang['width & height'] = 'ширина и высота';
 $lang['No and unlock sub-albums'] = 'Нет, и разблокировать вложенные альбомы';
-$lang['Upload in progress'] = 'Идет процесс загрузки';
\ No newline at end of file
+$lang['Upload in progress'] = 'Идет процесс загрузки';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Из соображений безопасности ключ идентификации для администраторов не работает.';
+$lang['Delete %d orphan photos'] = 'Удаление %d одиночных фото';
+$lang['Orphans'] = 'Одиночные';
+$lang['Y Repeat'] = 'Повтор Y';
+$lang['No user is permitted to see this private album'] = 'Никакому пользователю не позволено видеть этот частный альбом';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Каждый е-mail содержит свой собственный ключ идентификации по ссылке, действительный для %s.';
+$lang['Edit user'] = 'Редактирование пользователя';
+$lang['Recipients'] = 'Получатели';
+$lang['No recipient selected'] = 'Получатель не выбран';
\ No newline at end of file
diff --git a/sources/language/ru_RU/common.lang.php b/sources/language/ru_RU/common.lang.php
index 461ff4a..dff02bf 100644
--- a/sources/language/ru_RU/common.lang.php
+++ b/sources/language/ru_RU/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Русский [RU]
-Version: 2.7.2
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=434
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -428,4 +428,5 @@ $lang['Photo description'] = 'Описание изображения';
 $lang['Photo title'] = 'Заголовок изображения';
 $lang['Album name, A &rarr; Z'] = 'По названиям альбомов, от A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'По названиям альбомов, от Z &rarr; A';
-$lang['Link: %s'] = 'Ссылка: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Ссылка: %s';
+$lang['Your authentication key is no longer valid.'] = 'Увы, Ваш ключ идентификации больше не действителен.';
\ No newline at end of file
diff --git a/sources/language/ru_RU/help/photos_add_ftp.html b/sources/language/ru_RU/help/photos_add_ftp.html
index c02a68c..9856d14 100644
--- a/sources/language/ru_RU/help/photos_add_ftp.html
+++ b/sources/language/ru_RU/help/photos_add_ftp.html
@@ -41,6 +41,15 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
@@ -58,6 +67,8 @@ galleries
   представлены иконками соответствующими расширению файла. Дополнительно, Вы можете
   связать миниатюру и представительный файл (см. video.avi в примере выше).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Внимание</em>: имена папок и файлов должны содержать только латинские буквы,
   цифры, "-", "_" или ".". Не используйте пробелы и спецсимволы.</li>
 
@@ -66,4 +77,4 @@ galleries
 
 </ul>
 
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/sources/language/ru_RU/index.php b/sources/language/ru_RU/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/ru_RU/index.php
+++ b/sources/language/ru_RU/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ru_RU/install.lang.php b/sources/language/ru_RU/install.lang.php
index e4908c7..4635784 100644
--- a/sources/language/ru_RU/install.lang.php
+++ b/sources/language/ru_RU/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Повторите пароль';
 $lang['verification'] = 'еще раз для исключения опечатки';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Нужна помощь? Задайте свои вопросы на <a href="%s">Форуме Piwigo</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Будет использоваться для контакта посетителей с администратором';
-$lang['PHP 5 is required'] = 'Требуется PHP 5';
+$lang['PHP 5 is required'] = 'Требуется PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Кажется, что Ваш хостинг в настоящее время под управлением  PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo может попытаться переключить Вашу конфигурацию на PHP 5, создавая или изменяя .htaccess файл.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo может попытаться переключить Вашу конфигурацию на PHP 5.2, создавая или изменяя .htaccess файл.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Отметьте, что Вы можете изменить конфигурацию самостоятельно и перезапустите Piwigo после этого.';
-$lang['Try to configure PHP 5'] = 'Попытаться переконфигурировать PHP 5';
+$lang['Try to configure PHP 5'] = 'Попытаться переконфигурировать PHP 5.2';
 $lang['Sorry!'] = 'Извините!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo не в состоянии переконфигурировать PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Вы должны обратиться к своему провайдеру за поддержой и разъяснениями, как переключиться на PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo не в состоянии переконфигурировать PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Вы должны обратиться к своему провайдеру за поддержой и разъяснениями, как переключиться на PHP 5.2';
 $lang['Hope to see you back soon.'] = 'Надеемся скоро увидеть Вас вновь.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Поздравляем, установка Piwigo полностью завершена';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Альтернативное решение состоит в том, чтобы скопировать текст в блоке выше и вставить это в файл "local/config/database.inc.php"   (Предупреждение: database.inc.php должен только содержать то, что находится в текстовом поле, без символов возврата строки или пробелов)';
@@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Еще одна галерея Piwigo';
 $lang['Welcome to my photo gallery'] = 'Добро пожаловать в мою фотогалерею';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Не стесняйтесь консультироваться на наших форумах для получения любой помощи, %s';
 $lang['Welcome to your new installation of Piwigo!'] = 'Добро пожаловать в новую установку Piwigo!';
-$lang['localhost or other, supplied by your host provider'] = 'localhost или другой, который указан провайдером';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost или другой, который указан провайдером';
\ No newline at end of file
diff --git a/sources/language/ru_RU/upgrade.lang.php b/sources/language/ru_RU/upgrade.lang.php
index 2f8eeff..aa06e88 100644
--- a/sources/language/ru_RU/upgrade.lang.php
+++ b/sources/language/ru_RU/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sh_RS/admin.lang.php b/sources/language/sh_RS/admin.lang.php
index ad18ecf..2d9e8db 100644
--- a/sources/language/sh_RS/admin.lang.php
+++ b/sources/language/sh_RS/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sh_RS/common.lang.php b/sources/language/sh_RS/common.lang.php
index d963f6e..bc1d800 100644
--- a/sources/language/sh_RS/common.lang.php
+++ b/sources/language/sh_RS/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Srpski [SR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=435
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/sh_RS/help/index.php b/sources/language/sh_RS/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/sh_RS/help/index.php
+++ b/sources/language/sh_RS/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sh_RS/index.php b/sources/language/sh_RS/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/sh_RS/index.php
+++ b/sources/language/sh_RS/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sh_RS/install.lang.php b/sources/language/sh_RS/install.lang.php
index cf839e4..25fde72 100644
--- a/sources/language/sh_RS/install.lang.php
+++ b/sources/language/sh_RS/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Lozinka[potvrdi]';
 $lang['verification'] = 'Provera';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Potrebna Vam je pomoc? Pitajte na  <a href="%s">Piwigo tabli za poruke</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Posetioci ce biti u mogucnosti da koriste ovaj mail da kontaktiraju administratora stranice';
-$lang['PHP 5 is required'] = 'PHP 5 je neophodan';
+$lang['PHP 5 is required'] = 'PHP 5.2 je neophodan';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Izgleda da Vaš webhost trenutno koristi PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo može pokušati da promeni Vašu konfiguraciju na PHP 5 kreiranjem ili menjanjem .htaccess datoteke.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo može pokušati da promeni Vašu konfiguraciju na PHP 5.2 kreiranjem ili menjanjem .htaccess datoteke.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Imajte u vidu da možete sami izmeniti Vašu konfiguraciju restartovati Piwigo posle toga.';
-$lang['Try to configure PHP 5'] = 'Pokušajte da podestite PHP 5';
+$lang['Try to configure PHP 5'] = 'Pokušajte da podestite PHP 5.2';
 $lang['Sorry!'] = 'Žao nam je!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo wnije uspeo da podesi PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Trebalo bi da se obartite podršci Vašeg hosting provajdera za uputstvo kako da promenite na PHP 5 sami.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo wnije uspeo da podesi PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Trebalo bi da se obartite podršci Vašeg hosting provajdera za uputstvo kako da promenite na PHP 5.2 sami.';
 $lang['Hope to see you back soon.'] = 'Nadamo se da se uskoro vidimo.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Cestitamo, Piwigo instalacija je završena';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Alternativno rešenje je da kopirate tekst iz kutije iznad i nalepite u datoteku "local/config/database.inc.php" (Upozorenje : database.inc.php mora sadržati samo tekst iz kutije, bez linije ili praznih karaktera)';
diff --git a/sources/language/sh_RS/upgrade.lang.php b/sources/language/sh_RS/upgrade.lang.php
index 4719b80..cda9ee2 100644
--- a/sources/language/sh_RS/upgrade.lang.php
+++ b/sources/language/sh_RS/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sk_SK/admin.lang.php b/sources/language/sk_SK/admin.lang.php
index 112fa59..bab88db 100644
--- a/sources/language/sk_SK/admin.lang.php
+++ b/sources/language/sk_SK/admin.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -983,4 +983,13 @@ $lang['file name'] = 'názov súboru';
 $lang['based on'] = 'na základe';
 $lang['The settings for the guest are from the %s user'] = 'Nastavenia pre hostí sú z %s používateľa';
 $lang['No and unlock sub-albums'] = 'Nie a odomknúť pod-albumy';
-$lang['Upload in progress'] = 'Prebieha nahrávanie';
\ No newline at end of file
+$lang['Upload in progress'] = 'Prebieha nahrávanie';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Každý odoslaný mail bude obsahovať automatický autentifikačný kľúč na linkoch, platný pre %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Z bezpečnostných dovodov autentifikačné kľúče nefungujú pre administrátorov.';
+$lang['Delete %d orphan photos'] = 'Vymazať %d osamotených fotiek';
+$lang['Edit user'] = 'Upraviť používateľa';
+$lang['No recipient selected'] = 'Nevybraný žiaden príjemca';
+$lang['No user is permitted to see this private album'] = 'Žiadny používateľ nemá prístup na prezeranie tohto súkroného albumu';
+$lang['Orphans'] = 'Osamotené';
+$lang['Recipients'] = 'Príjemcovia';
+$lang['Y Repeat'] = 'Y opakovaní';
\ No newline at end of file
diff --git a/sources/language/sk_SK/common.lang.php b/sources/language/sk_SK/common.lang.php
index 2d42f97..67a5760 100644
--- a/sources/language/sk_SK/common.lang.php
+++ b/sources/language/sk_SK/common.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -25,7 +25,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Slovensky [SK]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=452
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -434,4 +434,5 @@ $lang['Photo description'] = 'Popis fotky';
 $lang['Photo title'] = 'Názov fotky';
 $lang['Album name, Z &rarr; A'] = 'Názov albumu, Z &rarr; A';
 $lang['Album name, A &rarr; Z'] = 'Názov albumu, A &rarr; Z';
-$lang['Link: %s'] = 'Link: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Link: %s';
+$lang['Your authentication key is no longer valid.'] = 'Váš autentifikačný kľúč nie je viac platný.';
\ No newline at end of file
diff --git a/sources/language/sk_SK/help/index.php b/sources/language/sk_SK/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/sk_SK/help/index.php
+++ b/sources/language/sk_SK/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sk_SK/help/photos_add_ftp.html b/sources/language/sk_SK/help/photos_add_ftp.html
index 5130063..2bc825f 100644
--- a/sources/language/sk_SK/help/photos_add_ftp.html
+++ b/sources/language/sk_SK/help/photos_add_ftp.html
@@ -27,38 +27,33 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw
     "galleries". Tu je ukážka malej adresárovej štruktúry Piwigo (ktorá ale využívá veľa vlastností Piwigo):</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- kategoria-1
-|   |   |-- kategoria-1.1
-|   |   |   |-- kategoria-1.1.1
-|   |   |   |   |-- kategoria-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- svatba.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-svatba.jpg
-|   |   |   |   |   +-- svatba.jpg
-|   |   |   |   +-- kategoria-1.1.1.2
-|   |   |   +-- kategoria-1.1.2
-|   |   |-- kategoria-1.2
-|   |   |   |-- slon.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-slon.jpg
-|   |   +-- kategoria-1.3
-|   +-- kategoria-2
-|       |-- teliatko.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-teliatko.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
 
@@ -74,6 +69,8 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw
 
   <li>Elementy, ktoré nie sú obrázky (video, zvuk, textové súbory, čokoľvek chcete...) majú ako východzí náhľad ikonu, ktorá odpovedá ich prípone. Voliteľne môžete priradiť náhľad a reprezentatívny súbor (viď. video.avi v príklade vyššie).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Varovanie</em>: názvy adresárov a súborov musia obsahovať len písmená, čísla, "-", "_" alebo ".". Žiadne medzery alebo znaky s diakritikou.</li>
 
   <li>Keď sú elementy, obrázky, náhľady a reprezentatívne súbory umiestnené v adresárovej štruktúre, prejdite na: <span class="pwgScreen">Administrácia &raquo; Kategória &raquo;
@@ -81,22 +78,3 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw
 
 </ul>
 </fieldset>
-
-<fieldset>
-  <legend>Náhľady</legend>
-<ul>
-
-  <li>Všetky obrázky (fotografie) musia mať priradený náhľad.</li>
-
-  <li>Náhľady sú umiestnené v podadresári "thumbnail", ktorý je v adresári kategórie. Náhľad má rovnaký názov ako jemu odpovídajúci obrázok s prefixom podľa konfiguračného parametra <code>prefix_thumbnail</code> (viď. <span class="filename">include/config.inc.php</span>).</li>
-
-  <li>Náhľad nemusí mať nutne rovnakú príponu ako jemu odpovedajúcí obrázok (napríklad ".jpg", obrázok môže mať náhľad s ".GIF" príponou).</li>
-
-  <li>Odporúčame použiť externú aplikáciu pre tvorbu náhľadov.</li>
-
-  <li>Vytváranie náhľadov pomocou Piwigo môže viesť k zlej kvalite vytvorených náhľadov, protože tá závisí na zdrojoch servra (a toto môže byť na zdielaných servroch (webhosting) problém).
-
-  <li>Pokiaľ budete aj tak vytvárať náhľady pomocou Piwigo na servri, tak musíte povoliť prístup pre zápis do všetkých adresárov "galleries" a všetkých podadresárov.</li>
-
-</ul>
-</fieldset>
diff --git a/sources/language/sk_SK/index.php b/sources/language/sk_SK/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/sk_SK/index.php
+++ b/sources/language/sk_SK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sk_SK/install.lang.php b/sources/language/sk_SK/install.lang.php
index fc898ee..ae00e0e 100644
--- a/sources/language/sk_SK/install.lang.php
+++ b/sources/language/sk_SK/install.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -34,7 +34,6 @@ $lang['It will be shown to the visitors. It is necessary for website administrat
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Spojenie na server sa podarilo, ale nebolo možné pripojiť databázu';
 $lang['Can\'t connect to server'] = 'Nebolo možné sa pripojiť k serveru';
 $lang['Host'] = 'MySQL server';
-$lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.sk';
 $lang['User'] = 'Používateľ';
 $lang['user login given by your host provider'] = 'používateľské meno, ktoré Vám pridelil prevádzkovateľ serveru';
 $lang['user password given by your host provider'] = 'heslo na tomto serveri';
@@ -50,14 +49,14 @@ $lang['Password [confirm]'] = 'Heslo [potvrdenie]';
 $lang['verification'] = 'kontrola';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Potrebujete pomoc? Opýtajte sa na <a href="%s">Piwigo fóre</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Návštevníci môžu pomocou tohto e-mailu kontaktovať správcu';
-$lang['PHP 5 is required'] = 'Je nutné PHP 5';
+$lang['PHP 5 is required'] = 'Je nutné PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Na Vašom webhostingu je PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sa môže pokúsiť zmeniť Vaše nastavenie na PHP 5 tým, že vytvorí alebo zmení súbor .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sa môže pokúsiť zmeniť Vaše nastavenie na PHP 5.2 tým, že vytvorí alebo zmení súbor .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Prípadne môžete zmeniť Vašu konfiguráciu sami a potom reštartovať Piwigo.';
-$lang['Try to configure PHP 5'] = 'Pokúste sa zmeniť Vaše nastavenie na PHP 5';
+$lang['Try to configure PHP 5'] = 'Pokúste sa zmeniť Vaše nastavenie na PHP 5.2';
 $lang['Sorry!'] = 'Bohužiaľ!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nebolo schopné zmeniť Vaše nastavenie na PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Obráďte sa na poskytovateľa Vašeho webhostingu, aby ste zistili, ako môžete zmeniť Vaše nastavenie na PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nebolo schopné zmeniť Vaše nastavenie na PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Obráďte sa na poskytovateľa Vašeho webhostingu, aby ste zistili, ako môžete zmeniť Vaše nastavenie na PHP 5.2';
 $lang['Hope to see you back soon.'] = 'Veríme, že sa čoskoro uvidíme.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gratulujeme, Piwigo inštalácia je ukončená';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Náhradným riešením je skopírovať text z boxu vyššie a vložiť ho do súboru "local/config/database.inc.php" (Upozornenie: súbor database.inc.php môže obsahovať len to, čo je v tomto boxe, žiadne znaky odriadkovania alebo medzery)';
@@ -68,5 +67,4 @@ $lang['Just another Piwigo gallery'] = 'Len iná Piwigo galéria';
 $lang['Welcome to my photo gallery'] = 'Vitajte v mojej foto galérii';
 $lang['Welcome to your new installation of Piwigo!'] = 'Vitajte vo Vašej novej inštalácii Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Neváhajte konzultovať na našom fóre každú pomoc: %s'; 
-$lang['localhost or other, supplied by your host provider'] = 'localhost alebo iné, obdržíte od poskytovateľa hostu';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost alebo iné, obdržíte od poskytovateľa hostu';
\ No newline at end of file
diff --git a/sources/language/sk_SK/upgrade.lang.php b/sources/language/sk_SK/upgrade.lang.php
index 21f2122..815883b 100644
--- a/sources/language/sk_SK/upgrade.lang.php
+++ b/sources/language/sk_SK/upgrade.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sl_SI/admin.lang.php b/sources/language/sl_SI/admin.lang.php
index baa6284..778a00e 100644
--- a/sources/language/sl_SI/admin.lang.php
+++ b/sources/language/sl_SI/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -370,7 +370,7 @@ $lang['Forbidden'] = 'Prepovedano';
 $lang['Form'] = 'Obrazec';
 $lang['GD library is missing'] = 'GD knjižnica ni nameščena';
 $lang['GD version'] = 'GD različica';
-$lang['Gallery title'] = 'Naslov galerije';
+$lang['Gallery title'] = 'Ime galerije';
 $lang['Gallery unlocked'] = 'Galerija je odklenjena';
 $lang['Generate multiple size images'] = 'Ustvari slike različnih velikosti';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Omogoči dovoljenje za pisanje (chmod 777) na "%s" mapi v korenu vaše Piwigo namestitve';
@@ -402,7 +402,7 @@ $lang['Dissociate from album'] = 'Loči od albuma';
 $lang['Dissociated'] = 'Loči';
 $lang['Do you want to activate anyway?'] = 'Želite vseeno aktivirati?';
 $lang['Does not represent'] = 'Ni sličica za';
-$lang['Dump Database'] = 'Odloži podatkovno bazo';
+$lang['Dump Database'] = 'Shrani bazo podatkov';
 $lang['Duplicate'] = 'Podvoji';
 $lang['Duplicate selected tags'] = 'Podvoji izbrane oznake';
 $lang['Duplicates'] = 'Podvojeni';
@@ -606,7 +606,7 @@ $lang['You cannot delete your account'] = 'Vašega računa ne morete izbrisati.'
 $lang['You cannot move an album in its own sub album'] = 'Albuma ne morete premakniti v njegov pod-album';
 $lang['You have %d orphan tags: %s.'] = 'Imate %d osirotelih oznak: %s.';
 $lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'Določili ste <i>$conf[\'order_by\']</i> v vaši lokalni nastavitveni datoteki. Ta parameter je opuščen zato ga prosimo odstranite ali spremenite v: <i>$conf[\'order_by_custom\']</i> !';
-$lang['You have subscribed to receiving notifications by mail.'] = 'Naročili ste se na prejemanje novic na e-pošto.';
+$lang['You have subscribed to receiving notifications by mail.'] = 'Naročili ste se na prejemanje obvestil na e-pošto.';
 $lang['You have unsubscribed from receiving notifications by mail.'] = 'Odjavili ste obveščanje po e-pošti.';
 $lang['You need to confirm deletion'] = 'Izbris morate potrditi';
 $lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = 'Razmislite o nadgradnji vašega sistema! Le tako boste lahko uporabljali vse možnosti aplikacije. V nasprotnem primeru aplikacija morda ne bo delovala ali ne bo delovala pravilno.';
@@ -627,7 +627,7 @@ $lang['Week starts on'] = 'Teden se začne z';
 $lang['Who can see these photos?'] = 'Kdo lahko vidi te slike?';
 $lang['Who can see this photo?'] = 'Kdo lahko vidi to sliko?';
 $lang['Width'] = 'Širina';
-$lang['With blank value, gallery title will be used'] = 'Če je prazno bo uporabljen naslov galerije';
+$lang['With blank value, gallery title will be used'] = 'Če je prazno bo uporabljeno ime galerije';
 $lang['With no album'] = 'Brez albuma';
 $lang['With no tag'] = 'Brez oznake';
 $lang['User "%s" created with "%s" like password'] = 'Uporabnik "%s" ustvarjen z geslom "%s"';
@@ -650,7 +650,7 @@ $lang['Virtual album added'] = 'Navidezni album dodan';
 $lang['Virtual album deleted'] = 'Navidezni album izbrisan';
 $lang['Virtual album name'] = 'Ime navideznega albuma';
 $lang['Virtual albums to move'] = 'Navidezni album za premikanje';
-$lang['Unable to dump database.'] = 'Ne morem zavreči podatkovne baze';
+$lang['Unable to dump database.'] = 'Ne morem shraniti baze podatkov';
 $lang['Uncheck all'] = 'Odznači vse';
 $lang['Unknown upload error'] = 'Nepoznana napaka pri nalaganju';
 $lang['Unlock gallery'] = 'Odkleni galerijo';
@@ -676,7 +676,7 @@ $lang['Thumbnail'] = 'Sličica';
 $lang['Thumbnails generation in progress...'] = 'Ustvarjanje sličic je v teku.....';
 $lang['Time'] = 'Čas';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Čas za pošiljanje pošte je omejen. Ostala pošta je bila prezrta.';
-$lang['Title'] = 'Naslov';
+$lang['Title'] = 'Ime';
 $lang['To send ?'] = 'Poslati?';
 $lang['To subscribe'] = 'Naročiti se';
 $lang['To unsubscribe'] = 'Odjaviti se';
@@ -685,7 +685,7 @@ $lang['Tools'] = 'Orodja';
 $lang['Two updates are available'] = 'Na voljo stad ve posodobitvi';
 $lang['Type here the author name'] = 'Tu vpišite ime avtorja';
 $lang['Type here the name of the new group'] = 'Tu vpišite ime nove skupine';
-$lang['Type here the title'] = 'Tu vpišite naslov';
+$lang['Type here the title'] = 'Tu vpišite ime galerije';
 $lang['Type in a search term'] = 'Vpišite iskalni niz';
 $lang['Unable to check for upgrade.'] = 'Ne morem preveriti za nadgradnjo';
 $lang['This name is already used by another group.'] = 'To ime že uporablja druga skupina';
@@ -732,7 +732,7 @@ $lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'Dimenzija sl
 $lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'Naložena datoteka presega direktivo MAX_FILE_SIZE , ki je bila določena v HTML obrazcu';
 $lang['Subscribe'] = 'Naroči se';
 $lang['Subscribe %s'] = 'Naroči %s';
-$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Naroči %s se na Piwigo Obvestilne novice';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Ta poštni naslov: %s naroči na obveščanje o Piwigo novicah';
 $lang['Subscribe to notification by mail'] = 'Naroči se na obvestila na e-pošto';
 $lang['Subscribe/unsubscribe users'] = 'Naroči/odjavi uporabnike';
 $lang['Subscribed'] = 'Naročen';
@@ -872,7 +872,7 @@ $lang['Piwigo version'] = 'Piwigo različica';
 $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Prosimo preverite doveljenja za "plugins" direktorij in poddirektorije (chmod)';
 $lang['Please select at least two groups'] = 'Prosimo iberite vsaj dve skupini';
 $lang['Please wait...'] = 'Prosimo počakajte...';
-$lang['Plugin has been successfully copied'] = 'Ta vtičnik je bil uspešno kopiran.';
+$lang['Plugin has been successfully copied'] = 'Ta vtičnik je bil uspešno nameščen.';
 $lang['Plugin list'] = 'Seznam Vtičnikov';
 $lang['Plugins'] = 'Vtičniki';
 $lang['Plugins which need upgrade'] = 'Vtičniki, ki jih je potrebno nadgraditi';
@@ -970,11 +970,21 @@ $lang['Activate it now'] = 'Aktivirajte zdaj';
 $lang['Allow users to add a link to their website'] = 'Dovoli uporabnikom da dodajo povezavo na njihovo spletno stran';
 $lang['Empty caddie'] = 'Izprazni košarico';
 $lang['Impossible to deactivate the default theme.'] = 'Privzete teme ni možno izključiti';
-$lang['Mail address is mandatory for registration'] = 'e-poštni naslov je obezen ob registraciji';
+$lang['Mail address is mandatory for registration'] = 'e-poštni naslov je obvezen ob registraciji';
 $lang['No and unlock sub-albums'] = 'Ne in odkleni pod-albume';
 $lang['The settings for the guest are from the %s user'] = 'Nastavitve za gosta so od uporabnika  %s';
 $lang['based on'] = 'temlji na';
 $lang['between %s and %s MB'] = 'med  %s in %s MB';
 $lang['date & time'] = 'Datum in ura';
 $lang['file name'] = 'ime datoteke';
-$lang['width & height'] = 'širina in višina';
\ No newline at end of file
+$lang['width & height'] = 'širina in višina';
+$lang['Upload in progress'] = 'Prenos v teku';
+$lang['Delete %d orphan photos'] = 'Izbriši  %d osirotele slike';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Vsako poslano e-poštno sporočilo bo vsebovalo lastni, samodejni ključ za preverjanje pristnosti povezave, v trajanju do %s.';
+$lang['Edit user'] = 'Uredi uporabnika';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Zaradi varnostnih razlogov ključ za preverjanje pristnosti ne deluje za administratorje';
+$lang['No recipient selected'] = 'Ni izbranih prejemnikov';
+$lang['No user is permitted to see this private album'] = 'Noben uporabnik nima dovoljenja za ogled tega zasebnega albuma';
+$lang['Orphans'] = 'Sirote';
+$lang['Recipients'] = 'Prejemniki';
+$lang['Y Repeat'] = 'Y ponavljanje';
\ No newline at end of file
diff --git a/sources/language/sl_SI/common.lang.php b/sources/language/sl_SI/common.lang.php
index ccb1931..c9c6a4d 100644
--- a/sources/language/sl_SI/common.lang.php
+++ b/sources/language/sl_SI/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Slovenšcina [SI]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=453
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -423,4 +423,5 @@ $lang['Album name, Z &rarr; A'] = 'Ime Albuma, Ž &rarr; A';
 $lang['Apply on properties'] = 'Uporabi v lastnostih';
 $lang['Link: %s'] = 'Povezava: %s';
 $lang['Photo description'] = 'Opis slike';
-$lang['Photo title'] = 'Ime slike';
\ No newline at end of file
+$lang['Photo title'] = 'Ime slike';
+$lang['Your authentication key is no longer valid.'] = 'Vaš avtorizacijski ključ ni več veljaven.';
\ No newline at end of file
diff --git a/sources/language/sl_SI/help/cat_perm.html b/sources/language/sl_SI/help/cat_perm.html
new file mode 100644
index 0000000..8691f2e
--- /dev/null
+++ b/sources/language/sl_SI/help/cat_perm.html
@@ -0,0 +1,13 @@
+<h2>Urejanje dovoljenj za ogled albuma</h2>
+
+<p>Ta stran je na voljo le za zasebne albume. Tu lahko nastavite
+dovoljenja uporabnikom in skupinam, ki imajo dovoljenje za ogled zasebnih albumov.</p>
+
+<h3>Skupine</h3>
+
+<p>Tu lahko skupini uporabnikov dovolite ali omejite dostop do trenutnega albuma. S spremembo dovoljenja
+skupine, uporabnikom, ki so člani te skupine dovolite ali omejite dostop do albuma.</p>
+
+<h3>Uporabniki</h3>
+
+<p>Dovoljenja za dostop do albuma lahko določite tudi vsakemu posameznemu uporabniku. Uporabniku, ki že ima dostop preko skupine lahko tu preko izjem onemogočite dostop do albuma.</p>
\ No newline at end of file
diff --git a/sources/language/sl_SI/help/help_misc.html b/sources/language/sl_SI/help/help_misc.html
new file mode 100644
index 0000000..f69be21
--- /dev/null
+++ b/sources/language/sl_SI/help/help_misc.html
@@ -0,0 +1,9 @@
+<p>Ko ste ustvarili svojo galerijo jo lahko nastavite za obiskovalce
+<ul>
+	<li>Željeni privzeti prikaz v <span class="pwgScreen">Administracija &raquo; Konfiguracija &raquo; Možnosti</span> na zavihku <span class="pwgScreen">Nastavitve gosta</span></li>
+	<li>Privzeto preobleko - temo v <span class="pwgScreen">Administracija &raquo; Konfiguracija &raquo; Teme</span></li>
+	<li>Privzet jezik v <span class="pwgScreen">Administracija &raquo; Konfiguracija &raquo; Jeziki</span></li>
+ </ul>
+ Privzeto, bo vsak nov uporabnik podedoval te lastnosti ob registraciji.
+</p>
+<p>V primeru dodatnih vprašanj, vas Piwigo skupnost pozdravlja na <a href="http://piwigo.org/forum" target="_blank">svojem forumu</a>.</p>
\ No newline at end of file
diff --git a/sources/language/sl_SI/install.lang.php b/sources/language/sl_SI/install.lang.php
index 1b66192..f5e9ff4 100755
--- a/sources/language/sl_SI/install.lang.php
+++ b/sources/language/sl_SI/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -21,13 +21,13 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-$lang['PHP 5 is required'] = 'Zahtevan je PHP 5';
+$lang['PHP 5 is required'] = 'Zahtevan je PHP 5.2';
 $lang['Password [confirm]'] = 'Geslo [potrdi]';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo bo poskušal preklopiti vaše nastavitve na PHP 5 z ustvarjanjem ali urejanjem .htacceess datoteke';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ni mogel nastaviti PHP 5.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo bo poskušal preklopiti vaše nastavitve na PHP 5.2 z ustvarjanjem ali urejanjem .htacceess datoteke';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ni mogel nastaviti PHP 5.2';
 $lang['Sorry!'] = 'Oprostite!';
 $lang['Start Install'] = 'Začni namestitev';
-$lang['Try to configure PHP 5'] = 'Poskušam nastaviti PHP 5';
+$lang['Try to configure PHP 5'] = 'Poskušam nastaviti PHP 5.2';
 $lang['User'] = 'Uporabnik';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Obiskovalci bodo lahko ta elektronski naslov uporabljali za kontakt s skrbnikom spletne strani ';
 $lang['Welcome to my photo gallery'] = 'Dobrodošli v moji foto galeriji';
@@ -58,11 +58,10 @@ $lang['user password given by your host provider'] = 'geslo uporabnika pridoblje
 $lang['verification'] = 'preverjanje';
 $lang['webmaster login can\'t contain characters \' or "'] = 'prijavno ime skrbnika ne sme vsebovati znakov \' ali "';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'imena tabel v podatkovni bazi bodo imela predpono. (omogoča lažje upravljanje tabel)';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Posvetujte se z vašim ponudnikom gostovanja kako bi lahko sami prešli na zahtevano PHP 5 različico.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Posvetujte se z vašim ponudnikom gostovanja kako bi lahko sami prešli na zahtevano PHP 5.2 različico.';
 $lang['also given by your host provider'] = 'tudi pridobljeno od vašega ponudnika gostovanja';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Potrebujete dodatno pomoč? Zastavite vprašanje na <a href="%s">Piwigo oglasni deski</a>.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Upoštevajte da lahko sami spremenite nastavitve in nato ponovno zaženete Piwigo.';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Druga rešitev je, da kopirate besedilo v polje zgoraj in ga prilepite v datoteko "local/config/database.inc.php" (Opozorilo: database.inc.php mora vsebovati le to kar je v besedilnem polju, brez znakov prehoda v novo vrstico(line return)ali znakov za presledke)';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Varno shranite, omogoča vam dostop do administratorske nadzorne plošče!';
-$lang['localhost or other, supplied by your host provider'] = 'localhost ali drug naslov ki ga imate pri svojem ponudniku gostovanja';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost ali drug naslov ki ga imate pri svojem ponudniku gostovanja';
\ No newline at end of file
diff --git a/sources/language/sl_SI/upgrade.lang.php b/sources/language/sl_SI/upgrade.lang.php
index ec5abab..e226bad 100755
--- a/sources/language/sl_SI/upgrade.lang.php
+++ b/sources/language/sl_SI/upgrade.lang.php
@@ -1,24 +1,24 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'Kot previdnostni ukrep so sledeči vtičniki onemogočeni. Preveriti morate posodobitve za te vtičnike in jih nato ponovno omogočiti:';
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'Od predhodnje nastavitve so shranjene le predpone sličic in e-poštni naslov skrbnika spletne strani';
@@ -28,7 +28,7 @@ $lang['Statistics'] = 'Statistika';
 $lang['This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).'] = 'Ta stran predlaga, da nadgradite podatkovno bazo vaše Piwigo različice na novejšo različico. Čarovnik nadgradnje je zaznal, da trenutno uporabljate <strong>različico %s</strong> (ali enakovredno).';
 $lang['Upgrade'] = 'Nadgradi';
 $lang['Upgrade from version %s to %s'] = 'Nadgradi iz različice %s na različico %s';
-$lang['Upgrade informations'] = 'Informacije nadgradnje';
+$lang['Upgrade informations'] = 'Povzetek posodobitve';
 $lang['User permissions and group permissions have been erased'] = 'Dovoljenja uporabnikov in skupin so bila izbrisana';
 $lang['You do not have access rights to run upgrade'] = 'Nimate dovoljenja za izvedbo nadgradnje';
 $lang['total SQL time'] = 'skupen SQL čas';
@@ -36,5 +36,4 @@ $lang['total upgrade time'] = 'skupen čas nadgradnje';
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'V <i>%s</i>, pred <b>?></b>, vstavi:';
 $lang['Only administrator can run upgrade: please sign in below.'] = 'Nadgradnjo lahko opravi le Administrator. Prosimo prijavite se spodaj:';
 $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'Kot previdnostni ukrep so sledeče preobleke onemogočene. Preveriti morate posodobitve za te preobleke in jih nato ponovno omogočiti:';
-$lang['All sub-albums of private albums become private'] = 'Vsi pod-albumi zasebnega albuma postanejo zasebni';
-?>
\ No newline at end of file
+$lang['All sub-albums of private albums become private'] = 'Vsi pod-albumi zasebnega albuma postanejo zasebni';
\ No newline at end of file
diff --git a/sources/language/sr_RS/admin.lang.php b/sources/language/sr_RS/admin.lang.php
index 9166a5f..b917948 100644
--- a/sources/language/sr_RS/admin.lang.php
+++ b/sources/language/sr_RS/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -981,4 +981,13 @@ $lang['based on'] = 'на основу';
 $lang['between %s and %s MB'] = 'између %s и %s MB';
 $lang['date & time'] = 'датум и време';
 $lang['file name'] = 'назив датотеке';
-$lang['width & height'] = 'ширина и висина';
\ No newline at end of file
+$lang['width & height'] = 'ширина и висина';
+$lang['Y Repeat'] = 'Понављање по y';
+$lang['No user is permitted to see this private album'] = 'Ниједном кориснику није дозвољено да види овај лични албум';
+$lang['No recipient selected'] = 'Није одабран прималац';
+$lang['Edit user'] = 'Измени корисника';
+$lang['Delete %d orphan photos'] = 'Обриши %d слике без родитеља';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Свако послато е-писмо ће садржати сопствени кључ за пријаву на адресу, важи %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Из безбедоносних разлога, кључеви за пријаву не раде за администраторе.';
+$lang['Orphans'] = 'Без родитеља';
+$lang['Recipients'] = 'Примаоци';
\ No newline at end of file
diff --git a/sources/language/sr_RS/common.lang.php b/sources/language/sr_RS/common.lang.php
index d57c231..63633ef 100644
--- a/sources/language/sr_RS/common.lang.php
+++ b/sources/language/sr_RS/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Српски [SR]
-Version: 2.7.2
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=458
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -426,4 +426,5 @@ $lang['Photo title'] = 'Наслов фотографије';
 $lang['Apply on properties'] = 'Примени на особине';
 $lang['Album name, A &rarr; Z'] = 'Назив албума, А &rarr; Ш';
 $lang['Album name, Z &rarr; A'] = 'Назив албума, Ш &rarr; А';
-$lang['Link: %s'] = 'Веза: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Веза: %s';
+$lang['Your authentication key is no longer valid.'] = 'Ваш кључ за проверу идентитета није више важећи.';
\ No newline at end of file
diff --git a/sources/language/sr_RS/index.php b/sources/language/sr_RS/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/sr_RS/index.php
+++ b/sources/language/sr_RS/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sr_RS/install.lang.php b/sources/language/sr_RS/install.lang.php
index 744ea55..3f4750f 100644
--- a/sources/language/sr_RS/install.lang.php
+++ b/sources/language/sr_RS/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Лозинка[потврди]';
 $lang['verification'] = 'Провера';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Потребна Вам је помоц? Питајте на  <a href="%s">Piwigo табли за поруке</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Посетиоци ће бити у могућности да са ове електронске адресе контактирају администратора странице';
-$lang['PHP 5 is required'] = 'PHP 5 је неопходан';
+$lang['PHP 5 is required'] = 'PHP 5.2 је неопходан';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Изгледа да Ваш сервер тренутно користи PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'ПиВиГо може покушати да промени Вашу конфигурацију на PHP 5 формирањем или мењањем .htaccess датотеке.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'ПиВиГо може покушати да промени Вашу конфигурацију на PHP 5.2 формирањем или мењањем .htaccess датотеке.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Имајте у виду да можете сами изменити Вашу конфигурацију рестартовати Piwigo после тога.';
-$lang['Try to configure PHP 5'] = 'Покушајте да подестите PHP 5';
+$lang['Try to configure PHP 5'] = 'Покушајте да подестите PHP 5.2';
 $lang['Sorry!'] = 'Жао нам је!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'ПиВиГо није успео да подеси PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Требало би да се обартите подршци Вашег хостинг провајдера за упутство како да промените на PHP 5 сами.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'ПиВиГо није успео да подеси PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Требало би да се обартите подршци Вашег хостинг провајдера за упутство како да промените на PHP 5.2 сами.';
 $lang['Hope to see you back soon.'] = 'Надамо се да се ускоро поново видимо.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Честитамо, ПиВиГо инсталација је завршена';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Алтернативно решење је да копирате текст из кутије изнад и налепите у датотеку "local/config/database.inc.php" (Упозорење : database.inc.php мора садржати само текст из кутије, без линије или празних карактера)';
diff --git a/sources/language/sr_RS/upgrade.lang.php b/sources/language/sr_RS/upgrade.lang.php
index b3336cd..b9ed6d7 100644
--- a/sources/language/sr_RS/upgrade.lang.php
+++ b/sources/language/sr_RS/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sv_SE/admin.lang.php b/sources/language/sv_SE/admin.lang.php
index 0f43a4b..08d1b2a 100644
--- a/sources/language/sv_SE/admin.lang.php
+++ b/sources/language/sv_SE/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -981,4 +981,13 @@ $lang['width & height'] = 'bredd & höjd';
 $lang['Activate it now'] = 'Aktivera den nu';
 $lang['Allow users to add a link to their website'] = 'Tillåter användare att länka till sin egen hemsida';
 $lang['Empty caddie'] = 'Töm korgen';
-$lang['Impossible to deactivate the default theme.'] = 'Det går inte att inaktivera standardtema. Gör först ett annat tema till standardtema.';
\ No newline at end of file
+$lang['Impossible to deactivate the default theme.'] = 'Det går inte att inaktivera standardtema. Gör först ett annat tema till standardtema.';
+$lang['Y Repeat'] = 'Y Upprepa';
+$lang['Recipients'] = 'Mottagare';
+$lang['Orphans'] = 'Övergivet';
+$lang['No user is permitted to see this private album'] = 'Ingen användare tillåts se detta privata album';
+$lang['No recipient selected'] = 'Ingen mottagare vald';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Av säkerhetsskäl fungerar inte autentiseringsnycklar för administratörer.';
+$lang['Edit user'] = 'Ändra användare';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Varje epost som sänds kommer att innehålla sina egna automatiska autentiseringsnycklar som länkar, giltiga i %s.';
+$lang['Delete %d orphan photos'] = 'Radera %d övergivna foton';
\ No newline at end of file
diff --git a/sources/language/sv_SE/common.lang.php b/sources/language/sv_SE/common.lang.php
index fdb82c4..c246893 100644
--- a/sources/language/sv_SE/common.lang.php
+++ b/sources/language/sv_SE/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Svenska [SE]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=451
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -425,4 +425,5 @@ $lang['Photo description'] = 'Fotots beskrivning';
 $lang['Photo title'] = 'Fotots titel';
 $lang['Album name, A &rarr; Z'] = 'Albumnam, A &rarr; Ö';
 $lang['Album name, Z &rarr; A'] = 'Albumnamn, Ö &rarr; A';
-$lang['Link: %s'] = 'Länk: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Länk: %s';
+$lang['Your authentication key is no longer valid.'] = 'Din autenticeringsnyckel är inte längre giltig.';
\ No newline at end of file
diff --git a/sources/language/sv_SE/help/index.php b/sources/language/sv_SE/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/sv_SE/help/index.php
+++ b/sources/language/sv_SE/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/sv_SE/help/photos_add_ftp.html b/sources/language/sv_SE/help/photos_add_ftp.html
index 028058f..9486556 100755
--- a/sources/language/sv_SE/help/photos_add_ftp.html
+++ b/sources/language/sv_SE/help/photos_add_ftp.html
@@ -43,11 +43,20 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Förutom "pwg_representative" (se förklaring nedan) så skapar varje katalog i "galleries" ett eget album. Det finns ingen begränsning på hur många under album som går att skapa.</li>
+  <li>Förutom "pwg_representative" and "pwg_format" (se förklaring nedan) så skapar varje katalog i "galleries" ett eget album. Det finns ingen begränsning på hur många under album som går att skapa.</li>
 
   <li>>I grunden representeras varje objekt av en fil. En fil kan vara ett
   Piwigo objekt om filändelsen är med i <code>file_ext</code>
@@ -60,6 +69,8 @@ galleries
   Du kan om du vill associera en "thumbnail" fil som visar istället för ikonen.
   (se video.avi i exemplet ovan).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Varning</em>: Katalog och filnamn får bara bestå av bokstäver och dessa tecken "-", "_" or ".". Inga mellanslag eller accentuerade
   bokstäver.</li>
 
@@ -68,4 +79,4 @@ galleries
   Synkronisera</span></li>
 
 </ul>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/sources/language/sv_SE/install.lang.php b/sources/language/sv_SE/install.lang.php
index 10f5ecc..9013244 100644
--- a/sources/language/sv_SE/install.lang.php
+++ b/sources/language/sv_SE/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Lösenord [bekräfta]';
 $lang['verification'] = 'verifiering';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Behöver du hjälp? Ställ din fråga på <a href="%s">Piwigo message board</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Besökare kommer att kunna kontakta sidans administratör med denna e-mail adress';
-$lang['PHP 5 is required'] = 'PHP 5 krävs';
+$lang['PHP 5 is required'] = 'PHP 5.2 krävs';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Ditt webbhotell använder just nu PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan kanske komma att ändra dina inställningar i PHP 5 genom att skapa eller ändra en .htaccess fil.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan kanske komma att ändra dina inställningar i PHP 5.2 genom att skapa eller ändra en .htaccess fil.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Notera att du kan ändra dina inställningar förutsatt att du startar om Piwigo efteråt.';
-$lang['Try to configure PHP 5'] = 'Försök att konfigurera PHP 5';
+$lang['Try to configure PHP 5'] = 'Försök att konfigurera PHP 5.2';
 $lang['Sorry!'] = 'Ursäkta!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kunde inte konfigurera PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Vi rekomenderar att du kontaktar leverantören för ditt webbhotell för att se hur du kan ändra till PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kunde inte konfigurera PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Vi rekomenderar att du kontaktar leverantören för ditt webbhotell för att se hur du kan ändra till PHP 5.2';
 $lang['Hope to see you back soon.'] = 'Välkommen tillbaka snart igen.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gratulerar, Piwigo installationen är klar';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'En alternativ lösning är att kopiera texten ovan och klistra in i filen "local/config/database.inc.php" (Varning : database.inc.php får enbart innehålla texten från textarean, inga radbrytare eller mellanrum)';
@@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Ännu ett Piwigo galleri';
 $lang['Welcome to my photo gallery'] = 'Välkommen till mitt fotogalleri';
 $lang['Welcome to your new installation of Piwigo!'] = 'Välkomment till din nya installation av Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Tveka inte att kontakta våra forum för hjälp: %s';
-$lang['localhost or other, supplied by your host provider'] = 'localhost eller det värdnams som du valt eller tilldelats av din webhotells leverantör/server';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost eller det värdnams som du valt eller tilldelats av din webhotells leverantör/server';
\ No newline at end of file
diff --git a/sources/language/sv_SE/upgrade.lang.php b/sources/language/sv_SE/upgrade.lang.php
index 0d698dd..036adff 100644
--- a/sources/language/sv_SE/upgrade.lang.php
+++ b/sources/language/sv_SE/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -30,8 +30,8 @@ $lang['Statistics'] = 'Statistik';
 $lang['total upgrade time'] = 'total uppgraderings tid';
 $lang['total SQL time'] = 'Total SQL tid';
 $lang['SQL queries'] = 'SQL-frågor';
-$lang['Upgrade informations'] = 'Uppgraderings information';
-$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'Gör en underhållskontroll i mynyn [Administration> Verktyg> Underhåll] om du stöter på några problem. .';
+$lang['Upgrade informations'] = 'Uppgraderingsinformation';
+$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'Gör en underhållskontroll i menyn [Administration> Verktyg> Underhåll] om du stöter på några problem.';
 $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'Som en försiktighetsåtgärd, har följande insticksmoduler avaktiverats, Du måste kontrollera alla plugins uppgraderingar före återaktivering av dem:';
 $lang['Only administrator can run upgrade: please sign in below.'] = 'Endast en administratör kan köra uppgraderingen: Logga in nedan.';
 $lang['You do not have access rights to run upgrade'] = 'Du har inte behörighet att köra uppgradering';
@@ -40,5 +40,3 @@ $lang['User permissions and group permissions have been erased'] = 'Användare o
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'miniatyrbilder Endast prefix och webmaster postadress har sparats från tidigare konfiguration';
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'I <i>%s</i>, innan <b>?></b>, infoga:';
 $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'Som en försiktighetsåtgärd, har följande teman har avaktiverats. Du måste kolla tema uppgraderingar innan du aktivera dem:';
-
-?>
\ No newline at end of file
diff --git a/sources/language/ta_IN/admin.lang.php b/sources/language/ta_IN/admin.lang.php
index 40546dd..cb7ad31 100755
--- a/sources/language/ta_IN/admin.lang.php
+++ b/sources/language/ta_IN/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/ta_IN/common.lang.php b/sources/language/ta_IN/common.lang.php
index ca3d4c0..9159a7a 100644
--- a/sources/language/ta_IN/common.lang.php
+++ b/sources/language/ta_IN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: தமிழ் [IN]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=638
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/ta_IN/install.lang.php b/sources/language/ta_IN/install.lang.php
index 6b24e74..286cb0b 100755
--- a/sources/language/ta_IN/install.lang.php
+++ b/sources/language/ta_IN/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -48,7 +48,7 @@ $lang['localhost or other, supplied by your host provider'] = 'localhost அல
 $lang['please enter your password again'] = 'தயவுசெய்து மறுபடியும் உங்களுடைய கடவுச்சொல்லை உள்ளிடவும்';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'ஆலோசனை தயங்க வேண்டாம் நம்முடைய கருத்துக்களம்
 எந்தவொரு உதவிக்கு.:% s';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'நீங்கள் புரவன் வழங்குநரிடம் ஆதரவு பார்க்கவும் மற்றும் பார்க்க வேண்டும் எப்படி நீங்கள் PHP 5 மூலம்  மாற்றலாம்.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'நீங்கள் புரவன் வழங்குநரிடம் ஆதரவு பார்க்கவும் மற்றும் பார்க்க வேண்டும் எப்படி நீங்கள் PHP 5.2 மூலம்  மாற்றலாம்.';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'நீங்கள் கட்டமைப்பு கோப்பினை பதிவிறக்கம் செய்யலாம்
 மற்றும் பதிவேற்றலாம் அது உங்களுடைய local/config நிறுவலின் கோப்பகத்தில்';
 $lang['also given by your host provider'] = 'மேலும் வழங்கப்பட்டஉங்களுடைய புரவன் வழங்குநரிடம்';
@@ -58,15 +58,14 @@ $lang['Welcome to your new installation of Piwigo!'] = 'வரவேற்கி
 உங்களுடைய புதிய Piwigo நிறுவல்! செய்ய';
 $lang['Welcome to my photo gallery'] = 'வரவேற்கிறேன்
 என்னுடைய புகைப்படம் கேலரிக்கு';
-$lang['Try to configure PHP 5'] = 'PHP 5 கட்டமைக்க முயற்சிக்கவும்';
+$lang['Try to configure PHP 5'] = 'PHP 5.2 கட்டமைக்க முயற்சிக்கவும்';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'பார்வையாளர்கள் இந்த மின்னஞ்சலை பயன்படுத்தி தளத்தின் நிர்வாகியை தொடர்புகொள்ளவும்';
 $lang['User'] = 'பயனர்';
 $lang['Sorry!'] = 'வருந்துகிறேன்!';
 $lang['Start Install'] = 'நிறுவலை தொடங்கு';
 $lang['Password ']['confirm'] = 'கடவுச்சொல்லை [உறுதிப்படுத்தவும்].';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo PHP 5 கட்டமைக்க முடியவில்லை';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo PHP 5.2 கட்டமைக்க முடியவில்லை';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo முயற்சி செய்யலாம்
-ஒரு. htaccess கோப்பு உருவாக்குவதில் அல்லது மாற்றியமைப்பதன் மூலம் PHP 5 உங்கள் கட்டமைப்பு மாற';
-$lang['PHP 5 is required'] = 'PHP 5 தேவைப்படுகிறது';
-$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'குறிப்பு நீங்களே உங்கள் கட்டமைப்பை மாற்ற செய்யலாம், மேலும் Piwigo மீண்டும் துவக்கவும்';
-?>
\ No newline at end of file
+ஒரு. htaccess கோப்பு உருவாக்குவதில் அல்லது மாற்றியமைப்பதன் மூலம் PHP 5.2 உங்கள் கட்டமைப்பு மாற';
+$lang['PHP 5 is required'] = 'PHP 5.2 தேவைப்படுகிறது';
+$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'குறிப்பு நீங்களே உங்கள் கட்டமைப்பை மாற்ற செய்யலாம், மேலும் Piwigo மீண்டும் துவக்கவும்';
\ No newline at end of file
diff --git a/sources/language/ta_IN/upgrade.lang.php b/sources/language/ta_IN/upgrade.lang.php
index 3b3f844..15de809 100755
--- a/sources/language/ta_IN/upgrade.lang.php
+++ b/sources/language/ta_IN/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/th_TH/admin.lang.php b/sources/language/th_TH/admin.lang.php
index 33d9dbf..75acc89 100644
--- a/sources/language/th_TH/admin.lang.php
+++ b/sources/language/th_TH/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -21,9 +21,6 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-
-
-
 $lang[' and %d virtual'] = " และ %d";
 $lang[' and %d virtuals'] = " และ %d";
 $lang['%d album including'] = "%d อัลบั้มที่กำลังรวม";
@@ -959,4 +956,39 @@ $lang['Password updated'] = 'อัพเดตรหัสผ่าน';
 $lang['Update user'] = 'อัพเดตผู้ใช้';
 $lang['Upload in progress'] = 'การอัปโหลดอยู่ในระหว่างดำเนินการ';
 $lang['Activate it now'] = 'เปิดใช้งานตอนนี้';
-$lang['Mail theme'] = 'รูปแบบธีมอีเมล';
\ No newline at end of file
+$lang['Mail theme'] = 'รูปแบบธีมอีเมล';
+$lang['file name'] = 'ชื่อไฟล์';
+$lang['date & time'] = 'วันที่ และ เวลา';
+$lang['based on'] = 'พื้นฐานระบบรันบน';
+$lang['Impossible to deactivate the default theme.'] = 'เป็นไปไม่ได้ที่จะยกเลิกการใช้งานรูปแบบเริ่มต้น';
+$lang['Mail address is mandatory for registration'] = 'อีเมลนี้มีผลบังคับใช้สำหรับการลงทะเบียน';
+$lang['No and unlock sub-albums'] = 'ไม่มีและปลดล็อคอัลบั้มย่อย';
+$lang['No user selected of %d users'] = 'ไม่มีผู้ใช้งานที่ถูกเลือก %d ผู้ใช้งาน';
+$lang['No user selected, no action possible.'] = 'ไม่มีผู้ใช้งานที่ถูกเลือก, ไม่มีการดำเนินการใดที่เป็นไปได้';
+$lang['Registered on %s, %s.'] = 'ลงทะเบียนเมื่อ on %s, %s.';
+$lang['Select at least one tag'] = 'เลือกอย่างน้อ 1 แท็ก';
+$lang['The settings for the guest are from the %s user'] = 'การตั้งค่าสำหรับผู้มาเยี่ยมชม %s ผู้ใช้งาน';
+$lang['between %s and %s MB'] = 'ระหว่าง %s และ %s MB';
+$lang['on the %d selected users'] = 'จำนวน %d ผู้ใช้งานที่ถูกเลือก';
+$lang['No matching user found'] = 'ไม่ตรงกับผู้ใช้งานที่พบ';
+$lang['Empty caddie'] = 'ล้างแคดดี้';
+$lang['width & height'] = 'กว้าง & สูง';
+$lang['%d of %d users selected'] = 'ผู้ใช้งานจำนวน %d จาก %d คน ที่ถูกเลือก';
+$lang['User %s added'] = 'ผู้ใช้ %s ได้ถูกเพิ่ม';
+$lang['User %s updated'] = 'ผู้ใช้ %s ได้ถูกอัพเดต';
+$lang['Users modified'] = 'ผู้ใช้ได้รับการปรับปรุงแล้ว';
+$lang['Showing %s to %s of %s users'] = 'กำลังแสดง %s ถึง %s จาก %s ผู้ใช้งาน';
+$lang['Show %s users'] = 'แสดง %s ผู้ใช้งาน';
+$lang['Last visit on %s, %s.'] = 'เข้าเยี่ยมชมล่าสุดเมื่อ %s, %s.';
+$lang['Allow users to add a link to their website'] = 'อนุญาตให้ผู้ใช้งานเพิ่มลิ้งค์ที่เชื่อมโยงไปยังเว็บไซต์ของเขาเอง';
+$lang['All %d users are selected'] = 'ทั้งหมด %d คนที่ถูกเลือก';
+$lang['(filtered from %s total users)'] = '(ได้ถูกกรองจาก %s ผู้ใช้งานทั้งหมด)';
+$lang['Edit user'] = 'แก้ไขผู้ใช้งาน';
+$lang['No recipient selected'] = 'ไม่มีผู้รับที่คุณเลือก';
+$lang['No user is permitted to see this private album'] = 'ผู้ใช้ไม่ได้รับอนุญาตให้ดูอัลบั้มส่วนตัวนี้';
+$lang['Recipients'] = 'ผู้รับ';
+$lang['Y Repeat'] = 'ทำซ้ำในแนวตั้ง';
+$lang['Delete %d orphan photos'] = 'ลบ %d รูปออร์แฟนส์';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'แต่ละอีเมลที่ส่งจะมีการตรวจสอบที่สำคัญของตัวเองโดยอัตโนมัติในการเชื่อมโยงที่ถูกต้อง,สำหรับ %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'ด้วยเหตุผลด้านความปลอดภัยปุ่มตรวจสอบไม่ทำงานสำหรับผู้ดูแลระบบ';
+$lang['Orphans'] = 'ออร์แฟนส์';
\ No newline at end of file
diff --git a/sources/language/th_TH/common.lang.php b/sources/language/th_TH/common.lang.php
index 1cb9f12..b7cd6f1 100644
--- a/sources/language/th_TH/common.lang.php
+++ b/sources/language/th_TH/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: ภาษาไทย [TH]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=519
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -35,7 +35,6 @@ $lang_info['code'] = "th";
 $lang_info['plupload_code'] = "th_TH";
 $lang_info['zero_plural'] = "1";
 
-
 $lang['%d album updated'] = '%d อัลบั้มได้อัพเดตแล้ว';
 $lang['%d albums updated'] = '%d อัลบั้มที่ได้อัพเดตแล้ว';
 $lang['%d comment to validate'] = "%d ความเห็นรอการตรวจสอบ";
@@ -426,4 +425,5 @@ $lang['Apply on properties'] = 'นำไปใช้กับคุณสมบ
 $lang['Link: %s'] = 'ลิ้งค์: %s';
 $lang['No results for'] = 'ไม่มีผลลัพธ์การค้นหาสำหรับ';
 $lang['Photo description'] = 'รายละเอียดรูปภาพ';
-$lang['Photo title'] = 'ชื่อรูปภาพ';
\ No newline at end of file
+$lang['Photo title'] = 'ชื่อรูปภาพ';
+$lang['Your authentication key is no longer valid.'] = 'รหัสในการตรวจสอบสิทธิ์ของคุณไม่ถูกต้อง';
diff --git a/sources/language/th_TH/install.lang.php b/sources/language/th_TH/install.lang.php
index 2f3d477..f9fc868 100644
--- a/sources/language/th_TH/install.lang.php
+++ b/sources/language/th_TH/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "รหัสผ่าน [ยืนยัน]";
 $lang['verification'] = "การยืนยัน";
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = "ต้องการความช่วยเหลือ? โปรดถามคำถามไว้ได้ที่ <a href=\"%s\">บอร์ดข้อความของ Piwigo</a>.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "ผู้เยี่ยมชมจะสามารถที่จะใช้อีเมลนี้ เพื่อติดต่อกับผู้ดูแลระบบได้";
-$lang['PHP 5 is required'] = "PHP 5 จำเป็นต้องมี";
+$lang['PHP 5 is required'] = 'PHP 5.2 จำเป็นต้องมี';
 $lang['It appears your webhost is currently running PHP %s.'] = "มันจะแสดงบนเวิร์ฟเวอร์ที่คุณใช้งานอยู่ ซึ่งคุณใช้งานอยู่บน PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo อาจจะลองปรับการตั้งค่าของคุณไปยัง PHP 5 โดยการสร้างหรือแก้ไขปรับแต่งไฟล์ .htaccess.";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo อาจจะลองปรับการตั้งค่าของคุณไปยัง PHP 5.2 โดยการสร้างหรือแก้ไขปรับแต่งไฟล์ .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "จำไว้ว่า คุณสามารถเปลี่ยนแปลงการตั้งค่าในภายหลังได้ด้วยตนเอง.";
-$lang['Try to configure PHP 5'] = "ลองตั้งค่า PHP 5 ใหม่";
+$lang['Try to configure PHP 5'] = 'ลองตั้งค่า PHP 5.2 ใหม่';
 $lang['Sorry!'] = "เสียใจ!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo ไม่สามารถตั้งค่า PHP 5. ได้";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "คุณควรติดต่อไปยังผู้ให้บริการเซิร์ฟเวอร์ของคุณเพื่อสอบถามว่า เซิร์ฟเวอร์ดังกล่าวนี้สนับสนุนการทำงานของ PHP 5 หรือว่าคุณสามารถสลับไปใช้งาน PHP 5 ด้วยตนเอง ได้หรือไม่อย่างไร.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ไม่สามารถตั้งค่า PHP 5.2 ได้';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'คุณควรติดต่อไปยังผู้ให้บริการเซิร์ฟเวอร์ของคุณเพื่อสอบถามว่า เซิร์ฟเวอร์ดังกล่าวนี้สนับสนุนการทำงานของ PHP 5.2 หรือว่าคุณสามารถสลับไปใช้งาน PHP 5 ด้วยตนเอง ได้หรือไม่อย่างไร.';
 $lang['Hope to see you back soon.'] = "หวังว่าจะได้เจอคุณเร็วๆ นี้.";
 $lang['Congratulations, Piwigo installation is completed'] = 'ยินดีด้วย, การติดตั้ง Piwigo ได้ดำเนินการเสร็จเรียบร้อยแล้ว';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'คัดลอกข้อความในกล่องข้อความด้านล่าง เพื่อนำไปวางในไฟล์ "local/config/database.inc.php" (ข้อควรระวัง : ไฟล์ database.inc.php จะต้องเป็นข้อความที่ได้คัดลอกจากภายในกล่องข้อความเท่านั้น, จะต้องไม่มีบรรทัดเกิน หรืออักขระว่าง)';
@@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'เพียงแค่ Piwigo แก
 $lang['Welcome to my photo gallery'] = 'ยินดีต้อนรับสู่แกลลอรี่รูปภาพของฉัน';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'อย่าลังเลที่จะปรึกษาหรือโพสคำถามในฟอรั่มของเรา เพื่อขอความช่วยเหลือใดๆ :%s';
 $lang['Welcome to your new installation of Piwigo!'] = 'ยินดีต้อนรับสู่การติดตั้งใหม่ของ Piwigo!';
-$lang['localhost or other, supplied by your host provider'] = 'localhost หรืออื่น ๆ ที่จัดทำโดยผู้ให้บริการโฮสต์ของคุณ';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost หรืออื่น ๆ ที่จัดทำโดยผู้ให้บริการโฮสต์ของคุณ';
\ No newline at end of file
diff --git a/sources/language/th_TH/upgrade.lang.php b/sources/language/th_TH/upgrade.lang.php
index d7c538d..31743e6 100644
--- a/sources/language/th_TH/upgrade.lang.php
+++ b/sources/language/th_TH/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/tr_TR/admin.lang.php b/sources/language/tr_TR/admin.lang.php
index f13af7c..a62575d 100644
--- a/sources/language/tr_TR/admin.lang.php
+++ b/sources/language/tr_TR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/tr_TR/common.lang.php b/sources/language/tr_TR/common.lang.php
index aaf6d13..10b5ee2 100644
--- a/sources/language/tr_TR/common.lang.php
+++ b/sources/language/tr_TR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Türkçe [TR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=436
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -425,4 +425,5 @@ $lang['Apply on properties'] = 'Niteliklerine uygula';
 $lang['Album name, A &rarr; Z'] = 'Albüm adı, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = '
 Albüm adı, Z &rarr; A';
-$lang['Link: %s'] = 'Bağlantı: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Bağlantı: %s';
+$lang['Your authentication key is no longer valid.'] = 'Kimlik doğrulama anahtarınız artık geçerli değil.';
\ No newline at end of file
diff --git a/sources/language/tr_TR/help/photos_add_ftp.html b/sources/language/tr_TR/help/photos_add_ftp.html
index fdb96cd..78048e5 100755
--- a/sources/language/tr_TR/help/photos_add_ftp.html
+++ b/sources/language/tr_TR/help/photos_add_ftp.html
@@ -41,11 +41,20 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
+  <li>Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
 
   <li>Basically, an element is represented by a file. A file can be a
   Piwigo element if its extension is among <code>file_ext</code>
@@ -54,10 +63,12 @@ galleries
   be a picture if its extension is among <code>picture_ext</code>
   configuration parameter possibilities.</li>
 
-  <li>No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
+  <li>Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
   extension. Optionally, you can associate a thumbnail and a representative
   file (see video.avi in the example above).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Warning</em>: the name of directories and files must contain only letters, figures, "-", "_" or ".". No blank space, nor accentuated characters.</li>
 
   <li>Once photos are correctly placed in the
@@ -65,4 +76,4 @@ galleries
   Synchronize</span></li>
 
 </ul>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/sources/language/tr_TR/install.lang.php b/sources/language/tr_TR/install.lang.php
index 8589d91..d6b78fd 100644
--- a/sources/language/tr_TR/install.lang.php
+++ b/sources/language/tr_TR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Şifre [kabul]';
 $lang['verification'] = 'doğrulama';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Yardım ihtiyacınız var? Sorularınızı <a href="%s">Piwigo forumda sorabilirsiniz</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Ziyaretçilerin site yöneticisi ile bağlantıya geçmesi için bu e-posta adresini kullanabileceklerdir.';
-$lang['PHP 5 is required'] = 'PHP 5 gereklidir';
+$lang['PHP 5 is required'] = 'PHP 5.2 gereklidir';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Web sunucunuz şu anda PHP %s çalıştırıyor görünüyor.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo .htaccess dosyası oluşturarak veya değiştirerek ayarlarınızı PHP 5 \'e geçirmeyi deneyebilir.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo .htaccess dosyası oluşturarak veya değiştirerek ayarlarınızı PHP 5.2 \'e geçirmeyi deneyebilir.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Not: Yapılandırmayı kendiniz değiştirip sonrasında Piwigo\'yu tekrar başlatabilirsiniz.';
-$lang['Try to configure PHP 5'] = 'PHP 5 yapılandırmasını dene';
+$lang['Try to configure PHP 5'] = 'PHP 5.2 yapılandırmasını dene';
 $lang['Sorry!'] = 'Üzgünüm!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo, PHP 5 yapılandırmasını başaramadı.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Barındırma sağlayıcınızın desteğini alarak, kendinizin PHP 5\'e nasıl geçebileceğinizi öğrenin.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo, PHP 5.2 yapılandırmasını başaramadı.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Barındırma sağlayıcınızın desteğini alarak, kendinizin PHP 5.2\'e nasıl geçebileceğinizi öğrenin.';
 $lang['Hope to see you back soon.'] = 'Yakında tekrar görüşmek dileğiyle.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Tebrikler, Piwigo kurulumu tamamlandı.';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Diğer çözüm aşağıdaki kutudaki yazıyı kopyalayın ve "local/config/database.inc.php" dosyası içine pasteleyin.(Uyarı : database.inc.php sadece yazı içermeli hiçbir ifade veya boşluk karakteri içermemelidir)';
@@ -65,5 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Fotoğraf galerime hoş geldiniz';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Herhangi bir sebeple yardım gerektiğinde, forumlarımıza danışmakta tereddüt etmeyin: %s';
 $lang['Welcome to your new installation of Piwigo!'] = 'Piwigo\'nunuzun yeni kurulumuna hoşgeldiniz!';
 $lang['Password ']['confirm'] = 'Şifre [doğrula]';
-$lang['localhost or other, supplied by your host provider'] = 'localhost veya diğer, bulundurma hizmeti sağlayıcınız tarafından verilen';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost veya diğer, bulundurma hizmeti sağlayıcınız tarafından verilen';
\ No newline at end of file
diff --git a/sources/language/tr_TR/upgrade.lang.php b/sources/language/tr_TR/upgrade.lang.php
index d570610..5a8f458 100644
--- a/sources/language/tr_TR/upgrade.lang.php
+++ b/sources/language/tr_TR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/uk_UA/admin.lang.php b/sources/language/uk_UA/admin.lang.php
index 419ca84..c048343 100644
--- a/sources/language/uk_UA/admin.lang.php
+++ b/sources/language/uk_UA/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -978,4 +978,13 @@ $lang['between %s and %s MB'] = 'між %s і %s МБ';
 $lang['date & time'] = 'дата і час';
 $lang['file name'] = 'ім’я файлу';
 $lang['width & height'] = 'ширина і висота';
-$lang['Upload in progress'] = 'Завантаження триває';
\ No newline at end of file
+$lang['Upload in progress'] = 'Завантаження триває';
+$lang['Delete %d orphan photos'] = 'Видалення %d одиночних фото';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Кожен е-mail містить свій власний ключ ідентифікації по посиланню, дійсний для %s.';
+$lang['Edit user'] = 'Редагування користувача';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'З причини безпеки, ключі ідентифікації не працюють для адміністраторів.';
+$lang['No recipient selected'] = 'Отримувач не вибраний';
+$lang['No user is permitted to see this private album'] = 'Жодному користувачу не дозволено бачити цей приватний альбом';
+$lang['Orphans'] = 'Одиночні';
+$lang['Recipients'] = 'Одержувачі';
+$lang['Y Repeat'] = 'Повторення Y';
\ No newline at end of file
diff --git a/sources/language/uk_UA/common.lang.php b/sources/language/uk_UA/common.lang.php
index 0e61073..6955bdf 100644
--- a/sources/language/uk_UA/common.lang.php
+++ b/sources/language/uk_UA/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Українська [UA]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=523
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -426,4 +426,5 @@ $lang['Photo description'] = 'Опис фотографії';
 $lang['Photo title'] = 'Назва фотографії';
 $lang['Album name, A &rarr; Z'] = 'Назва альбому, А &rarr; Я';
 $lang['Album name, Z &rarr; A'] = 'Назва альбому, Я &rarr; А';
-$lang['Link: %s'] = 'Посилання: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Посилання: %s';
+$lang['Your authentication key is no longer valid.'] = 'Ваш ключ аутентифікації більше не дійсний.';
\ No newline at end of file
diff --git a/sources/language/uk_UA/help/photos_add_ftp.html b/sources/language/uk_UA/help/photos_add_ftp.html
index 7b1eee2..980efa0 100755
--- a/sources/language/uk_UA/help/photos_add_ftp.html
+++ b/sources/language/uk_UA/help/photos_add_ftp.html
@@ -1,70 +1,81 @@
-<fieldset>
-  <legend>Швидкий старт</legend>
-
-<ol>
-  <li>Створіть директорію на вашому комп'ютері.</li>  
-
-  <li>Скопіюйте кілька зображень всередину цієї директорії, змініть їх розмір для веб-дисплея. <em>Попередження</em>: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.</li>
-
-  <li>З клієнтом FTP, копіюйте ваші директорії в директорії "Галереї" вашої Piwigo.</li>
-
-  <li>Увійдіть до своєї галереї та перейдіть до <span class="pwgScreen">Адміністрування</span> і натисніть на велику кнопку синхронізації.</li>
-</ol>
-
-<p>Вітаємо! Ви успішно створили перший альбом галереї.</p>
-</fieldset>
-
-<fieldset>
-  <legend>Організація директорій і файлів</legend>
-
-<ul>
-
-  <li>
-
-    <p>Директорії альбому знаходяться в директорії Piwigo
-"galleries". Тут слідує дерево каталогів дуже маленької галереї(але
-користується багатьма особливостями):</p>
-
-    <pre>
-galleries
-|-- wedding
-|   |-- celebration
-|   |   |-- arrival
-|   |   |   |-- paul-alone.jpg
-|   |   |   +-- sarah-alone.jpg
-|   |   +-- departure
-|   |       +-- paul-and-sarah.jpg
-|   +-- party
-|       |-- dancers001.jpg
-|       |-- dancers002.jpg
-|       +-- dancers003.jpg
-+-- honeymoon
-    |-- hotel.png
-    |-- video-from-plane.avi
-    +-- pwg_representative
-        +-- video-from-plane.jpg
-</pre>
-
-  </li>
-
-  <li>За винятком "pwg_representative" (див. пояснення нижче), в кожній директорії в розділі "galleries" виступає як альбом. Немає ніяких обмежень на глибину директорій.</li>
-
-  <li>В основному, файл представлений елементом. Файл може бути на
-Piwigo елементом, якщо його розширення, серед <code>file_ext</code>
-  можливостей параметра конфігурації (див. файл <span
-  class="filename">include/config_default.inc.php</span>). Файл може
-бути зображенням, якщо його розширення серед <code>picture_ext</code>
-  можливостей параметра конфігурації.</li>
-
-  <li>Немає елементів зображень (відео, звук, файл текстів, все, що ви хочете...) представлених за замовчуванням значок відповідає імені файлу
-розширення. За бажанням, можна пов'язати мініатюру і представника
-файлу (див. video.avi у наведеному вище прикладі).</li>
-
-  <li><em>Попередження</em>: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.</li>
-
-  <li>Як тільки фотографії правильно розташовані в
-директорії, перейдіть: <span class="pwgScreen">Адміністрування &raquo; Інструменти &raquo;
-  Синхронізація</span></li>
-
-</ul>
-</fieldset>
\ No newline at end of file
+<fieldset>
+  <legend>Швидкий старт</legend>
+
+<ol>
+  <li>Створіть директорію на вашому комп'ютері.</li>  
+
+  <li>Скопіюйте кілька зображень всередину цієї директорії, змініть їх розмір для веб-дисплея. <em>Попередження</em>: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.</li>
+
+  <li>З клієнтом FTP, копіюйте ваші директорії в директорії "Галереї" вашої Piwigo.</li>
+
+  <li>Увійдіть до своєї галереї та перейдіть до <span class="pwgScreen">Адміністрування</span> і натисніть на велику кнопку синхронізації.</li>
+</ol>
+
+<p>Вітаємо! Ви успішно створили перший альбом галереї.</p>
+</fieldset>
+
+<fieldset>
+  <legend>Організація директорій і файлів</legend>
+
+<ul>
+
+  <li>
+
+    <p>Директорії альбому знаходяться в директорії Piwigo
+"galleries". Тут слідує дерево каталогів дуже маленької галереї(але
+користується багатьма особливостями):</p>
+
+    <pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+    |-- hotel.png
+    |-- video-from-plane.avi
+    +-- pwg_representative
+        +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
+
+  </li>
+
+  <li>За винятком "pwg_representative" and "pwg_format" (див. пояснення нижче), в кожній директорії в розділі "galleries" виступає як альбом. Немає ніяких обмежень на глибину директорій.</li>
+
+  <li>В основному, файл представлений елементом. Файл може бути на
+Piwigo елементом, якщо його розширення, серед <code>file_ext</code>
+  можливостей параметра конфігурації (див. файл <span
+  class="filename">include/config_default.inc.php</span>). Файл може
+бути зображенням, якщо його розширення серед <code>picture_ext</code>
+  можливостей параметра конфігурації.</li>
+
+  <li>Немає елементів зображень (відео, звук, файл текстів, все, що ви хочете...) представлених за замовчуванням значок відповідає імені файлу
+розширення. За бажанням, можна пов'язати мініатюру і представника
+файлу (див. video.avi у наведеному вище прикладі).</li>
+
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
+  <li><em>Попередження</em>: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.</li>
+
+  <li>Як тільки фотографії правильно розташовані в
+директорії, перейдіть: <span class="pwgScreen">Адміністрування &raquo; Інструменти &raquo;
+  Синхронізація</span></li>
+
+</ul>
+</fieldset>
diff --git a/sources/language/uk_UA/install.lang.php b/sources/language/uk_UA/install.lang.php
index b88a39a..3e3b58e 100644
--- a/sources/language/uk_UA/install.lang.php
+++ b/sources/language/uk_UA/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -47,13 +47,13 @@ $lang['Keep it confidential, it enables you to access administration panel'] = '
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Потрібна допомога? Задайте питання на <a href="%s">форумі Piwigo</a>.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Зверніть увагу, ви можете змінити свою конфігурацію і перезавантажити собі Piwigo після цього.';
 $lang['Password [confirm]'] = 'Пароль [підтвердження]';
-$lang['PHP 5 is required'] = 'Потрібен PHP 5';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo можуть спробувати перемкнути конфігурацію PHP 5 шляхом створення або зміни .htaccess файлу.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo не зміг налаштувати PHP 5.';
+$lang['PHP 5 is required'] = 'Потрібен PHP 5.2';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo можуть спробувати перемкнути конфігурацію PHP 5.2 шляхом створення або зміни .htaccess файлу.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo не зміг налаштувати PHP 5.2';
 $lang['please enter your password again'] = 'введіть пароль ще раз';
 $lang['Sorry!'] = 'Вибачте!';
 $lang['Start Install'] = 'Початок встановлення';
-$lang['Try to configure PHP 5'] = 'Спробуйте налаштувати PHP 5';
+$lang['Try to configure PHP 5'] = 'Спробуйте налаштувати PHP 5.2';
 $lang['user login given by your host provider'] = 'лоґін користувача дізнайтесь у вашого хостинг-провайдера';
 $lang['user password given by your host provider'] = 'лоґін користувача дізнайтесь у Вашого хостинг-провайдера';
 $lang['verification'] = 'перевірка';
@@ -62,7 +62,6 @@ $lang['webmaster login can\'t contain characters \' or "'] = 'лоґін веб-
 $lang['Welcome to my photo gallery'] = 'Ласкаво просимо в фотогалерею';
 $lang['Welcome to your new installation of Piwigo!'] = 'Ласкаво просимо у ваш новий встановлений Piwigo!';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Ви можете завантажити конфігураційний файл і завантажити його до local/config каталогу встановлення.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Ви повинні звернутися в службу підтримки вашого хостинг-провайдера і подивитися, як ви можете переключитися на PHP 5 самостійно.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Ви повинні звернутися в службу підтримки вашого хостинг-провайдера і подивитися, як ви можете переключитися на PHP 5.2 самостійно.';
 $lang['User'] = 'Користувач';
-$lang['localhost or other, supplied by your host provider'] = 'локальний хост або будь-який інший, наданий вашим провайдером';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'локальний хост або будь-який інший, наданий вашим провайдером';
\ No newline at end of file
diff --git a/sources/language/uk_UA/upgrade.lang.php b/sources/language/uk_UA/upgrade.lang.php
index e958360..21094b5 100644
--- a/sources/language/uk_UA/upgrade.lang.php
+++ b/sources/language/uk_UA/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/vi_VN/admin.lang.php b/sources/language/vi_VN/admin.lang.php
index 40a5b58..316f6dc 100644
--- a/sources/language/vi_VN/admin.lang.php
+++ b/sources/language/vi_VN/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -979,4 +979,5 @@ $lang['based on'] = 'dựa trên';
 $lang['between %s and %s MB'] = 'giữa %s và %s MB';
 $lang['date & time'] = 'ngày tháng & thời gian';
 $lang['file name'] = 'tên file';
-$lang['width & height'] = 'chiều rộng & chiều cao';
\ No newline at end of file
+$lang['width & height'] = 'chiều rộng & chiều cao';
+$lang['Upload in progress'] = 'Đang trong quá trình tải lên ';
\ No newline at end of file
diff --git a/sources/language/vi_VN/common.lang.php b/sources/language/vi_VN/common.lang.php
index f25961d..09e6e0c 100644
--- a/sources/language/vi_VN/common.lang.php
+++ b/sources/language/vi_VN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Tiếng Việt [VN]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=437
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -35,7 +35,7 @@ $lang_info['direction'] = 'ltr';
 $lang_info['code'] = 'vn';
 $lang_info['zero_plural'] = true;
 
-$lang['%d Kb'] = '%d Kb';
+$lang['%d Kb'] = '%d KB';
 $lang['%d album updated'] = '%d đề mục đã được cập nhật';
 $lang['%d albums updated'] = '%d đề mục đã được cập nhật';
 $lang['%d comment to validate'] = '%d lời bình cần xác nhận';
@@ -48,17 +48,17 @@ $lang['%d hit'] = '%d lần xem';
 $lang['%d hits'] = '%d lần xem';
 $lang['%d new photo'] = '%d hình mới';
 $lang['%d new photos'] = '%d hình mới';
-$lang['%d new user'] = '%d thành viên mới';
-$lang['%d new users'] = '%d thành viên mới';
-$lang['About'] = 'Thông tin về Piwgo';
+$lang['%d new user'] = '%d người dùng mới';
+$lang['%d new users'] = '%d người dùng mới';
+$lang['About'] = 'Giới thiệu';
 $lang['All tags'] = 'Tất cả các tags';
-$lang['Any tag'] = 'Tất cả các tag';
+$lang['Any tag'] = 'Bát kỳ tag nào';
 $lang['At least one listed rule must be satisfied.'] = 'Ít nhất một điều khoản nêu trên phải được đáp ứng.';
 $lang['Author'] = 'Tác giả';
 $lang['Albums'] = 'Đề mục';
 $lang['Album'] = 'Đề mục';
-$lang['Close this window'] = 'Đóng';
-$lang['Complete RSS feed (photos, comments)'] = 'Cung cấp bản tin RSS đầy đủ (gồm hình ảnh và lời bình)';
+$lang['Close this window'] = 'Đóng cửa sổ này';
+$lang['Complete RSS feed (photos, comments)'] = 'Hoàn tất tin RSS (hình ảnh, bình luận)';
 $lang['Confirm Password'] = 'Xác nhận lại mật khẩu';
 $lang['Connection settings'] = 'Thiết lập cài đặt';
 $lang['Login'] = 'Đăng nhập';
@@ -67,26 +67,26 @@ $lang['Create a new account'] = 'Tạo tài khoản mới';
 $lang['Created on'] = 'Khởi tạo vào';
 $lang['Creation date'] = 'Ngày khởi tạo';
 $lang['Current password is wrong'] = 'Mật khởi hiện tại bị sai';
-$lang['Dimensions'] = 'Độ phân giải';
+$lang['Dimensions'] = 'Kích thước';
 $lang['Display'] = 'Hiển thị';
 $lang['Each listed rule must be satisfied.'] = 'Mỗi điều khoản nêu trên phải được đáp ứng.';
 $lang['Email address'] = 'Địa chỉ email';
-$lang['Enter your personnal informations'] = 'Nhập thông tin của bạn';
+$lang['Enter your personnal informations'] = 'Nhập thông tin cá nhân';
 $lang['Error sending email'] = 'Lỗi gởi email';
 $lang['File name'] = 'Tên file';
-$lang['File'] = 'Tệp tin';
+$lang['File'] = 'File';
 $lang['Filesize'] = 'Kích thước file';
-$lang['Filter and display'] = 'Lọc và hiển thị ảnh';
-$lang['Filter'] = 'Lọc';
+$lang['Filter and display'] = 'Bộ lọc và hiển thị';
+$lang['Filter'] = 'Bộ lọc';
 $lang['Forgot your password?'] = 'Bạn quên mật khẩu?';
-$lang['Go through the gallery as a visitor'] = 'Xem gallery như một khách thăm quan';
+$lang['Go through the gallery as a visitor'] = 'Xem gallery với vai trò khách';
 $lang['Help'] = 'Trợ giúp';
 $lang['Identification'] = 'Định danh';
 $lang['Photos only RSS feed'] = 'Chỉ cung cấp hình ảnh trên bản tin RSS';
 $lang['Keyword'] = 'Từ khoá';
 $lang['Links'] = 'Liên kết';
 $lang['N/A'] = 'Không có';
-$lang['New on %s'] = 'hình mới ở %s';
+$lang['New on %s'] = 'Hình mới ở %s';
 $lang['Notification'] = 'Thông báo';
 $lang['Number of items'] = 'Số lượng hình';
 $lang['Original dimensions'] = 'Độ phân giải gốc';
@@ -118,7 +118,7 @@ $lang['Username'] = 'Tên đăng nhập';
 $lang['Visits'] = 'Thăm quan';
 $lang['Webmaster'] = 'Quản trị';
 $lang['Week %d'] = 'Tuần %d';
-$lang['About Piwigo'] = 'Thông tin về Piwigo';
+$lang['About Piwigo'] = 'Giới thiệu Piwigo';
 $lang['You are not authorized to access the requested page'] = 'Bạn không được phép truy cập vào trang này';
 $lang['add this photo to your favorites'] = 'thêm hình này vào danh sách ưa thích của mình';
 $lang['Administration'] = 'Điều hành viên';
@@ -139,21 +139,21 @@ $lang['View'] = 'Xem';
 $lang['chronology_monthly_calendar'] = 'Lịch hằng tháng';
 $lang['chronology_monthly_list'] = 'Danh sách hằng tháng';
 $lang['chronology_weekly_list'] = 'Danh sách hằng tuần';
-$lang['Click here if your browser does not automatically forward you'] = 'Nhắp chuột vào đây nếu trình duyệt web không tự động chuyển trang';
+$lang['Click here if your browser does not automatically forward you'] = 'Nhắp chuột vào đây nếu trình duyệt không tự động chuyển trang';
 $lang['comment date'] = 'ngày bình luận';
 $lang['Comment'] = 'Bình luận';
 $lang['Your comment has been registered'] = 'Lời bình của bạn đã được đăng ký';
-$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Hệ thống bảo vệ DDOS: vui lòng đợi trong giây lát trước khi gởi lời bình khác';
+$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Hệ thống bảo mật: vui lòng đợi trong giây lát trước khi gởi lời bình khác';
 $lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Lời bình của bạn KHÔNG thể gửi được vì nó không đáp ứng được các điều khoản';
 $lang['An administrator must authorize your comment before it is visible.'] = 'Lời bình của bạn phải được quản trị viên xác nhận trước khi nó hiển thị trên gallery.';
 $lang['This login is already used by another user'] = 'Tài khoản đã được đăng ký trước đây';
-$lang['Comments'] = 'Lời bình';
+$lang['Comments'] = 'Bình luận';
 $lang['Add a comment'] = 'Thêm lời bình';
 $lang['created after %s (%s)'] = 'đã tạo sau %s (%s)';
 $lang['created before %s (%s)'] = 'đã tạo trước %s (%s)';
 $lang['created between %s (%s) and %s (%s)'] = 'đã tạo giữa %s (%s) và %s (%s)';
 $lang['created on %s'] = 'đã tạo vào %s';
-$lang['Customize'] = 'Tuỳ chọn';
+$lang['Customize'] = 'Tùy chọn';
 $lang['Your Gallery Customization'] = 'Tuỳ chọn cho Gallery của bạn ';
 $lang['day'][0] = 'Chủ Nhật';
 $lang['day'][1] = 'Thứ Hai';
@@ -164,9 +164,9 @@ $lang['day'][5] = 'Thứ Sáu';
 $lang['day'][6] = 'Thứ Bảy';
 $lang['Default'] = 'Mặc định';
 $lang['delete this photo from your favorites'] = 'xoá hình này từ danh sách ưa thích của bạn';
-$lang['Delete'] = 'Xoá bỏ';
+$lang['Delete'] = 'Xóa';
 $lang['descending'] = 'từ trên xuống';
-$lang['Download'] = 'Tải về';
+$lang['Download'] = 'tải về';
 $lang['Download this file'] = 'tải về file này';
 $lang['edit'] = 'biên tập';
 $lang['wrong date'] = 'sai ngày tháng';
@@ -211,7 +211,7 @@ $lang['month'][6] = 'Tháng Sáu';
 $lang['month'][7] = 'Tháng Bảy';
 $lang['month'][8] = 'Tháng Tám';
 $lang['month'][9] = 'Tháng Chín';
-$lang['Most visited'] = 'Hình được xem nhiều nhất';
+$lang['Most visited'] = 'Được xem nhiều nhất';
 $lang['display most visited photos'] = 'hiển thị những hình được xem nhiều nhất';
 $lang['Unknown identifier'] = 'Định danh không xác định';
 $lang['New password'] = 'Mật khẩu mới';
@@ -223,7 +223,7 @@ $lang['Photos posted within the last %d days.'] = 'Các thành phần được g
 $lang['password updated'] = 'mật khẩu đã được cập nhật';
 $lang['Recent period must be a positive integer value'] = 'Chu kỳ gần đây phải có giá trị là số nguyên dương';
 /* DEPRECATED USED IN comments.php FOR image_id ? */ $lang['photo'] = 'hình ảnh';
-$lang['Click on the photo to see it in high definition'] = 'Click lên hình để xem ở định dạng cao';
+$lang['Click on the photo to see it in high definition'] = 'Click lên hình để xem ở độ phân giải cao';
 $lang['Show file metadata'] = 'Hiển thị metadata của hình';
 $lang['Powered by'] = 'Sản phẩm của';
 $lang['Preferences'] = 'Tuỳ chọn thêm';
@@ -247,13 +247,13 @@ $lang['representative'] = 'đại diện';
 $lang['Search for Author'] = 'Tìm kiếm theo tác giả';
 $lang['Search in albums'] = 'Tìm kiếm trong các đề mục';
 $lang['Search by date'] = 'Tìm kiếm theo ngày tháng';
-$lang['Date'] = 'Ngày tháng';
+$lang['Date'] = 'Ngày';
 $lang['End-Date'] = 'Ngày kết thúc';
 $lang['Kind of date'] = 'Kiểu ngày tháng';
 $lang['Search for words'] = 'Tìm kiếm theo từ';
 $lang['Search for all terms'] = 'Tìm kiếm tất cả các mục ';
 $lang['Search for any term'] = 'Tìm kiếm mọi mục';
-$lang['Empty query. No criteria has been entered.'] = 'Truy vấn xác định. Không có từ khoá nào được nhập';
+$lang['Empty query. No criteria has been entered.'] = 'Truy vấn rỗng. Không có từ khoá nào được nhập.';
 $lang['Search results'] = 'Kết quả tìm kiếm';
 $lang['Search in sub-albums'] = 'Tìm kiếm trong các mục nhỏ';
 $lang['searched words : %s'] = 'những từ khoá được tìm kiếm : %s';
@@ -269,21 +269,21 @@ $lang['display only recently posted photos'] = 'chỉ hiển thị những hình
 $lang['return to the display of all photos'] = 'trở lại hiển thị tất cả các hình';
 $lang['the beginning'] = 'bắt đầu';
 $lang['Thumbnails'] = 'Hình nhỏ';
-$lang['Menu'] = 'Trình đơn';
+$lang['Menu'] = 'Menu';
 $lang['A comment on your site'] = 'Một lời bình trên trang của bạn';
 $lang['today'] = 'hôm nay';
 $lang['Update your rating'] = 'Cập nhật xếp hạng của bạn';
 $lang['the username must be given'] = 'Phải có tên của thành viên';
 $lang['useful when password forgotten'] = 'có ích khi bị mất mật khẩu';
 $lang['Quick search'] = 'Tìm kiếm nhanh';
-$lang['Connected user: %s'] = 'Thành viên kết nối: %s';
-$lang['IP: %s'] = 'Địa chỉ IP: %s';
+$lang['Connected user: %s'] = 'người dùng đã kết nối: %s';
+$lang['IP: %s'] = 'IP: %s';
 $lang['Browser: %s'] = 'Trình duyệt: %s';
 $lang['Author: %s'] = 'Tác giả: %s';
 $lang['Comment: %s'] = 'Bình luận: %s';
 $lang['Comment by %s'] = 'Bình luận bởi %s';
 $lang['User: %s'] = 'Tài khoản: %s';
-$lang['Email: %s'] = 'Địa chỉ email: %s';
+$lang['Email: %s'] = 'Email: %s';
 $lang['Admin: %s'] = 'Quản trị: %s';
 $lang['Registration of %s'] = 'Mục đăng ký của %s';
 $lang['Album: %s'] = 'Đề mục: %s';
@@ -292,12 +292,12 @@ $lang['this email address is already in use'] = 'đã có thành viên sử dụ
 $lang['Album results for'] = 'Kết quả đề mục cho';
 $lang['Tag results for'] = 'Kết quả tag cho';
 $lang['from %s to %s'] = 'từ %s đến %s';
-$lang['Play of slideshow'] = 'Bật trình chiếu';
+$lang['Play of slideshow'] = 'Trình chiếu';
 $lang['Pause of slideshow'] = 'Tạm dừng trình chiếu';
 $lang['Repeat the slideshow'] = 'Lặp lại trình chiếu';
 $lang['Not repeat the slideshow'] = 'Không lặp lại trình chiếu';
 $lang['Reduce diaporama speed'] = 'Giảm tốc độ xem hình tự động';
-$lang['Accelerate diaporama speed'] = 'Tăng tốc độ xem hình tự động';
+$lang['Accelerate diaporama speed'] = 'Tăng tốc độ trình chiếu';
 $lang['Submit'] = 'Chấp nhận';
 $lang['Yes'] = 'Có';
 $lang['No'] = 'Không';
@@ -317,15 +317,15 @@ $lang['delete all photos from your favorites'] = 'xoá tất cả hình từ dan
 $lang['Sent by'] = 'Được gởi bởi';
 $lang['Are you sure?'] = 'Bạn có chắc không?';
 $lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Cookies đã bị chặn lại hoặc không được trình duyệt web trên  máy bạn hỗ trợ. Bạn phải mở cookie để tiếp tục.';
-$lang['Edit a comment'] = 'Biên tập một lời bình';
-$lang['(!) This comment requires validation'] = '(!) Lời bình này yêu cầu sự xác nhận';
+$lang['Edit a comment'] = 'Sửa lời bình';
+$lang['(!) This comment requires validation'] = '(!) Lời bình này cần phải xác nhận';
 $lang['Welcome'] = 'Xin chào';
 $lang['Welcome to your Piwigo photo gallery!'] = 'Chào mừng bạn đến gallery Piwigo trực tuyến của mình!';
 $lang['... or browse your empty gallery'] = '... hoặc duyệt gallery chưa có hình của bạn';
-$lang['... or please deactivate this message, I will find my way by myself'] = '... hoặc vui lòng vô hiệu hóa thông điệp này, tôi tự tìm cách giải quyết riêng';
-$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Xin chào %s, gallery Piwigo của bạn hiện tại vẫn chưa có tấm hình nào!';
-$lang['I want to add photos'] = 'Tôi muốn thêm hình vào gallery';
-$lang['Manage this user comment: %s'] = 'Quản lý lời bình của thành viên này: %s';
+$lang['... or please deactivate this message, I will find my way by myself'] = '... hoặc vui lòng vô hiệu hóa thông báo này, tôi sẽ tự giải quyết';
+$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Xin chào %s, gallery của bạn hiện chưa có hình ảnh nào!';
+$lang['I want to add photos'] = 'Tôi muốn thêm ảnh';
+$lang['Manage this user comment: %s'] = 'Quản lý lời bình của người dùng này: %s';
 $lang['Email address is missing. Please specify an email address.'] = 'Còn thiếu địa chỉ email. Vui lòng cho biết một địa chỉ email.';
 $lang['This author modified following comment:'] = 'Tác giả này đã soạn lại lời bình sau:';
 $lang['This author removed the comment with id %d'] = 'Tác giả này đã xóa bỏ lời bình có ID là %d';
@@ -333,7 +333,7 @@ $lang['show tag cloud'] = 'hiển thị thẻ mây';
 $lang['html tags are not allowed in login'] = 'thẻ html không được phép dùng để đăng nhập';
 $lang['The number of photos per page must be a not null scalar'] = 'Số hình trên mỗi trang phải là số nguyên khác 0';
 $lang['Number of photos per page'] = 'Số hình trên mỗi trang';
-$lang['%d rates'] = '%d hạng';
+$lang['%d rates'] = '%d đánh giá';
 $lang['Rating score'] = 'Bảng xếp hạng';
 $lang['Invalid username or email'] = 'Tên người dùng hoặc địa chỉ email không hợp lệ';
 $lang['Password reset is not allowed for this user'] = 'Không được phép đặt lại mật khẩu cho người dùng này';
@@ -341,21 +341,21 @@ $lang['User "%s" has no email address, password reset is not possible'] = 'Ngư
 $lang['Someone requested that the password be reset for the following user account:'] = 'Có người yêu cầu đặt lại mật khẩu cho những người dùng sau:';
 $lang['Username "%s" on gallery %s'] = 'Người dùng "%s" trên thư viện hình %s';
 $lang['To reset your password, visit the following address:'] = 'Để đặt lại mật khẩu, hãy vào những địa chỉ sau:';
-$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Nếu đây là do nhầm lẫn, thì chỉ việc bỏ qua bỏ qua email này và không có việc gì sẽ xảy ra.';
+$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Nếu có nhầm lẫn, hãy bỏ qua bỏ qua email này.';
 $lang['Password Reset'] = 'Cài đặt lại mật khẩu';
-$lang['Check your email for the confirmation link'] = 'Kiểm tra email để nhận liên kết xác nhận';
-$lang['Invalid key'] = 'Key không hợp lệ';
+$lang['Check your email for the confirmation link'] = 'Kiểm tra email để nhận xác nhận liên kết';
+$lang['Invalid key'] = 'Khóa không hợp lệ';
 $lang['The passwords do not match'] = 'Mật khẩu không trùng';
 $lang['Your password has been reset'] = 'Mật khẩu của bạn đã được đặt lại';
 $lang['Return to home page'] = 'Trở lại trang chủ';
 $lang['Please enter your username or email address.'] = 'Vui lòng nhập tên người dùng và địa chỉ email.';
 $lang['You will receive a link to create a new password via email.'] = 'Bạn sẽ nhận được một liên kết để tạo mật khẩu mới qua email.';
 $lang['Username or email'] = 'Người dùng hoặc email';
-$lang['Change my password'] = 'Đổi mật khẩu của tôi';
+$lang['Change my password'] = 'Đổi mật khẩu';
 $lang['Enter your new password below.'] = 'Nhập mật khẩu mới của bạn ở dưới.';
-$lang['EXIF Metadata'] = 'Lý lịch dữ liệu EXIF';
-$lang['IPTC Metadata'] = 'Lý lịch dữ liệu IPTC';
-$lang['Edit'] = 'Biên tập';
+$lang['EXIF Metadata'] = 'Dữ liệu EXIF';
+$lang['IPTC Metadata'] = 'Dữ liệu IPTC';
+$lang['Edit'] = 'Sửa';
 $lang['Hello %s,'] = 'Xin chào %s,';
 $lang['Send my connection settings by email'] = 'Gởi thiết lập kết nối của tôi qua email';
 $lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'Đã đăng ký thành công, bạn sẽ nhận được ngay email kèm theo thiết lập kết nối. Xin chào mừng!';
@@ -373,7 +373,7 @@ $lang['Thank you for registering at %s!'] = 'Cảm ơn bạn đã đăng ký t
 $lang['Here are your connection settings'] = 'Đây là thiết lập kết nối của bạn';
 $lang['Password: %s'] = 'Mật khẩu: %s';
 $lang['Username: %s'] = 'Tên đăng nhập: %s';
-$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Nếu bạn nghĩ bạn đã nhận nhầm emai, vui lòng liên hệ với chúng tôi qua %s';
+$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Nếu bạn nghĩ bạn đã nhận nhầm email, vui lòng liên hệ với chúng tôi qua %s';
 $lang['Show oldest comments first'] = 'Hiển thị những lời bình trước nhất đầu tiên';
 $lang['Show latest comments first'] = 'Hiển thị những lời bình mới nhất đầu tiên';
 $lang['Photo sizes'] = 'Kích thước ảnh';
@@ -381,26 +381,26 @@ $lang['View in'] = 'Xem ảnh ở';
 $lang['Mobile'] = 'Di động';
 $lang['2small'] = 'XXS - nhỏ';
 $lang['xsmall'] = 'XS - cực nhỏ';
-$lang['Desktop'] = 'Desktop';
-$lang['File name, A &rarr; Z'] = 'Tên tệp tin, A &rarr; Z';
-$lang['File name, Z &rarr; A'] = 'Tên tệp tin, Z &rarr; A';
-$lang['Photo title, A &rarr; Z'] = 'Tựa đề ảnh, A &rarr; Z';
-$lang['Photo title, Z &rarr; A'] = 'Tựa đề ảnh, Z &rarr; A';
-$lang['Date created, new &rarr; old'] = 'Ngày tháng khởi tạo, mới &rarr; cũ';
-$lang['Date created, old &rarr; new'] = 'Ngày tháng khởi tạo, cũ &rarr; mới';
-$lang['Date posted, new &rarr; old'] = 'Ngày tháng gởi ảnh, mới&rarr; cũ';
-$lang['Date posted, old &rarr; new'] = 'Ngày tháng gởi ảnh, cũ &rarr; mới';
+$lang['Desktop'] = 'Màn hình';
+$lang['File name, A &rarr; Z'] = 'Tên file, A &rarr; Z';
+$lang['File name, Z &rarr; A'] = 'Tên file, Z &rarr; A';
+$lang['Photo title, A &rarr; Z'] = 'Tiêu đề ảnh, A &rarr; Z';
+$lang['Photo title, Z &rarr; A'] = 'Tiêu đề ảnh, Z &rarr; A';
+$lang['Date created, new &rarr; old'] = 'Ngày khởi tạo, mới &rarr; cũ';
+$lang['Date created, old &rarr; new'] = 'Ngày khởi tạo, cũ &rarr; mới';
+$lang['Date posted, new &rarr; old'] = 'Ngày gởi ảnh, mới&rarr; cũ';
+$lang['Date posted, old &rarr; new'] = 'Ngày gởi ảnh, cũ &rarr; mới';
 $lang['Rating score, high &rarr; low'] = 'Tỉ lệ xếp hạng, cao &rarr; thấp';
 $lang['Rating score, low &rarr; high'] = 'Tỉ lệ xếp hạng, thấp &rarr; cao';
 $lang['Visits, high &rarr; low'] = 'Số lần xem, cao &rarr; thấp';
 $lang['Visits, low &rarr; high'] = 'Số lần xem, thấp &rarr; cao';
 $lang['Numeric identifier, 1 &rarr; 9'] = 'Ký hiệu nhận dạng số học, 1 &rarr; 9';
 $lang['Numeric identifier, 9 &rarr; 1'] = 'Ký hiệu nhận dạng số học, 9 &rarr; 1';
-$lang['Manual sort order'] = 'Sắp xếp vị trí thủ công';
+$lang['Manual sort order'] = 'Sắp xếp thủ công';
 
-$lang['%d rate'] = 'xếp hạng %d';
+$lang['%d rate'] = '%d đánh giá';
 $lang['Bad request'] = 'Yêu cầu không hợp lệ';
-$lang['Forbidden'] = 'Bị hạn chế truy cập';
+$lang['Forbidden'] = 'Cấm';
 $lang['Page not found'] = 'Không tìm thấy trang';
 $lang['Permalink for album not found'] = 'Không tìm thấy liên kết cho album';
 $lang['Piwigo encountered a non recoverable error'] = 'Piwigo gặp lỗi ngoài tầm kiểm soát';
@@ -413,7 +413,7 @@ $lang['Your website URL is invalid'] = 'Địa chỉ trang web không bình thư
 $lang['mandatory'] = 'bắt buộc';
 $lang['Email'] = 'Email';
 $lang['First Page'] = 'Trang đầu';
-$lang['Go back to the album'] = 'Quay trở lại album';
+$lang['Go back to the album'] = 'Quay trở lại đề mục';
 $lang['Last Page'] = 'Trang cuối';
 $lang['Password is missing. Please enter the password.'] = 'Thiếu mật khẩu. Vui lòng nhập mật khẩu.';
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Xác nhận mật khẩu bị thiếu. Vui lòng xác nhận lại mật khẩu đã chọn.';
@@ -422,7 +422,8 @@ $lang['Theme'] = 'Chủ đề';
 $lang['Apply on properties'] = 'Áp dụng cho thuộc tính';
 $lang['No results for'] = 'Không tìm thấy kết quả cho';
 $lang['Photo description'] = 'Mô tả hình ảnh';
-$lang['Photo title'] = 'Tiêu đề hình ảnh';
+$lang['Photo title'] = 'Tiêu đề ảnh';
 $lang['Album name, A &rarr; Z'] = 'Tên album, A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = 'Tên album, Z &rarr; A';
-$lang['Link: %s'] = 'Liên kết: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Liên kết: %s';
+$lang['Your authentication key is no longer valid.'] = 'Khóa xác thực của bạn không còn hợp lệ nữa.';
\ No newline at end of file
diff --git a/sources/language/vi_VN/help/help_misc.html b/sources/language/vi_VN/help/help_misc.html
new file mode 100644
index 0000000..19eb065
--- /dev/null
+++ b/sources/language/vi_VN/help/help_misc.html
@@ -0,0 +1,9 @@
+<p>Một khi đã tạo gallery bạn có thể cấu hình lại sao cho phù hợp với đối tượng khách xem của mình
+<ul>
+	<li>Hiển thị mặc định như bạn muốn trong in <span class="pwgScreen">Quản trị &raquo; Cấu hình &raquo; Tùy chọn</span> tab <span class="pwgScreen">Thiết lạp cho khách</span></li>
+	<li>Chủ đề mặc định trong <span class="pwgScreen">Quản trị &raquo; Cấu hình &raquo; Chủ đề</span></li>
+	<li>The default language in <span class="pwgScreen">Administration &raquo; Configuration &raquo; Languages</span></li>
+ </ul>
+ Mặc định thì mỗi người dùng sẽ kế thừa các thuộc tính này khi đăng ký.
+</p>
+<p>Nếu còn thắc mắc gì, cộng đồng Piwigo sẽ chào đón bạn tại <a href="http://piwigo.org/forum">diễn đàn</a>.</p>
\ No newline at end of file
diff --git a/sources/language/vi_VN/help/index.php b/sources/language/vi_VN/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/vi_VN/help/index.php
+++ b/sources/language/vi_VN/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/vi_VN/install.lang.php b/sources/language/vi_VN/install.lang.php
index cc457fc..cda76ce 100644
--- a/sources/language/vi_VN/install.lang.php
+++ b/sources/language/vi_VN/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Mật khẩu [xác nhận]';
 $lang['verification'] = 'xác nhận';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Cần trợ giúp ? Hãy gởi thắc mắc của bạn tại <a href="%s">diễn đàn của Piwigo</a>.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Khách tham quan có thể liên lạc với Quản trị thông qua địa chỉ thư điện tử này.';
-$lang['PHP 5 is required'] = 'Phải có PHP 5 ';
+$lang['PHP 5 is required'] = 'Phải có PHP 5.2 ';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Do máy chủ web của bạn đang chạy phiên bản PHP  %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sẽ thử chuyển cấu hình của bạn sang PHP 5 bằng cách tạo ra hoặc biên tập một file .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sẽ thử chuyển cấu hình của bạn sang PHP 5.2 bằng cách tạo ra hoặc biên tập một file .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Chú ý rằng bạn có thể tự thay đổi cấu hình và khởi động lại Piwigo sau đó.';
-$lang['Try to configure PHP 5'] = ' Thử cấu hình PHP 5';
+$lang['Try to configure PHP 5'] = ' Thử cấu hình PHP 5.2';
 $lang['Sorry!'] = 'Rất tiếc!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo không thể cấu hình cho PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo không thể cấu hình cho PHP 5.2';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Bạn nên yêu cầu hỗ trợ từ nhà cung cấp máy chủ và tìm hiểu xem nếu có thể tự chuyển được sang phiên bản PHP 5.";
 $lang['Hope to see you back soon.'] = 'Hi vọng nhận được phản hồi của bạn sớm.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Xin chúc mừng, việc cài đặt Piwigo đã hoàn tất';
@@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Chào mừng bạn đến với thư vi
 $lang['Welcome to your new installation of Piwigo!'] = 'Chào mừng bạn đến với bản cài đặt mới của Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Đừng do dự  thảo luận tại diễn đàn của chúng tôi để được trợ giúp: %s';
 $lang['localhost or other, supplied by your host provider'] = 'localhost hoặc tên máy chủ cấp bởi nhà cung cấp host';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Bạn nên yêu cầu hỗ trợ từ nhà cung cấp máy chủ và tìm hiểu xem nếu có thể tự chuyển được sang phiên bản PHP 5.2';
\ No newline at end of file
diff --git a/sources/language/vi_VN/upgrade.lang.php b/sources/language/vi_VN/upgrade.lang.php
index 7cc0fca..9bdde8c 100644
--- a/sources/language/vi_VN/upgrade.lang.php
+++ b/sources/language/vi_VN/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/wo_SN/common.lang.php b/sources/language/wo_SN/common.lang.php
index 766318d..d1ec827 100644
--- a/sources/language/wo_SN/common.lang.php
+++ b/sources/language/wo_SN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Wolof [SN]
-Version: 2.6.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=737
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/zh_CN/admin.lang.php b/sources/language/zh_CN/admin.lang.php
index 8492428..92a4f66 100644
--- a/sources/language/zh_CN/admin.lang.php
+++ b/sources/language/zh_CN/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -669,7 +669,7 @@ $lang['Apply action'] = '执行操作';
 $lang['automatic order'] = '自动排序';
 $lang['Batch Manager'] = '批量管理';
 $lang['Choose an action'] = '选择一项操作';
-$lang['Delete orphan tags'] = '删除未被关联的标签';
+$lang['Delete orphan tags'] = '删除未关联任何图片的标签';
 $lang['delete photo'] = '删除图片';
 $lang['Duplicates'] = '副本';
 $lang['include child albums'] = '包含子相册';
@@ -678,7 +678,7 @@ $lang['No photo in the current set.'] = '当前集合没有图片。';
 $lang['No photo selected, %d photos in current set'] = '没有图片被选中，当前集合中有 %d 张图片';
 $lang['No photo selected, no action possible.'] = '没有图片被选中，不能执行任何操作。';
 $lang['on the %d selected photos'] = '于此 %d 张所选图片';
-$lang['Orphan tags deleted'] = '无关联图片的标签已被删除';
+$lang['Orphan tags deleted'] = '未关联任何图片的标签已被删除';
 $lang['Refresh photo set'] = '刷新图片集';
 $lang['Remove all filters'] = '删除所有过滤器';
 $lang['remove author'] = '删除作者';
@@ -694,7 +694,7 @@ $lang['The whole set'] = '整个集合';
 $lang['Type here the author name'] = '在此输入作者名称';
 $lang['Type here the title'] = '在此输入标题';
 $lang['Week starts on'] = '星期起始于';
-$lang['You have %d orphan tags: %s.'] = '您有 %d 个无关联图片的标签：%s。';
+$lang['You have %d orphan tags: %s.'] = '您有 %d 个未关联任何图片的标签：%s。';
 $lang['Remove from caddie'] = '从标记图片库中移除';
 $lang['Themes which need upgrade'] = '需更新的主题';
 $lang['Languages which need upgrade'] = '需要更新的语言';
@@ -987,4 +987,13 @@ $lang['between %s and %s MB'] = '在 %s 和 %s MB 之间';
 $lang['date & time'] = '日期与时间';
 $lang['file name'] = '文件名';
 $lang['width & height'] = '宽度&高度';
-$lang['Upload in progress'] = '正在上传';
\ No newline at end of file
+$lang['Upload in progress'] = '正在上传';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '每封发出的email中的链接将包含自动生成的唯一验证密钥，有效期 %s。';
+$lang['For security reason, authentication keys do not work for administrators.'] = '出于安全原因，验证密钥对管理员不起作用。';
+$lang['Edit user'] = '编辑用户';
+$lang['No recipient selected'] = '未选择收件人';
+$lang['No user is permitted to see this private album'] = '没有用户被允许查看该非公开相册';
+$lang['Recipients'] = '收件人';
+$lang['Y Repeat'] = 'Y轴平铺';
+$lang['Delete %d orphan photos'] = '删除 %d 没有任何关联的图片';
+$lang['Orphans'] = '没有任何关联';
\ No newline at end of file
diff --git a/sources/language/zh_CN/common.lang.php b/sources/language/zh_CN/common.lang.php
index b7f58cc..42ba2f9 100644
--- a/sources/language/zh_CN/common.lang.php
+++ b/sources/language/zh_CN/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: 简体中文 [CN]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=438
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -428,4 +428,5 @@ $lang['Photo description'] = '相片描述';
 $lang['Photo title'] = '相片标题';
 $lang['Album name, A &rarr; Z'] = '相册名称， A &rarr; Z';
 $lang['Album name, Z &rarr; A'] = '相册名称， Z &rarr; A';
-$lang['Link: %s'] = '链接： %s';
\ No newline at end of file
+$lang['Link: %s'] = '链接： %s';
+$lang['Your authentication key is no longer valid.'] = '您的认证密钥已失效。';
\ No newline at end of file
diff --git a/sources/language/zh_CN/help/photos_add_ftp.html b/sources/language/zh_CN/help/photos_add_ftp.html
index eb2231a..1702be8 100644
--- a/sources/language/zh_CN/help/photos_add_ftp.html
+++ b/sources/language/zh_CN/help/photos_add_ftp.html
@@ -25,38 +25,33 @@
     <p>相册文件夹均放在 Piwigo 的 "galleries" 文件夹里。以下的文件夹树里有一个很小的相册（但使用了很多功能）：</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -70,6 +65,8 @@
 
   <li>非图片元素 (如视频，声频，文本文件，一切你想到的...) 均以文件扩展名的默认图标显示。或者，你可以用一张缩略图来代表这个文件 (参见 video.avi 的例子)。</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>注意</em>: 文件名和文件夹必须以字母、数字、 "-"、 "_" 或者 "." 组成。没有空格，没有特别的符号。</li>
 
   <li>一旦文件、缩略图都放到其正确的位置后，进入 : <span class="pwgScreen">后台管理 &raquo; 工具 &raquo;
@@ -78,19 +75,3 @@
 </ul>
 
 </fieldset>
-<fieldset>
-  <legend>缩略图</legend>
-<ul>
-
-  <li>每个图片必须要有一张缩略图。</li>
-
-  <li>缩略图保存在相册文件夹里名为 "thumbnail" 的子文件夹。缩略图文件名与图片的文件名一致，将会以 <em>TN-</em> 为前缀</li>
-
-  <li><em>建议</em>: 使用外部工具来创建缩略图。</li>
-
-  <li>你可以使用<span class="pwgScreen">后台管理 &raquo; 图片 &raquo; 缩略图</span> 页面来创建缩略图。即使这是不被推荐的（考虑到图片品质，网络服务器资源读取等问题）。</li>
-
-  <li>分配给所有相册文件夹写权限。</li>
-
-</ul>
-</fieldset>
diff --git a/sources/language/zh_CN/install.lang.php b/sources/language/zh_CN/install.lang.php
index b991589..6a4eec4 100644
--- a/sources/language/zh_CN/install.lang.php
+++ b/sources/language/zh_CN/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = '密码 [ 确认 ]';
 $lang['verification'] = '验证';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = '需要帮助吗？请到<a href="%s">Piwigo论坛</a>提出您的问题。';
 $lang['Visitors will be able to contact site administrator with this mail'] = '访问者将可通过此email跟站长取得联系';
-$lang['PHP 5 is required'] = '必须PHP 5版本';
+$lang['PHP 5 is required'] = '必须PHP 5.2版本';
 $lang['It appears your webhost is currently running PHP %s.'] = '你主机PHP版本好像是PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo会尝试创建或修改.htaccess文件以将您的设置转换到PHP 5。';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo会尝试创建或修改.htaccess文件以将您的设置转换到PHP 5.2。';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '注意：你也可以自己修改设置PHP然后重新启动Piwigo。';
-$lang['Try to configure PHP 5'] = '尝试配置PHP 5';
+$lang['Try to configure PHP 5'] = '尝试配置PHP 5.2';
 $lang['Sorry!'] = '对不起!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能设置PHP 5。';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能设置PHP 5.2。';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = '你应该联系你的主机管理员并向其请教如何设置PHP 5.';
 $lang['Hope to see you back soon.'] = '希望不久后能再见到你。';
 $lang['Congratulations, Piwigo installation is completed'] = '恭喜，Piwigo 已安装完成';
@@ -64,6 +64,5 @@ $lang['Welcome to my photo gallery'] = '欢迎来到我的相册';
 $lang['Just another Piwigo gallery'] = '另一个崭新的Piwigo图库';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = '欢迎来我们的论坛咨询任何Piwigo相关问题：%s';
 $lang['Welcome to your new installation of Piwigo!'] = '欢迎安装Piwigo！';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '您需要联系您的主机供应商的技术支持，向其咨询如何自行转换为PHP 5。';
-$lang['localhost or other, supplied by your host provider'] = '由你的服务器提供商提供本地服务器或者其他的';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '您需要联系您的主机供应商的技术支持，向其咨询如何自行转换为PHP 5.2。';
+$lang['localhost or other, supplied by your host provider'] = '由你的服务器提供商提供本地服务器或者其他的';
\ No newline at end of file
diff --git a/sources/language/zh_CN/upgrade.lang.php b/sources/language/zh_CN/upgrade.lang.php
index 05f0882..d88dec9 100644
--- a/sources/language/zh_CN/upgrade.lang.php
+++ b/sources/language/zh_CN/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/zh_HK/admin.lang.php b/sources/language/zh_HK/admin.lang.php
index ea5d0e0..b6e310f 100755
--- a/sources/language/zh_HK/admin.lang.php
+++ b/sources/language/zh_HK/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -437,7 +437,6 @@ $lang['new'] = '新增';
 $lang['no write access'] = '沒有寫入權限';
 $lang['none'] = '沒有寫入權限';
 $lang['nothing'] = '沒有寫入權限';
-$lang['number of miniaturized photos'] = '數量的縮略圖建立';
 $lang['on'] = '在';
 $lang['on the %d selected photos'] = '在%d張已選相片上';
 $lang['on the %d selected users'] = '%d的選定用戶';
@@ -497,7 +496,6 @@ $lang['You have %d orphan tags: %s.'] = '您已 %d 無關聯標籤: %s。';
 $lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = '你已在本地設定檔選用 <i>$conf[\'order_by\']</i>，造成參數矛盾，請將它移除或重新命名為 <i>$conf[\'order_by_custom\']</i>！';
 $lang['You have subscribed to receiving notifications by mail.'] = '你開通了郵件通知功能。';
 $lang['You have unsubscribed from receiving notifications by mail.'] = '你取消了你的郵件通知功能。';
-$lang['You might go to plugin list to install and activate it.'] = '在插件列表中安裝和啟動插件。';
 $lang['You need to confirm deletion'] = '您必須確認刪除。';
 $lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = '你應該升級你的系統，以充分利用該應用程序，否則應用程序可能無法正常工作，或者不是。';
 $lang['Your configuration settings are saved'] = '你的設定已儲存';
@@ -830,7 +828,6 @@ $lang['Number of albums per page'] = '每頁相本數量';
 $lang['Number of comments per page'] = '每頁評論數量';
 $lang['Number of downloads'] = '下載次數';
 $lang['Number of rates'] = '投票數';
-$lang['Number of thumbnails to create'] = '縮略圖數';
 $lang['Numeric identifier : %d'] = '數字識別碼: %d';
 $lang['Obsolete Plugins'] = '廢棄的插件';
 $lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = '在Linux下，只需安裝Shotwell套件和啟用 Piwigo發佈選項。';
@@ -911,7 +908,6 @@ $lang['Lock'] = '上鎖';
 $lang['Lock albums'] = '鎖定相冊';
 $lang['Lock gallery'] = '鎖定圖庫';
 $lang['Locked'] = '鎖定';
-$lang['Mail address is obligatory for all users'] = '每個用戶必須提供郵箱地址';
 $lang['Mail content'] = '郵件內容';
 $lang['Mail sent to %s [%s].'] = '已發送至 %s [%s].';
 $lang['Mail theme'] = '郵件主題';
@@ -968,4 +964,27 @@ $lang['Invert'] = '反轉';
 $lang['Close user details'] = '關閉用戶詳細信息';
 $lang['Open user details'] = '打開用戶詳細信息';
 $lang['close'] = '關閉';
-?>
\ No newline at end of file
+$lang['Activate it now'] = '立即激活';
+$lang['Allow users to add a link to their website'] = '允許用戶添加一個鏈接到他們的網站';
+$lang['Empty caddie'] = '清空盒子';
+$lang['Impossible to deactivate the default theme.'] = '無法停用默認主題。';
+$lang['Mail address is mandatory for registration'] = '登記必須要有郵件地址';
+$lang['No and unlock sub-albums'] = '否及解開子相冊';
+$lang['The settings for the guest are from the %s user'] = '訪客的設定是跟從用戶%s ';
+$lang['Upload in progress'] = '正在上傳';
+$lang['based on'] = '基於';
+$lang['between %s and %s MB'] = '
+%s 和 %s MB之間';
+$lang['date & time'] = '日期和時間';
+$lang['file name'] = '檔案名稱';
+$lang['width & height'] = '寬度和高度';
+$lang['Delete %d orphan photos'] = '刪除%d個孤兒照片';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '每封電子郵件將包含自動認證密鑰的鏈接，有效%s。';
+$lang['Edit user'] = '編輯用戶';
+$lang['For security reason, authentication keys do not work for administrators.'] = '出於安全原因，認證密鑰對管理員工作不起作用。';
+$lang['No recipient selected'] = '
+沒有選擇收件人';
+$lang['No user is permitted to see this private album'] = '沒有用戶被允許看到這個私人相冊';
+$lang['Orphans'] = '孤兒';
+$lang['Recipients'] = '收件人';
+$lang['Y Repeat'] = 'Y 重複';
\ No newline at end of file
diff --git a/sources/language/zh_HK/common.lang.php b/sources/language/zh_HK/common.lang.php
index b126eae..e1ae224 100644
--- a/sources/language/zh_HK/common.lang.php
+++ b/sources/language/zh_HK/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: 中文 (香港) [HK]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=614
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -425,4 +425,5 @@ $lang['Apply on properties'] = '套用於屬性';
 $lang['No results for'] = '沒有結果';
 $lang['Photo description'] = '相片描述';
 $lang['Photo title'] = '相片標題';
-$lang['Link: %s'] = '連結: %s';
\ No newline at end of file
+$lang['Link: %s'] = '連結: %s';
+$lang['Your authentication key is no longer valid.'] = '您的認證密鑰已失效。';
\ No newline at end of file
diff --git a/sources/language/zh_HK/index.php b/sources/language/zh_HK/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/zh_HK/index.php
+++ b/sources/language/zh_HK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/zh_HK/install.lang.php b/sources/language/zh_HK/install.lang.php
index 4a451e0..c51fbef 100755
--- a/sources/language/zh_HK/install.lang.php
+++ b/sources/language/zh_HK/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -30,19 +30,19 @@ $lang['verification'] = '驗證';
 $lang['webmaster login can\'t contain characters \' or "'] = '網站管理員登錄名稱不能包含字符\'或"';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = '需要幫助嗎？你可以在<a href="%s">Piwigo 留言板</a>提出問題。';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '注意：你可以更改設定，然後重新啟動Piwigo。';
-$lang['PHP 5 is required'] = '需要PHP5';
+$lang['PHP 5 is required'] = '需要PHP5.2';
 $lang['Password ']['confirm'] = '密碼[確認]';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo嘗試建立或修改您的.htaccess檔案, 來設定系統使用PHP5。';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo的無法設定使用PHP5。';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo嘗試建立或修改您的.htaccess檔案, 來設定系統使用PHP5.2。';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo的無法設定使用PHP5.2。';
 $lang['Sorry!'] = '對不起！';
 $lang['Start Install'] = '開始安裝';
-$lang['Try to configure PHP 5'] = '嘗試設定PHP5';
+$lang['Try to configure PHP 5'] = '嘗試設定PHP5.2';
 $lang['User'] = '用戶';
 $lang['Visitors will be able to contact site administrator with this mail'] = '訪客可以使用這個電子郵件與網站管理員聯繫';
 $lang['Welcome to my photo gallery'] = '歡迎來到我的相簿';
 $lang['Welcome to your new installation of Piwigo!'] = '歡迎來到你新安裝的Piwigo！';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = '您可以下載設定檔案，並裝它上傳到local/config目錄中安裝。';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '請聯繫你的網站託管服務提供商，看看你怎麼可以自己切換到PHP 5。';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '請聯繫你的網站託管服務提供商，看看你怎麼可以自己切換到PHP 5.2。';
 $lang['also given by your host provider'] = '也可由網站託管服務提供商幫助設定';
 $lang['Admin configuration'] = '管理員設定';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = '另一種解決方案是將上面框中的文字複製，並貼到檔案 "local/config/database.inc.php"上 （警告：database.inc.php只可以包括文字框內容,不可以有，或空格字符）';
@@ -64,5 +64,4 @@ $lang['It appears your webhost is currently running PHP %s.'] = '目前您的網
 $lang['It will be shown to the visitors. It is necessary for website administration'] = '這是必要的網站管理,因它會顯示給所有訪客。';
 $lang['Just another Piwigo gallery'] = '只是另一個Piwigo相簿';
 $lang['Keep it confidential, it enables you to access administration panel'] = '請保密，它使您能夠訪問管理面板';
-$lang['localhost or other, supplied by your host provider'] = '本地主機或其它，由你的主機提供商提供';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = '本地主機或其它，由你的主機提供商提供';
\ No newline at end of file
diff --git a/sources/language/zh_HK/upgrade.lang.php b/sources/language/zh_HK/upgrade.lang.php
index 3306f66..95563c9 100755
--- a/sources/language/zh_HK/upgrade.lang.php
+++ b/sources/language/zh_HK/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/zh_TW/admin.lang.php b/sources/language/zh_TW/admin.lang.php
index 140d15b..c1a338f 100644
--- a/sources/language/zh_TW/admin.lang.php
+++ b/sources/language/zh_TW/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/zh_TW/common.lang.php b/sources/language/zh_TW/common.lang.php
index b7cb9ba..a190c7b 100644
--- a/sources/language/zh_TW/common.lang.php
+++ b/sources/language/zh_TW/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: 中文 (繁體) [TW]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=524
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/zh_TW/help/photos_add_ftp.html b/sources/language/zh_TW/help/photos_add_ftp.html
index 8835276..9042bc8 100755
--- a/sources/language/zh_TW/help/photos_add_ftp.html
+++ b/sources/language/zh_TW/help/photos_add_ftp.html
@@ -43,11 +43,20 @@
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
+  <li>Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
 
   <li>Basically, an element is represented by a file. A file can be a
   Piwigo element if its extension is among <code>file_ext</code>
@@ -56,10 +65,12 @@
   be a picture if its extension is among <code>picture_ext</code>
   configuration parameter possibilities.</li>
 
-  <li>No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
+  <li>Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
   extension. Optionally, you can associate a thumbnail and a representative
   file (see video.avi in the example above).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>警告</em>: ​​目錄和文件的名稱必須包含字母，數字，“ - ”，“_”或“.”。不能空白，及特殊字符。</li>
 
   <li>一旦照片被放置在正確的
@@ -68,18 +79,3 @@
 
 </ul>
 </fieldset>
-
-
-
-  每個目錄下的“畫廊”除為“pwg_representative”（見下面的說明），<LI>產生一個專輯。有沒有深度的限制。</ LI>
-
-  <LI>基本上，一個元素表示的一個文件。一個文件就可以了
-  Piwigo的元素，如果其擴展名之間的<code> file_ext </代碼>
-  配置參數的可能性（請參閱<跨度
-  類=“文件名”> / config_default.inc.php </ SPAN>文件）。一個文件可以
-  是一個圖片，如果其擴展名之間的<code> picture_ext </代碼>
-  配置參數的可能性。</ LI>
-
-  <LI>沒有照片元素（視頻，聲音，文件文本，無論你想...）默認情況下，文件名對應一個圖標代表
-  擴展名。或者，您可以將一個縮略圖，並代表
-  文件（見video.avi在上面的例子）。</ LI>
diff --git a/sources/language/zh_TW/install.lang.php b/sources/language/zh_TW/install.lang.php
index cdc0ce4..b0095ac 100644
--- a/sources/language/zh_TW/install.lang.php
+++ b/sources/language/zh_TW/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = '密碼 [ 確認 ]';
 $lang['verification'] = '核實';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = '需要幫助？ 請到<a href="%s">Piwigo論壇</a>提出你的問題.';
 $lang['Visitors will be able to contact site administrator with this mail'] = '遊客通過此Email跟你聯繫';
-$lang['PHP 5 is required'] = '必須PHP 5版本';
+$lang['PHP 5 is required'] = '必須PHP 5.2版本';
 $lang['It appears your webhost is currently running PHP %s.'] = '你主機PHP版本好像是PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo試著創建或修改.htaccess文件來轉換到PHP 5。';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo試著創建或修改.htaccess文件來轉換到PHP 5.2。';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '注意；你也可以自己修改設置PHP然後重新啟動Piwigo。';
-$lang['Try to configure PHP 5'] = '試試配置PHP 5';
+$lang['Try to configure PHP 5'] = '試試配置PHP 5.2';
 $lang['Sorry!'] = '對不起!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能設置PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能設置PHP 5.2';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = '你應該聯繫你的主機管理員並向其請教如何設置PHP 5.';
 $lang['Hope to see you back soon.'] = '希望下次再見到你...';
 $lang['Congratulations, Piwigo installation is completed'] = '恭喜，Piwigo 已安裝完成。';
@@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = '歡迎進入我的相片集';
 $lang['Welcome to your new installation of Piwigo!'] = '歡迎安裝Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = '如有任何問題，請至我們的論壇提出：%s ';
 $lang['localhost or other, supplied by your host provider'] = '本地主機或其它，由你的主機提供商提供';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '你應該聯繫你的主機管理員並向其請教如何設置PHP 5.2';
\ No newline at end of file
diff --git a/sources/language/zh_TW/upgrade.lang.php b/sources/language/zh_TW/upgrade.lang.php
index 883b7f6..dd6c07e 100644
--- a/sources/language/zh_TW/upgrade.lang.php
+++ b/sources/language/zh_TW/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/local/config/index.php b/sources/local/config/index.php
index c8de97f..0b96c3e 100644
--- a/sources/local/config/index.php
+++ b/sources/local/config/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/local/css/index.php b/sources/local/css/index.php
index c8de97f..0b96c3e 100644
--- a/sources/local/css/index.php
+++ b/sources/local/css/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/local/index.php b/sources/local/index.php
index c8de97f..0b96c3e 100644
--- a/sources/local/index.php
+++ b/sources/local/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/local/language/index.php b/sources/local/language/index.php
index c8de97f..0b96c3e 100644
--- a/sources/local/language/index.php
+++ b/sources/local/language/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/nbm.php b/sources/nbm.php
index e76c341..e36b955 100644
--- a/sources/nbm.php
+++ b/sources/nbm.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/notification.php b/sources/notification.php
index 192348a..ffd52b8 100644
--- a/sources/notification.php
+++ b/sources/notification.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/password.php b/sources/password.php
index 5bc94c0..5a96ea1 100644
--- a/sources/password.php
+++ b/sources/password.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -260,6 +260,8 @@ function reset_password()
     array('user_id' => $user_id)
     );
 
+  deactivate_user_auth_keys($user_id);
+
   $page['infos'][] = l10n('Your password has been reset');
   $page['infos'][] = '<a href="'.get_root_url().'identification.php">'.l10n('Login').'</a>';
 
diff --git a/sources/picture.php b/sources/picture.php
index 94c2b3e..37d65a1 100644
--- a/sources/picture.php
+++ b/sources/picture.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -532,7 +532,8 @@ while ($row = pwg_db_fetch_assoc($result))
     }
     else
     { // not a pic - need download link
-      $row['download_url'] = $row['element_url'] = get_element_url($row);;
+      $row['element_url'] = get_element_url($row);
+      $row['download_url'] = get_action_url($row['id'], 'e', true);
     }
   }
 
@@ -662,6 +663,46 @@ foreach (array('first','previous','next','last', 'current') as $which_image)
 if ($conf['picture_download_icon'] and !empty($picture['current']['download_url']))
 {
   $template->append('current', array('U_DOWNLOAD' => $picture['current']['download_url']), true);
+
+  if ($conf['enable_formats'])
+  {
+    $query = '
+SELECT *
+  FROM '.IMAGE_FORMAT_TABLE.'
+  WHERE image_id = '.$picture['current']['id'].'
+;';
+    $formats = query2array($query);
+    
+    // let's add the original as a format among others. It will just have a
+    // specific download URL
+    array_unshift(
+      $formats,
+      array(
+        'download_url' => $picture['current']['download_url'],
+        'ext' => get_extension($picture['current']['file']),
+        'filesize' => $picture['current']['filesize'],
+        )
+      );
+  
+    foreach ($formats as &$format)
+    {
+      if (!isset($format['download_url']))
+      {
+        $format['download_url'] = 'action.php?format='.$format['format_id'].'&amp;download';
+      }
+      
+      $format['label'] = strtoupper($format['ext']);
+      $lang_key = 'format '.strtoupper($format['ext']);
+      if (isset($lang[$lang_key]))
+      {
+        $format['label'] = $lang[$lang_key];
+      }
+      
+      $format['filesize'] = sprintf('%.1fMB', $format['filesize']/1024);
+    }
+
+    $template->append('current', array('formats' => $formats), true);
+  }
 }
 
 
diff --git a/sources/plugins/AdminTools/include/events.inc.php b/sources/plugins/AdminTools/include/events.inc.php
index d11d59b..244e480 100644
--- a/sources/plugins/AdminTools/include/events.inc.php
+++ b/sources/plugins/AdminTools/include/events.inc.php
@@ -32,7 +32,7 @@ function admintools_add_public_controller()
     }
   }
   else if ($conf['AdminTools']['public_quick_edit'] and
-      script_basename() == 'picture' and $picture['current']['added_by'] == $user['id']
+      script_basename() == 'picture' and $picture['current']['added_by'] == $user['id'] and !is_a_guest()
     )
   { // only "edit" button for photo owner
   }
@@ -245,6 +245,11 @@ function admintools_save_picture()
     return;
   }
 
+  if (is_a_guest())
+  {
+    return;
+  }
+
   $query = 'SELECT added_by FROM '. IMAGES_TABLE .' WHERE id = '. $page['image_id'] .';';
   list($added_by) = pwg_db_fetch_row(pwg_query($query));
 
diff --git a/sources/plugins/AdminTools/language/de_DE/plugin.lang.php b/sources/plugins/AdminTools/language/de_DE/plugin.lang.php
index 0177b4b..04f510b 100755
--- a/sources/plugins/AdminTools/language/de_DE/plugin.lang.php
+++ b/sources/plugins/AdminTools/language/de_DE/plugin.lang.php
@@ -32,8 +32,8 @@ $lang['Show SQL queries'] = 'SQL-Abfrage anzeigen';
 $lang['View as'] = 'Anzeigen als';
 $lang['Viewing as <b>%s</b>.'] = 'Aktueller Benutzer: <b>%s</b>';
 $lang['Saved'] = 'Gespeichert';
-$lang['Closed icon position'] = 'Position des geschlossenen Icons';
-$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Zugriff zum schnellen Editieren für Bildereigentümer erlauben, obwohl sie kein Administrator sind.';
+$lang['Closed icon position'] = 'Position des geschlossenen Symbolbildes';
+$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Zugriff zum schnellen Editieren für Bildeigentümer erlauben, auch wenn sie keine Administratoren-Berechtigungen haben.';
 $lang['Open toolbar by default'] = 'Die Werkzeugleiste standardmässig öffnen';
 $lang['left'] = 'links';
 $lang['right'] = 'rechts';
\ No newline at end of file
diff --git a/sources/plugins/AdminTools/language/el_GR/plugin.lang.php b/sources/plugins/AdminTools/language/el_GR/plugin.lang.php
index 665728d..c68397d 100755
--- a/sources/plugins/AdminTools/language/el_GR/plugin.lang.php
+++ b/sources/plugins/AdminTools/language/el_GR/plugin.lang.php
@@ -27,14 +27,13 @@ $lang['Save visit in history'] = 'Αποθήκευση επίσκεψης στη
 $lang['Save'] = 'Αποθήκευση';
 $lang['Revert'] = 'Επαναφορά';
 $lang['Quick edit'] = 'Γρήγορη επεξεργασία';
-$lang['Debug languages'] = 'Γλώσσες αποσφάτωσης';
-$lang['Debug template'] = 'Πρότυπο αποσφάτωσης';
+$lang['Debug languages'] = 'Γλώσσες αποσφαλμάτωσης';
+$lang['Debug template'] = 'Πρότυπο αποσφαλμάτωσης';
 $lang['Properties page'] = 'Ιδιότητες σελίδας';
 $lang['Combine JS&CSS'] = 'Συνδυάστε JS&amp;CSS';
 $lang['Saved'] = 'Αποθηκεύτηκε';
 $lang['right'] = 'δεξιά';
 $lang['left'] = 'αριστερά';
 $lang['Open toolbar by default'] = 'Ανοικτή γραμμή εργαλείων από προεπιλογή';
-$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Δώστε πρόσβαση σε γρήγορη επεξεργασία στους ιδιοκτήτες φωτογραφιών, ακόμη και αν δεν το διαχειριστές ';
-$lang['Closed icon position'] = 'Θέση Κλειστού εικονονίδιου';
-?>
\ No newline at end of file
+$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Δώστε πρόσβαση για γρήγορη επεξεργασία στους ιδιοκτήτες των φωτογραφιών, ακόμη και αν δεν είναι διαχειριστές ';
+$lang['Closed icon position'] = 'Θέση Κλειστού εικονονίδιου';
\ No newline at end of file
diff --git a/sources/plugins/AdminTools/language/ja_JP/plugin.lang.php b/sources/plugins/AdminTools/language/ja_JP/plugin.lang.php
index b72fee1..c6f85b5 100644
--- a/sources/plugins/AdminTools/language/ja_JP/plugin.lang.php
+++ b/sources/plugins/AdminTools/language/ja_JP/plugin.lang.php
@@ -1,24 +1,24 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 $lang['Debug template'] = 'デバッグ　テンプレート';
 $lang['Properties page'] = 'プロパティ　ページ';
@@ -28,4 +28,12 @@ $lang['Save'] = '保存';
 $lang['Saved'] = '保存しました';
 $lang['Show SQL queries'] = 'SQL クエリーを参照する';
 $lang['left'] = '左';
-$lang['right'] = '右';
\ No newline at end of file
+$lang['right'] = '右';
+$lang['Save visit in history'] = '訪問履歴の保存';
+$lang['View as'] = '閲覧';
+$lang['Viewing as <b>%s</b>.'] = '<b>%s</b>として閲覧中';
+$lang['Open toolbar by default'] = 'デフォルトでツールバーを開く';
+$lang['Debug languages'] = 'デバッグ時の言語';
+$lang['Combine JS&CSS'] = 'JSとCSSを結合する';
+$lang['Give access to quick edit to photo owners even if they are not admin'] = '写真のオーナ（持ち主）に、quick editの権限をadmin権限がなくても与える';
+$lang['Closed icon position'] = 'クローズアイコンの位置';
\ No newline at end of file
diff --git a/sources/plugins/AdminTools/language/mn_MN/plugin.lang.php b/sources/plugins/AdminTools/language/mn_MN/plugin.lang.php
index 505c16f..2d0b490 100755
--- a/sources/plugins/AdminTools/language/mn_MN/plugin.lang.php
+++ b/sources/plugins/AdminTools/language/mn_MN/plugin.lang.php
@@ -30,4 +30,10 @@ $lang['left'] = 'зүүн';
 $lang['right'] = 'баруун';
 $lang['Closed icon position'] = 'Хаагдсан дүрслэлийн байршил';
 $lang['Show SQL queries'] = 'SQL query хүсэлтийг харуулах';
-$lang['Save visit in history'] = 'Хандалтыг бүртгэж хадгалах';
\ No newline at end of file
+$lang['Save visit in history'] = 'Хандалтыг бүртгэж хадгалах';
+$lang['Open toolbar by default'] = 'Засварлах багажыг нээлттэй байлгах ';
+$lang['Viewing as <b>%s</b>.'] = '<b>%s</b> маягаар харах';
+$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Зургийн эзэд админ эрхгүй байсан ч засвар хийх боломжтой';
+$lang['Properties page'] = 'Дэлгэрэнгүй үзүүлэлт';
+$lang['Debug languages'] = 'Хэлийг засах';
+$lang['Debug template'] = 'Загварыг засах';
\ No newline at end of file
diff --git a/sources/plugins/AdminTools/language/nb_NO/plugin.lang.php b/sources/plugins/AdminTools/language/nb_NO/plugin.lang.php
index f3ef67d..5a8d427 100755
--- a/sources/plugins/AdminTools/language/nb_NO/plugin.lang.php
+++ b/sources/plugins/AdminTools/language/nb_NO/plugin.lang.php
@@ -24,7 +24,7 @@ $lang['Combine JS&CSS'] = 'Kombiner JS&amp;CSS';
 $lang['Debug languages'] = 'Feilsøkingspråk';
 $lang['Debug template'] = 'Feilsøking tema';
 $lang['Properties page'] = 'Egenskapersiden';
-$lang['Quick edit'] = 'Rask endring';
+$lang['Quick edit'] = 'Hurtigredigering';
 $lang['Revert'] = 'Omgjøre';
 $lang['Save'] = 'Lagre';
 $lang['Save visit in history'] = 'Lagre besøkshistorie';
@@ -33,8 +33,7 @@ $lang['Show SQL queries'] = 'Vis SQL spørringer';
 $lang['View as'] = 'Se alle';
 $lang['Viewing as <b>%s</b>.'] = 'Se som <b>%s</b>.';
 $lang['Closed icon position'] = 'Låst ikonposisjon';
-$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Gi tilgang til hurtigredigering av bildeeier, selv om de ikke er admin';
+$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Gi tilgang til bildets eier for hurtigredigering, selv om de ikke er admin';
 $lang['Open toolbar by default'] = 'Åpne verktøy automatisk';
 $lang['left'] = 'venstre';
-$lang['right'] = 'høyre';
-?>
\ No newline at end of file
+$lang['right'] = 'høyre';
\ No newline at end of file
diff --git a/sources/plugins/AdminTools/main.inc.php b/sources/plugins/AdminTools/main.inc.php
index 5928dd5..258d4b6 100644
--- a/sources/plugins/AdminTools/main.inc.php
+++ b/sources/plugins/AdminTools/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Admin Tools
-Version: 2.7.3
+Version: 2.8.2
 Description: Do some admin task from the public pages
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=720
 Author: Piwigo team
diff --git a/sources/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php b/sources/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php
index 97f9383..0f09322 100644
--- a/sources/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php
+++ b/sources/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php
@@ -29,7 +29,7 @@ $lang['locfiledit_onglet_plug'] = 'Persönliches Plugin';
 $lang['locfiledit_cant_save'] = 'Die Datei ist nicht überschreibbar. Überprüfen Sie, ob das Verzeichnis "local/" beschreibbar ist (chmod).';
 $lang['locfiledit_newfile'] = 'Die Datei ist nicht vorhanden und wird vom LocalFilesEditor erstellt.';
 $lang['locfiledit_save_config'] = 'Datei erfolgreich geschrieben.';
-$lang['locfiledit_show_default'] = 'Zeige Referenz-Datei: ';
+$lang['locfiledit_show_default'] = 'Referenz-Datei anzeigen: ';
 $lang['locfiledit_save_bak'] = 'Backup-Kopie wird beim Speichern erstellt.';
 $lang['locfiledit_saved_bak'] = 'Backup-Datei erstellt (%s)';
 $lang['locfiledit_save_file'] = 'Datei speichern';
@@ -40,7 +40,7 @@ $lang['locfiledit_restore_confirm'] = 'Bitte bestätigen! Wiederherstellung wird
 $lang['locfiledit_bak_loaded1'] = 'Backup-Datei geladen.';
 $lang['locfiledit_bak_loaded2'] = 'Sie müssen die Datei speichern, um sie wiederherstellen zu können.';
 $lang['locfiledit_syntax_error'] = 'Syntax-Fehler! Datei kann nicht gespeichert werden.';
-$lang['locfiledit_new_tpl'] = 'Erstelle eine neue Datei';
+$lang['locfiledit_new_tpl'] = 'Eine neue Datei erstellen';
 $lang['locfiledit_new_filename'] = 'Dateiname';
 $lang['locfiledit_model'] = 'Modell';
 $lang['locfiledit_empty_page'] = 'Leere Seite';
@@ -49,5 +49,4 @@ $lang['locfiledit_filename_error'] = 'Verbotene Zeichen im Dateinamen.';
 $lang['locfiledit_file_already_exists'] = 'Datei ist bereits vorhanden.';
 $lang['locfiledit_model_error'] = 'Sie müssen ein Modell wählen.';
 $lang['locfiledit_empty_filename'] = 'Sie müssen einen Dateinamen eingeben.';
-$lang['locfiledit_webmaster_only'] = 'Nur Webmaster können lokale Dateien erstellen oder verändern.';
-?>
\ No newline at end of file
+$lang['locfiledit_webmaster_only'] = 'Nur Webmaster können lokale Dateien erstellen oder verändern.';
\ No newline at end of file
diff --git a/sources/plugins/LocalFilesEditor/main.inc.php b/sources/plugins/LocalFilesEditor/main.inc.php
index ad7f95e..3f33af4 100644
--- a/sources/plugins/LocalFilesEditor/main.inc.php
+++ b/sources/plugins/LocalFilesEditor/main.inc.php
@@ -23,7 +23,7 @@
 
 /*
 Plugin Name: LocalFiles Editor
-Version: 2.7.1
+Version: 2.8.2
 Description: Edit local files from administration panel
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=144
 Author: Piwigo team
@@ -67,4 +67,4 @@ function localfiles_css_link_prefilter($content, &$smarty)
 
 add_event_handler('get_admin_plugin_menu_links', 'localfiles_admin_menu');
 add_event_handler('loc_begin_admin', 'localfiles_css_link');
-?>
\ No newline at end of file
+?>
diff --git a/sources/plugins/TakeATour/admin.php b/sources/plugins/TakeATour/admin.php
index 1f3d44d..c0dea33 100644
--- a/sources/plugins/TakeATour/admin.php
+++ b/sources/plugins/TakeATour/admin.php
@@ -5,10 +5,19 @@ if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 global $template, $conf, $user, $page;
 
 load_language('plugin.lang', PHPWG_PLUGINS_PATH .'TakeATour/');
+
+$tat_28url = 'http://';
+if (substr($user['language'],0,2) == 'fr')
+{
+  $tat_28url.= 'fr.';
+}
+$tat_28url.= 'piwigo.org/releases/2.8.0';
+
 $template->assign(
   array(
     'F_ACTION' => get_root_url().'admin.php',
-    'pwg_token' => get_pwg_token()
+    'pwg_token' => get_pwg_token(),
+    'TAT_28URL' => $tat_28url,
     )
   );
 
diff --git a/sources/plugins/TakeATour/css/bootstrap-tour-standalone.css b/sources/plugins/TakeATour/css/bootstrap-tour-standalone.css
index 25b338b..a554af8 100644
--- a/sources/plugins/TakeATour/css/bootstrap-tour-standalone.css
+++ b/sources/plugins/TakeATour/css/bootstrap-tour-standalone.css
@@ -1,21 +1,24 @@
-/* ===========================================================
-# bootstrap-tour - v0.9.3
-# http://bootstraptour.com
-# ==============================================================
-# Copyright 2012-2013 Ulrich Sossou
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/
+/* ========================================================================
+ * bootstrap-tour - v0.10.1
+ * http://bootstraptour.com
+ * ========================================================================
+ * Copyright 2012-2013 Ulrich Sossou
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
 /*!
  * Bootstrap v3.1.0 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
@@ -33,14 +36,16 @@
   white-space: nowrap;
   padding: 6px 12px;
   font-size: 14px;
-  line-height: 1.428571429;
+  line-height: 1.42857143;
   border-radius: 4px;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
-.btn:focus {
+.btn:focus,
+.btn:active:focus,
+.btn.active:focus {
   outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
@@ -76,14 +81,14 @@ fieldset[disabled] .btn {
 .btn-default:focus,
 .btn-default:active,
 .btn-default.active,
-.open .dropdown-toggle.btn-default {
+.open > .dropdown-toggle.btn-default {
   color: #333333;
-  background-color: #ebebeb;
+  background-color: #e6e6e6;
   border-color: #adadad;
 }
 .btn-default:active,
 .btn-default.active,
-.open .dropdown-toggle.btn-default {
+.open > .dropdown-toggle.btn-default {
   background-image: none;
 }
 .btn-default.disabled,
@@ -108,54 +113,320 @@ fieldset[disabled] .btn-default.active {
   color: #ffffff;
   background-color: #333333;
 }
-.btn-sm {
+.btn-primary {
+  color: #ffffff;
+  background-color: #428bca;
+  border-color: #357ebd;
+}
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+  color: #ffffff;
+  background-color: #3071a9;
+  border-color: #285e8e;
+}
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+  background-image: none;
+}
+.btn-primary.disabled,
+.btn-primary[disabled],
+fieldset[disabled] .btn-primary,
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled].active,
+fieldset[disabled] .btn-primary.active {
+  background-color: #428bca;
+  border-color: #357ebd;
+}
+.btn-primary .badge {
+  color: #428bca;
+  background-color: #ffffff;
+}
+.btn-success {
+  color: #ffffff;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+  color: #ffffff;
+  background-color: #449d44;
+  border-color: #398439;
+}
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+  background-image: none;
+}
+.btn-success.disabled,
+.btn-success[disabled],
+fieldset[disabled] .btn-success,
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active,
+.btn-success.disabled.active,
+.btn-success[disabled].active,
+fieldset[disabled] .btn-success.active {
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-success .badge {
+  color: #5cb85c;
+  background-color: #ffffff;
+}
+.btn-info {
+  color: #ffffff;
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+  color: #ffffff;
+  background-color: #31b0d5;
+  border-color: #269abc;
+}
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+  background-image: none;
+}
+.btn-info.disabled,
+.btn-info[disabled],
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info .badge {
+  color: #5bc0de;
+  background-color: #ffffff;
+}
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ec971f;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #ffffff;
+}
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #c9302c;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #ffffff;
+}
+.btn-link {
+  color: #428bca;
+  font-weight: normal;
+  cursor: pointer;
+  border-radius: 0;
+}
+.btn-link,
+.btn-link:active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+  background-color: transparent;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.btn-link,
+.btn-link:hover,
+.btn-link:focus,
+.btn-link:active {
+  border-color: transparent;
+}
+.btn-link:hover,
+.btn-link:focus {
+  color: #2a6496;
+  text-decoration: underline;
+  background-color: transparent;
+}
+.btn-link[disabled]:hover,
+fieldset[disabled] .btn-link:hover,
+.btn-link[disabled]:focus,
+fieldset[disabled] .btn-link:focus {
+  color: #777777;
+  text-decoration: none;
+}
+.btn-lg,
+.btn-group-lg > .btn {
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.33;
+  border-radius: 6px;
+}
+.btn-sm,
+.btn-group-sm > .btn {
   padding: 5px 10px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
 }
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity 0.15s linear;
-  transition: opacity 0.15s linear;
+.btn-xs,
+.btn-group-xs > .btn {
+  padding: 1px 5px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
 }
-.fade.in {
-  opacity: 1;
-}
-.collapse {
-  display: none;
-}
-.collapse.in {
+.btn-block {
   display: block;
+  width: 100%;
 }
-.collapsing {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition: height 0.35s ease;
-  transition: height 0.35s ease;
+.btn-block + .btn-block {
+  margin-top: 5px;
 }
-.btn-group {
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+.btn-group,
+.btn-group-vertical {
   position: relative;
   display: inline-block;
   vertical-align: middle;
 }
-.btn-group > .btn {
+.btn-group > .btn,
+.btn-group-vertical > .btn {
   position: relative;
   float: left;
 }
 .btn-group > .btn:hover,
+.btn-group-vertical > .btn:hover,
 .btn-group > .btn:focus,
+.btn-group-vertical > .btn:focus,
 .btn-group > .btn:active,
-.btn-group > .btn.active {
+.btn-group-vertical > .btn:active,
+.btn-group > .btn.active,
+.btn-group-vertical > .btn.active {
   z-index: 2;
 }
-.btn-group > .btn:focus {
-  outline: none;
+.btn-group > .btn:focus,
+.btn-group-vertical > .btn:focus {
+  outline: 0;
 }
-.btn-group .btn + .btn {
+.btn-group .btn + .btn,
+.btn-group .btn + .btn-group,
+.btn-group .btn-group + .btn,
+.btn-group .btn-group + .btn-group {
   margin-left: -1px;
 }
+.btn-toolbar {
+  margin-left: -5px;
+}
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
+  float: left;
+}
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
+  margin-left: 5px;
+}
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
   border-radius: 0;
 }
@@ -166,15 +437,129 @@ fieldset[disabled] .btn-default.active {
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
-.btn-group > .btn:last-child:not(:first-child) {
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
+.btn-group > .btn-group {
+  float: left;
+}
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group > .btn-group:first-child > .btn:last-child,
+.btn-group > .btn-group:first-child > .dropdown-toggle {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+.btn-group > .btn-group:last-child > .btn:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+}
+.btn-group > .btn-lg + .dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
+}
+.btn-group.open .dropdown-toggle {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+  box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+.btn-group.open .dropdown-toggle.btn-link {
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.btn .caret {
+  margin-left: 0;
+}
+.btn-lg .caret {
+  border-width: 5px 5px 0;
+  border-bottom-width: 0;
+}
+.dropup .btn-lg .caret {
+  border-width: 0 5px 5px;
+}
+.btn-group-vertical > .btn,
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
+  display: block;
+  float: none;
+  width: 100%;
+  max-width: 100%;
+}
+.btn-group-vertical > .btn-group > .btn {
+  float: none;
+}
+.btn-group-vertical > .btn + .btn,
+.btn-group-vertical > .btn + .btn-group,
+.btn-group-vertical > .btn-group + .btn,
+.btn-group-vertical > .btn-group + .btn-group {
+  margin-top: -1px;
+  margin-left: 0;
+}
+.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
+  border-radius: 0;
+}
+.btn-group-vertical > .btn:first-child:not(:last-child) {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.btn-group-vertical > .btn:last-child:not(:first-child) {
+  border-bottom-left-radius: 4px;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+.btn-group-justified {
+  display: table;
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: separate;
+}
+.btn-group-justified > .btn,
+.btn-group-justified > .btn-group {
+  float: none;
+  display: table-cell;
+  width: 1%;
+}
+.btn-group-justified > .btn-group .btn {
+  width: 100%;
+}
+.btn-group-justified > .btn-group .dropdown-menu {
+  left: auto;
+}
+[data-toggle="buttons"] > .btn > input[type="radio"],
+[data-toggle="buttons"] > .btn > input[type="checkbox"] {
+  position: absolute;
+  z-index: -1;
+  opacity: 0;
+  filter: alpha(opacity=0);
+}
 .popover {
   position: absolute;
   top: 0;
   left: 0;
-  z-index: 1010;
+  z-index: 1060;
   display: none;
   max-width: 276px;
   padding: 1px;
@@ -289,7 +674,6 @@ fieldset[disabled] .btn-default.active {
   border-left-color: #ffffff;
   bottom: -10px;
 }
-
 .tour-backdrop {
   position: fixed;
   top: 0;
@@ -299,14 +683,19 @@ fieldset[disabled] .btn-default.active {
   z-index: 1100;
   background-color: #000;
   opacity: 0.8;
+  filter: alpha(opacity=80);
 }
 .tour-step-backdrop {
   position: relative;
   z-index: 1101;
   background: inherit;
 }
+.tour-step-backdrop > td {
+  position: relative;
+  z-index: 1101;
+}
 .tour-step-background {
-  position: absolute;
+  position: absolute !important;
   z-index: 1100;
   background: inherit;
   border-radius: 6px;
diff --git a/sources/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js b/sources/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js
index 28308b8..cab870c 100644
--- a/sources/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js
+++ b/sources/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js
@@ -1,1301 +1,1388 @@
-/* ===========================================================
-# bootstrap-tour - v0.9.3
-# http://bootstraptour.com
-# ==============================================================
-# Copyright 2012-2013 Ulrich Sossou
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/
-/* ========================================================================
- * Bootstrap: transition.js v3.1.1
- * http://getbootstrap.com/javascript/#transitions
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-  // ============================================================
-
-  function transitionEnd() {
-    var el = document.createElement('bootstrap')
-
-    var transEndEventNames = {
-      'WebkitTransition' : 'webkitTransitionEnd',
-      'MozTransition'    : 'transitionend',
-      'OTransition'      : 'oTransitionEnd otransitionend',
-      'transition'       : 'transitionend'
-    }
-
-    for (var name in transEndEventNames) {
-      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
-      }
-    }
-
-    return false // explicit for ie8 (  ._.)
-  }
-
-  // http://blog.alexmaccaw.com/css-transitions
-  $.fn.emulateTransitionEnd = function (duration) {
-    var called = false, $el = this
-    $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
-  }
-
-  $(function () {
-    $.support.transition = transitionEnd()
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: tooltip.js v3.1.1
- * http://getbootstrap.com/javascript/#tooltip
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TOOLTIP PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Tooltip = function (element, options) {
-    this.type       =
-    this.options    =
-    this.enabled    =
-    this.timeout    =
-    this.hoverState =
-    this.$element   = null
-
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.DEFAULTS = {
-    animation: true,
-    placement: 'top',
-    selector: false,
-    template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
-    trigger: 'hover focus',
-    title: '',
-    delay: 0,
-    html: false,
-    container: false
-  }
-
-  Tooltip.prototype.init = function (type, element, options) {
-    this.enabled  = true
-    this.type     = type
-    this.$element = $(element)
-    this.options  = this.getOptions(options)
-
-    var triggers = this.options.trigger.split(' ')
-
-    for (var i = triggers.length; i--;) {
-      var trigger = triggers[i]
-
-      if (trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
-
-        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-    }
-
-    this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-      this.fixTitle()
-  }
-
-  Tooltip.prototype.getDefaults = function () {
-    return Tooltip.DEFAULTS
-  }
-
-  Tooltip.prototype.getOptions = function (options) {
-    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
-
-    if (options.delay && typeof options.delay == 'number') {
-      options.delay = {
-        show: options.delay,
-        hide: options.delay
-      }
-    }
-
-    return options
-  }
-
-  Tooltip.prototype.getDelegateOptions = function () {
-    var options  = {}
-    var defaults = this.getDefaults()
-
-    this._options && $.each(this._options, function (key, value) {
-      if (defaults[key] != value) options[key] = value
-    })
-
-    return options
-  }
-
-  Tooltip.prototype.enter = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'in'
-
-    if (!self.options.delay || !self.options.delay.show) return self.show()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'in') self.show()
-    }, self.options.delay.show)
-  }
-
-  Tooltip.prototype.leave = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'out'
-
-    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'out') self.hide()
-    }, self.options.delay.hide)
-  }
-
-  Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.' + this.type)
-
-    if (this.hasContent() && this.enabled) {
-      this.$element.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-      var that = this;
-
-      var $tip = this.tip()
-
-      this.setContent()
-
-      if (this.options.animation) $tip.addClass('fade')
-
-      var placement = typeof this.options.placement == 'function' ?
-        this.options.placement.call(this, $tip[0], this.$element[0]) :
-        this.options.placement
-
-      var autoToken = /\s?auto?\s?/i
-      var autoPlace = autoToken.test(placement)
-      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-
-      $tip
-        .detach()
-        .css({ top: 0, left: 0, display: 'block' })
-        .addClass(placement)
-
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-
-      var pos          = this.getPosition()
-      var actualWidth  = $tip[0].offsetWidth
-      var actualHeight = $tip[0].offsetHeight
-
-      if (autoPlace) {
-        var $parent = this.$element.parent()
-
-        var orgPlacement = placement
-        var docScroll    = document.documentElement.scrollTop || document.body.scrollTop
-        var parentWidth  = this.options.container == 'body' ? window.innerWidth  : $parent.outerWidth()
-        var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
-        var parentLeft   = this.options.container == 'body' ? 0 : $parent.offset().left
-
-        placement = placement == 'bottom' && pos.top   + pos.height  + actualHeight - docScroll > parentHeight  ? 'top'    :
-                    placement == 'top'    && pos.top   - docScroll   - actualHeight < 0                         ? 'bottom' :
-                    placement == 'right'  && pos.right + actualWidth > parentWidth                              ? 'left'   :
-                    placement == 'left'   && pos.left  - actualWidth < parentLeft                               ? 'right'  :
-                    placement
-
-        $tip
-          .removeClass(orgPlacement)
-          .addClass(placement)
-      }
-
-      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
-
-      this.applyPlacement(calculatedOffset, placement)
-      this.hoverState = null
-
-      var complete = function() {
-        that.$element.trigger('shown.bs.' + that.type)
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        $tip
-          .one($.support.transition.end, complete)
-          .emulateTransitionEnd(150) :
-        complete()
-    }
-  }
-
-  Tooltip.prototype.applyPlacement = function (offset, placement) {
-    var replace
-    var $tip   = this.tip()
-    var width  = $tip[0].offsetWidth
-    var height = $tip[0].offsetHeight
-
-    // manually read margins because getBoundingClientRect includes difference
-    var marginTop = parseInt($tip.css('margin-top'), 10)
-    var marginLeft = parseInt($tip.css('margin-left'), 10)
-
-    // we must check for NaN for ie 8/9
-    if (isNaN(marginTop))  marginTop  = 0
-    if (isNaN(marginLeft)) marginLeft = 0
-
-    offset.top  = offset.top  + marginTop
-    offset.left = offset.left + marginLeft
-
-    // $.fn.offset doesn't round pixel values
-    // so we use setOffset directly with our own function B-0
-    $.offset.setOffset($tip[0], $.extend({
-      using: function (props) {
-        $tip.css({
-          top: Math.round(props.top),
-          left: Math.round(props.left)
-        })
-      }
-    }, offset), 0)
-
-    $tip.addClass('in')
-
-    // check to see if placing tip in new offset caused the tip to resize itself
-    var actualWidth  = $tip[0].offsetWidth
-    var actualHeight = $tip[0].offsetHeight
-
-    if (placement == 'top' && actualHeight != height) {
-      replace = true
-      offset.top = offset.top + height - actualHeight
-    }
-
-    if (/bottom|top/.test(placement)) {
-      var delta = 0
-
-      if (offset.left < 0) {
-        delta       = offset.left * -2
-        offset.left = 0
-
-        $tip.offset(offset)
-
-        actualWidth  = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-      }
-
-      this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-    } else {
-      this.replaceArrow(actualHeight - height, actualHeight, 'top')
-    }
-
-    if (replace) $tip.offset(offset)
-  }
-
-  Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
-    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
-  }
-
-  Tooltip.prototype.setContent = function () {
-    var $tip  = this.tip()
-    var title = this.getTitle()
-
-    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-    $tip.removeClass('fade in top bottom left right')
-  }
-
-  Tooltip.prototype.hide = function () {
-    var that = this
-    var $tip = this.tip()
-    var e    = $.Event('hide.bs.' + this.type)
-
-    function complete() {
-      if (that.hoverState != 'in') $tip.detach()
-      that.$element.trigger('hidden.bs.' + that.type)
-    }
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    $tip.removeClass('in')
-
-    $.support.transition && this.$tip.hasClass('fade') ?
-      $tip
-        .one($.support.transition.end, complete)
-        .emulateTransitionEnd(150) :
-      complete()
-
-    this.hoverState = null
-
-    return this
-  }
-
-  Tooltip.prototype.fixTitle = function () {
-    var $e = this.$element
-    if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-    }
-  }
-
-  Tooltip.prototype.hasContent = function () {
-    return this.getTitle()
-  }
-
-  Tooltip.prototype.getPosition = function () {
-    var el = this.$element[0]
-    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-      width: el.offsetWidth,
-      height: el.offsetHeight
-    }, this.$element.offset())
-  }
-
-  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
-  }
-
-  Tooltip.prototype.getTitle = function () {
-    var title
-    var $e = this.$element
-    var o  = this.options
-
-    title = $e.attr('data-original-title')
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-    return title
-  }
-
-  Tooltip.prototype.tip = function () {
-    return this.$tip = this.$tip || $(this.options.template)
-  }
-
-  Tooltip.prototype.arrow = function () {
-    return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
-  }
-
-  Tooltip.prototype.validate = function () {
-    if (!this.$element[0].parentNode) {
-      this.hide()
-      this.$element = null
-      this.options  = null
-    }
-  }
-
-  Tooltip.prototype.enable = function () {
-    this.enabled = true
-  }
-
-  Tooltip.prototype.disable = function () {
-    this.enabled = false
-  }
-
-  Tooltip.prototype.toggleEnabled = function () {
-    this.enabled = !this.enabled
-  }
-
-  Tooltip.prototype.toggle = function (e) {
-    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
-    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-  }
-
-  Tooltip.prototype.destroy = function () {
-    clearTimeout(this.timeout)
-    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
-  }
-
-
-  // TOOLTIP PLUGIN DEFINITION
-  // =========================
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.tooltip')
-      var options = typeof option == 'object' && option
-
-      if (!data && option == 'destroy') return
-      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
-
-
-  // TOOLTIP NO CONFLICT
-  // ===================
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: popover.js v3.1.1
- * http://getbootstrap.com/javascript/#popovers
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // POPOVER PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
-  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right',
-    trigger: 'click',
-    content: '',
-    template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
-
-
-  // NOTE: POPOVER EXTENDS tooltip.js
-  // ================================
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
-
-  Popover.prototype.constructor = Popover
-
-  Popover.prototype.getDefaults = function () {
-    return Popover.DEFAULTS
-  }
-
-  Popover.prototype.setContent = function () {
-    var $tip    = this.tip()
-    var title   = this.getTitle()
-    var content = this.getContent()
-
-    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content')[ // we use append for html objects to maintain js events
-      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
-    ](content)
-
-    $tip.removeClass('fade top bottom left right in')
-
-    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-    // this manually by checking the contents.
-    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-  }
-
-  Popover.prototype.hasContent = function () {
-    return this.getTitle() || this.getContent()
-  }
-
-  Popover.prototype.getContent = function () {
-    var $e = this.$element
-    var o  = this.options
-
-    return $e.attr('data-content')
-      || (typeof o.content == 'function' ?
-            o.content.call($e[0]) :
-            o.content)
-  }
-
-  Popover.prototype.arrow = function () {
-    return this.$arrow = this.$arrow || this.tip().find('.arrow')
-  }
-
-  Popover.prototype.tip = function () {
-    if (!this.$tip) this.$tip = $(this.options.template)
-    return this.$tip
-  }
-
-
-  // POPOVER PLUGIN DEFINITION
-  // =========================
-
-  var old = $.fn.popover
-
-  $.fn.popover = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.popover')
-      var options = typeof option == 'object' && option
-
-      if (!data && option == 'destroy') return
-      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.popover.Constructor = Popover
-
-
-  // POPOVER NO CONFLICT
-  // ===================
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(jQuery);
-
-(function($, window) {
-  var Tour, document;
-  document = window.document;
-  Tour = (function() {
-    function Tour(options) {
-      var storage;
-      try {
-        storage = window.localStorage;
-      } catch (_error) {
-        storage = false;
-      }
-      this._options = $.extend({
-        name: "tour",
-        steps: [],
-        container: "body",
-        keyboard: true,
-        storage: storage,
-        debug: false,
-        backdrop: false,
-        redirect: true,
-        orphan: false,
-        duration: false,
-        basePath: "",
-        template: "<div class='popover'>          <div class='arrow'></div>          <h3 class='popover-title'></h3>          <div class='popover-content'></div>          <div class='popover-navigation'>            <div class='btn-group'>              <button class='btn btn-sm btn-default' data-role='prev'>&laquo; Prev</button>              <button class='btn btn-sm btn-default' data-role='next'>Next &raquo;</button>              <button class='btn btn-sm btn-default' data-role='pause-resume' data-pause-text='Pause' data-resume-text='Resume'>Pause</button>            </div>            <button class='btn btn-sm btn-default' data-role='end'>End tour</button>          </div>        </div>",
-        afterSetState: function(key, value) {},
-        afterGetState: function(key, value) {},
-        afterRemoveState: function(key) {},
-        onStart: function(tour) {},
-        onEnd: function(tour) {},
-        onShow: function(tour) {},
-        onShown: function(tour) {},
-        onHide: function(tour) {},
-        onHidden: function(tour) {},
-        onNext: function(tour) {},
-        onPrev: function(tour) {},
-        onPause: function(tour, duration) {},
-        onResume: function(tour, duration) {}
-      }, options);
-      this._force = false;
-      this._inited = false;
-      this.backdrop = {
-        overlay: null,
-        $element: null,
-        $background: null,
-        backgroundShown: false,
-        overlayElementShown: false
-      };
-      this;
-    }
-
-    Tour.prototype.addSteps = function(steps) {
-      var step, _i, _len;
-      for (_i = 0, _len = steps.length; _i < _len; _i++) {
-        step = steps[_i];
-        this.addStep(step);
-      }
-      return this;
-    };
-
-    Tour.prototype.addStep = function(step) {
-      this._options.steps.push(step);
-      return this;
-    };
-
-    Tour.prototype.getStep = function(i) {
-      if (this._options.steps[i] != null) {
-        return $.extend({
-          id: "step-" + i,
-          path: "",
-          placement: "right",
-          title: "",
-          content: "<p></p>",
-          next: i === this._options.steps.length - 1 ? -1 : i + 1,
-          prev: i - 1,
-          animation: true,
-          container: this._options.container,
-          backdrop: this._options.backdrop,
-          redirect: this._options.redirect,
-          orphan: this._options.orphan,
-          duration: this._options.duration,
-          template: this._options.template,
-          onShow: this._options.onShow,
-          onShown: this._options.onShown,
-          onHide: this._options.onHide,
-          onHidden: this._options.onHidden,
-          onNext: this._options.onNext,
-          onPrev: this._options.onPrev,
-          onPause: this._options.onPause,
-          onResume: this._options.onResume
-        }, this._options.steps[i]);
-      }
-    };
-
-    Tour.prototype.init = function(force) {
-      this._force = force;
-      if (this.ended()) {
-        this._debug("Tour ended, init prevented.");
-        return this;
-      }
-      this.setCurrentStep();
-      this._initMouseNavigation();
-      this._initKeyboardNavigation();
-      this._onResize((function(_this) {
-        return function() {
-        return _this.showStep(_this._current);
-        };
-      })(this));
-      if (this._current !== null) {
-        this.showStep(this._current);
-      }
-      this._inited = true;
-      return this;
-    };
-
-    Tour.prototype.start = function(force) {
-      var promise;
-      if (force == null) {
-        force = false;
-      }
-      if (!this._inited) {
-        this.init(force);
-      }
-      if (this._current === null) {
-        promise = this._makePromise(this._options.onStart != null ? this._options.onStart(this) : void 0);
-        this._callOnPromiseDone(promise, this.showStep, 0);
-      }
-      return this;
-    };
-
-    Tour.prototype.next = function() {
-      var promise;
-      promise = this.hideStep(this._current);
-      return this._callOnPromiseDone(promise, this._showNextStep);
-    };
-
-    Tour.prototype.prev = function() {
-      var promise;
-      promise = this.hideStep(this._current);
-      return this._callOnPromiseDone(promise, this._showPrevStep);
-    };
-
-    Tour.prototype.goTo = function(i) {
-      var promise;
-      promise = this.hideStep(this._current);
-      return this._callOnPromiseDone(promise, this.showStep, i);
-    };
-
-    Tour.prototype.end = function() {
-      var endHelper, promise;
-      endHelper = (function(_this) {
-        return function(e) {
-        $(document).off("click.tour-" + _this._options.name);
-        $(document).off("keyup.tour-" + _this._options.name);
-        $(window).off("resize.tour-" + _this._options.name);
-        _this._setState("end", "yes");
-        _this._inited = false;
-        _this._force = false;
-        _this._clearTimer();
-        if (_this._options.onEnd != null) {
-          return _this._options.onEnd(_this);
-        }
-      };
-      })(this);
-      promise = this.hideStep(this._current);
-      return this._callOnPromiseDone(promise, endHelper);
-    };
-
-    Tour.prototype.ended = function() {
-      return !this._force && !!this._getState("end");
-    };
-
-    Tour.prototype.restart = function() {
-      this._removeState("current_step");
-      this._removeState("end");
-      return this.start();
-    };
-
-    Tour.prototype.pause = function() {
-      var step;
-      step = this.getStep(this._current);
-      if (!(step && step.duration)) {
-        return this;
-      }
-      this._paused = true;
-      this._duration -= new Date().getTime() - this._start;
-      window.clearTimeout(this._timer);
-      this._debug("Paused/Stopped step " + (this._current + 1) + " timer (" + this._duration + " remaining).");
-      if (step.onPause != null) {
-        return step.onPause(this, this._duration);
-      }
-    };
-
-    Tour.prototype.resume = function() {
-      var step;
-      step = this.getStep(this._current);
-      if (!(step && step.duration)) {
-        return this;
-      }
-      this._paused = false;
-      this._start = new Date().getTime();
-      this._duration = this._duration || step.duration;
-      this._timer = window.setTimeout((function(_this) {
-        return function() {
-        if (_this._isLast()) {
-          return _this.next();
-        } else {
-          return _this.end();
-        }
-        };
-      })(this), this._duration);
-      this._debug("Started step " + (this._current + 1) + " timer with duration " + this._duration);
-      if ((step.onResume != null) && this._duration !== step.duration) {
-        return step.onResume(this, this._duration);
-      }
-    };
-
-    Tour.prototype.hideStep = function(i) {
-      var hideStepHelper, promise, step;
-      step = this.getStep(i);
-      if (!step) {
-        return;
-      }
-      this._clearTimer();
-      promise = this._makePromise(step.onHide != null ? step.onHide(this, i) : void 0);
-      hideStepHelper = (function(_this) {
-        return function(e) {
-        var $element;
-        $element = $(step.element);
-        if (!($element.data("bs.popover") || $element.data("popover"))) {
-          $element = $("body");
-        }
-          $element.popover("destroy").removeClass("tour-" + _this._options.name + "-element tour-" + _this._options.name + "-" + i + "-element");
-        if (step.reflex) {
-          $element.css("cursor", "").off("click.tour-" + _this._options.name);
-        }
-        if (step.backdrop) {
-          _this._hideBackdrop();
-        }
-        if (step.onHidden != null) {
-          return step.onHidden(_this);
-        }
-      };
-      })(this);
-      this._callOnPromiseDone(promise, hideStepHelper);
-      return promise;
-    };
-
-    Tour.prototype.showStep = function(i) {
-      var promise, showStepHelper, skipToPrevious, step;
-      if (this.ended()) {
-        this._debug("Tour ended, showStep prevented.");
-        return this;
-      }
-      step = this.getStep(i);
-      if (!step) {
-        return;
-      }
-      skipToPrevious = i < this._current;
-      promise = this._makePromise(step.onShow != null ? step.onShow(this, i) : void 0);
-      showStepHelper = (function(_this) {
-        return function(e) {
-        var current_path, path;
-        _this.setCurrentStep(i);
-        path = (function() {
-            switch ({}.toString.call(step.path)) {
-            case "[object Function]":
-              return step.path();
-            case "[object String]":
-              return this._options.basePath + step.path;
-            default:
-              return step.path;
-          }
-        }).call(_this);
-        current_path = document.location.href;
-        if (_this._isRedirect(path, current_path)) {
-          if ({}.toString.call(path) === "[object RegExp]") {
-            _this._redirect(step, path);
-          }
-          else {
-            path = document.location.protocol+'//'+path;
-            _this._redirect(step, path);
-          }
-          return;
-        }
-        if (_this._isOrphan(step)) {
-          if (!step.orphan) {
-            _this._debug("Skip the orphan step " + (_this._current + 1) + ". Orphan option is false and the element doesn't exist or is hidden.");
-            if (skipToPrevious) {
-              _this._showPrevStep();
-            } else {
-              _this._showNextStep();
-            }
-            return;
-          }
-          _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true.");
-        }
-        if (step.title  === "" & step.content  === "") {
-            if (skipToPrevious) {
-              _this._showPrevStep();
-            } else {
-              _this._showNextStep();
-            }
-            return;
-        }
-        if (step.backdrop) {
-          _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0);
-        }
-        _this._scrollIntoView(step.element, function() {
-            if (_this.getCurrentStep() !== i) {
-              return;
-            }
-          if ((step.element != null) && step.backdrop) {
-            _this._showOverlayElement(step.element);
-          }
-          _this._showPopover(step, i);
-          if (step.onShown != null) {
-            step.onShown(_this);
-          }
-          return _this._debug("Step " + (_this._current + 1) + " of " + _this._options.steps.length);
-        });
-        if (step.duration) {
-          return _this.resume();
-        }
-      };
-      })(this);
-      this._callOnPromiseDone(promise, showStepHelper);
-      return promise;
-    };
-
-    Tour.prototype.getCurrentStep = function() {
-      return this._current;
-    };
-
-    Tour.prototype.setCurrentStep = function(value) {
-      if (value != null) {
-        this._current = value;
-        this._setState("current_step", value);
-      } else {
-        this._current = this._getState("current_step");
-        this._current = this._current === null ? null : parseInt(this._current, 10);
-      }
-      return this;
-    };
-
-    Tour.prototype._setState = function(key, value) {
-      var e, keyName;
-      if (this._options.storage) {
-        keyName = "" + this._options.name + "_" + key;
-        try {
-          this._options.storage.setItem(keyName, value);
-        } catch (_error) {
-          e = _error;
-          if (e.code === DOMException.QUOTA_EXCEEDED_ERR) {
-            this.debug("LocalStorage quota exceeded. State storage failed.");
-          }
-        }
-        return this._options.afterSetState(keyName, value);
-      } else {
-        if (this._state == null) {
-          this._state = {};
-        }
-        return this._state[key] = value;
-      }
-    };
-
-    Tour.prototype._removeState = function(key) {
-      var keyName;
-      if (this._options.storage) {
-        keyName = "" + this._options.name + "_" + key;
-        this._options.storage.removeItem(keyName);
-        return this._options.afterRemoveState(keyName);
-      } else {
-        if (this._state != null) {
-          return delete this._state[key];
-        }
-      }
-    };
-
-    Tour.prototype._getState = function(key) {
-      var keyName, value;
-      if (this._options.storage) {
-        keyName = "" + this._options.name + "_" + key;
-        value = this._options.storage.getItem(keyName);
-      } else {
-        if (this._state != null) {
-          value = this._state[key];
-        }
-      }
-      if (value === void 0 || value === "null") {
-        value = null;
-      }
-      this._options.afterGetState(key, value);
-      return value;
-    };
-
-    Tour.prototype._showNextStep = function() {
-      var promise, showNextStepHelper, step;
-      step = this.getStep(this._current);
-      showNextStepHelper = (function(_this) {
-        return function(e) {
-        return _this.showStep(step.next);
-      };
-      })(this);
-      promise = this._makePromise(step.onNext != null ? step.onNext(this) : void 0);
-      return this._callOnPromiseDone(promise, showNextStepHelper);
-    };
-
-    Tour.prototype._showPrevStep = function() {
-      var promise, showPrevStepHelper, step;
-      step = this.getStep(this._current);
-      showPrevStepHelper = (function(_this) {
-        return function(e) {
-        return _this.showStep(step.prev);
-      };
-      })(this);
-      promise = this._makePromise(step.onPrev != null ? step.onPrev(this) : void 0);
-      return this._callOnPromiseDone(promise, showPrevStepHelper);
-    };
-
-    Tour.prototype._debug = function(text) {
-      if (this._options.debug) {
-        return window.console.log("Bootstrap Tour '" + this._options.name + "' | " + text);
-      }
-    };
-
-    Tour.prototype._isRedirect = function(path, currentPath) {
-      return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path !== currentPath.replace("http://", "").replace("https://", "")));
-    };
-
-    Tour.prototype._redirect = function(step, path) {
-      if ($.isFunction(step.redirect)) {
-        return step.redirect.call(this, path);
-      } else if (step.redirect === true) {
-        this._debug("Redirect to " + path);
-        return document.location.href = path;
-      }
-    };
-
-    Tour.prototype._isOrphan = function(step) {
-      return (step.element == null) || !$(step.element).length || $(step.element).is(":hidden") && ($(step.element)[0].namespaceURI !== "http://www.w3.org/2000/svg");
-    };
-
-    Tour.prototype._isLast = function() {
-      return this._current < this._options.steps.length - 1;
-    };
-
-    Tour.prototype._showPopover = function(step, i) {
-      var $element, $navigation, $template, $tip, isOrphan, options;
-      $(".tour-" + this._options.name).remove();
-      options = $.extend({}, this._options);
-      $template = $.isFunction(step.template) ? $(step.template(i, step)) : $(step.template);
-      $navigation = $template.find(".popover-navigation");
-      isOrphan = this._isOrphan(step);
-      if (isOrphan) {
-        step.element = "body";
-        step.placement = "top";
-        $template = $template.addClass("orphan");
-      }
-      $element = $(step.element);
-      $template.addClass("tour-" + this._options.name + " tour-" + this._options.name + "-" + i);
-      $element.addClass("tour-" + this._options.name + "-element tour-" + this._options.name + "-" + i + "-element");
-      if (step.options) {
-        $.extend(options, step.options);
-      }
-      if (step.reflex && !isOrphan) {
-        $element.css("cursor", "pointer").on("click.tour-" + this._options.name, (function(_this) {
-          return function() {
-          if (_this._isLast()) {
-            return _this.next();
-          } else {
-            return _this.end();
-          }
-          };
-        })(this));
-      }
-      if (step.prev < 0) {
-        $navigation.find("[data-role='prev']").addClass("disabled");
-      }
-      if (step.next < 0) {
-        $navigation.find("[data-role='next']").addClass("disabled");
-      }
-      if (!step.duration) {
-        $navigation.find("[data-role='pause-resume']").remove();
-      }
-      step.template = $template.clone().wrap("<div>").parent().html();
-      $element.popover({
-        placement: step.placement,
-        trigger: "manual",
-        title: step.title,
-        content: step.content,
-        html: true,
-        animation: step.animation,
-        container: step.container,
-        template: step.template,
-        selector: step.element
-      }).popover("show");
-      $tip = $element.data("bs.popover") ? $element.data("bs.popover").tip() : $element.data("popover").tip();
-      $tip.attr("id", step.id);
-      this._reposition($tip, step);
-      if (isOrphan) {
-        return this._center($tip);
-      }
-    };
-
-    Tour.prototype._reposition = function($tip, step) {
-      var offsetBottom, offsetHeight, offsetRight, offsetWidth, originalLeft, originalTop, tipOffset;
-      offsetWidth = $tip[0].offsetWidth;
-      offsetHeight = $tip[0].offsetHeight;
-      tipOffset = $tip.offset();
-      originalLeft = tipOffset.left;
-      originalTop = tipOffset.top;
-      offsetBottom = $(document).outerHeight() - tipOffset.top - $tip.outerHeight();
-      if (offsetBottom < 0) {
-        tipOffset.top = tipOffset.top + offsetBottom;
-      }
-      offsetRight = $("html").outerWidth() - tipOffset.left - $tip.outerWidth();
-      if (offsetRight < 0) {
-        tipOffset.left = tipOffset.left + offsetRight;
-      }
-      if (tipOffset.top < 0) {
-        tipOffset.top = 0;
-      }
-      if (tipOffset.left < 0) {
-        tipOffset.left = 0;
-      }
-      $tip.offset(tipOffset);
-      if (step.placement === "bottom" || step.placement === "top") {
-        if (originalLeft !== tipOffset.left) {
-          return this._replaceArrow($tip, (tipOffset.left - originalLeft) * 2, offsetWidth, "left");
-        }
-      } else {
-        if (originalTop !== tipOffset.top) {
-          return this._replaceArrow($tip, (tipOffset.top - originalTop) * 2, offsetHeight, "top");
-        }
-      }
-    };
-
-    Tour.prototype._center = function($tip) {
-      return $tip.css("top", $(window).outerHeight() / 2 - $tip.outerHeight() / 2);
-    };
-
-    Tour.prototype._replaceArrow = function($tip, delta, dimension, position) {
-      return $tip.find(".arrow").css(position, delta ? 50 * (1 - delta / dimension) + "%" : "");
-    };
-
-    Tour.prototype._scrollIntoView = function(element, callback) {
-      var $element, $window, counter, offsetTop, scrollTop, windowHeight;
-      $element = $(element);
-      if (!$element.length) {
-        return callback();
-      }
-      $window = $(window);
-      offsetTop = $element.offset().top;
-      windowHeight = $window.height();
-      scrollTop = Math.max(0, offsetTop - (windowHeight / 2));
-      this._debug("Scroll into view. ScrollTop: " + scrollTop + ". Element offset: " + offsetTop + ". Window height: " + windowHeight + ".");
-      counter = 0;
-      return $("body,html").stop(true, true).animate({
-        scrollTop: Math.ceil(scrollTop)
-      }, (function(_this) {
-        return function() {
-        if (++counter === 2) {
-          callback();
-          return _this._debug("Scroll into view. Animation end element offset: " + ($element.offset().top) + ". Window height: " + ($window.height()) + ".");
-        }
-        };
-      })(this));
-    };
-
-    Tour.prototype._onResize = function(callback, timeout) {
-      return $(window).on("resize.tour-" + this._options.name, function() {
-        clearTimeout(timeout);
-        return timeout = setTimeout(callback, 100);
-      });
-    };
-
-    Tour.prototype._initMouseNavigation = function() {
-      var _this;
-      _this = this;
-      return $(document).off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='prev']:not(.disabled)").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='next']:not(.disabled)").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='end']").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='pause-resume']").on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='next']:not(.disabled)", (function(_this) {
-        return function(e) {
-        e.preventDefault();
-        return _this.next();
-        };
-      })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='prev']:not(.disabled)", (function(_this) {
-        return function(e) {
-        e.preventDefault();
-        return _this.prev();
-        };
-      })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='end']", (function(_this) {
-        return function(e) {
-        e.preventDefault();
-        return _this.end();
-        };
-      })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='pause-resume']", function(e) {
-        var $this;
-        e.preventDefault();
-        $this = $(this);
-        $this.text(_this._paused ? $this.data("pause-text") : $this.data("resume-text"));
-        if (_this._paused) {
-          return _this.resume();
-        } else {
-          return _this.pause();
-        }
-      });
-    };
-
-    Tour.prototype._initKeyboardNavigation = function() {
-      if (!this._options.keyboard) {
-        return;
-      }
-      return $(document).on("keyup.tour-" + this._options.name, (function(_this) {
-        return function(e) {
-        if (!e.which) {
-          return;
-        }
-        switch (e.which) {
-          case 39:
-            e.preventDefault();
-            if (_this._isLast()) {
-              return _this.next();
-            } else {
-              return _this.end();
-            }
-            break;
-          case 37:
-            e.preventDefault();
-            if (_this._current > 0) {
-              return _this.prev();
-            }
-            break;
-          case 27:
-            e.preventDefault();
-            return _this.end();
-        }
-        };
-      })(this));
-    };
-
-    Tour.prototype._makePromise = function(result) {
-      if (result && $.isFunction(result.then)) {
-        return result;
-      } else {
-        return null;
-      }
-    };
-
-    Tour.prototype._callOnPromiseDone = function(promise, cb, arg) {
-      if (promise) {
-        return promise.then((function(_this) {
-          return function(e) {
-          return cb.call(_this, arg);
-          };
-        })(this));
-      } else {
-        return cb.call(this, arg);
-      }
-    };
-
-    Tour.prototype._showBackdrop = function(element) {
-      if (this.backdrop.backgroundShown) {
-        return;
-      }
-      this.backdrop = $("<div/>", {
-        "class": "tour-backdrop"
-      });
-      this.backdrop.backgroundShown = true;
-      return $("body").append(this.backdrop);
-    };
-
-    Tour.prototype._hideBackdrop = function() {
-      this._hideOverlayElement();
-      return this._hideBackground();
-    };
-
-    Tour.prototype._hideBackground = function() {
-      if (this.backdrop) {
-      this.backdrop.remove();
-      this.backdrop.overlay = null;
-      return this.backdrop.backgroundShown = false;
-      }
-    };
-
-    Tour.prototype._showOverlayElement = function(element) {
-      var $background, $element, offset;
-      $element = $(element);
-      if (!$element || $element.length === 0 || this.backdrop.overlayElementShown) {
-        return;
-      }
-      this.backdrop.overlayElementShown = true;
-      $background = $("<div/>");
-      offset = $element.offset();
-      offset.top = offset.top;
-      offset.left = offset.left;
-      $background.width($element.innerWidth()).height($element.innerHeight()).addClass("tour-step-background").offset(offset);
-      $element.addClass("tour-step-backdrop");
-      $("body").append($background);
-      this.backdrop.$element = $element;
-      return this.backdrop.$background = $background;
-    };
-
-    Tour.prototype._hideOverlayElement = function() {
-      if (!this.backdrop.overlayElementShown) {
-        return;
-      }
-      this.backdrop.$element.removeClass("tour-step-backdrop");
-      this.backdrop.$background.remove();
-      this.backdrop.$element = null;
-      this.backdrop.$background = null;
-      return this.backdrop.overlayElementShown = false;
-    };
-
-    Tour.prototype._clearTimer = function() {
-      window.clearTimeout(this._timer);
-      this._timer = null;
-      return this._duration = null;
-    };
-
-    return Tour;
-
-  })();
-  return window.Tour = Tour;
-})(jQuery, window);
+/* ========================================================================
+ * bootstrap-tour - v0.10.1
+ * http://bootstraptour.com
+ * ========================================================================
+ * Copyright 2012-2013 Ulrich Sossou
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+/* ========================================================================
+ * Bootstrap: tooltip.js v3.2.0
+ * http://getbootstrap.com/javascript/#tooltip
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // TOOLTIP PUBLIC CLASS DEFINITION
+  // ===============================
+
+  var Tooltip = function (element, options) {
+    this.type       =
+    this.options    =
+    this.enabled    =
+    this.timeout    =
+    this.hoverState =
+    this.$element   = null
+
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.VERSION  = '3.2.0'
+
+  Tooltip.DEFAULTS = {
+    animation: true,
+    placement: 'top',
+    selector: false,
+    template: '<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
+    trigger: 'hover focus',
+    title: '',
+    delay: 0,
+    html: false,
+    container: false,
+    viewport: {
+      selector: 'body',
+      padding: 0
+    }
+  }
+
+  Tooltip.prototype.init = function (type, element, options) {
+    this.enabled   = true
+    this.type      = type
+    this.$element  = $(element)
+    this.options   = this.getOptions(options)
+    this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport)
+
+    var triggers = this.options.trigger.split(' ')
+
+    for (var i = triggers.length; i--;) {
+      var trigger = triggers[i]
+
+      if (trigger == 'click') {
+        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+      } else if (trigger != 'manual') {
+        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
+        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
+
+        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+      }
+    }
+
+    this.options.selector ?
+      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+      this.fixTitle()
+  }
+
+  Tooltip.prototype.getDefaults = function () {
+    return Tooltip.DEFAULTS
+  }
+
+  Tooltip.prototype.getOptions = function (options) {
+    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
+
+    if (options.delay && typeof options.delay == 'number') {
+      options.delay = {
+        show: options.delay,
+        hide: options.delay
+      }
+    }
+
+    return options
+  }
+
+  Tooltip.prototype.getDelegateOptions = function () {
+    var options  = {}
+    var defaults = this.getDefaults()
+
+    this._options && $.each(this._options, function (key, value) {
+      if (defaults[key] != value) options[key] = value
+    })
+
+    return options
+  }
+
+  Tooltip.prototype.enter = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget).data('bs.' + this.type)
+
+    if (!self) {
+      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
+      $(obj.currentTarget).data('bs.' + this.type, self)
+    }
+
+    clearTimeout(self.timeout)
+
+    self.hoverState = 'in'
+
+    if (!self.options.delay || !self.options.delay.show) return self.show()
+
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'in') self.show()
+    }, self.options.delay.show)
+  }
+
+  Tooltip.prototype.leave = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget).data('bs.' + this.type)
+
+    if (!self) {
+      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
+      $(obj.currentTarget).data('bs.' + this.type, self)
+    }
+
+    clearTimeout(self.timeout)
+
+    self.hoverState = 'out'
+
+    if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'out') self.hide()
+    }, self.options.delay.hide)
+  }
+
+  Tooltip.prototype.show = function () {
+    var e = $.Event('show.bs.' + this.type)
+
+    if (this.hasContent() && this.enabled) {
+      this.$element.trigger(e)
+
+      var inDom = $.contains(document.documentElement, this.$element[0])
+      if (e.isDefaultPrevented() || !inDom) return
+      var that = this
+
+      var $tip = this.tip()
+
+      var tipId = this.getUID(this.type)
+
+      this.setContent()
+      $tip.attr('id', tipId)
+      this.$element.attr('aria-describedby', tipId)
+
+      if (this.options.animation) $tip.addClass('fade')
+
+      var placement = typeof this.options.placement == 'function' ?
+        this.options.placement.call(this, $tip[0], this.$element[0]) :
+        this.options.placement
+
+      var autoToken = /\s?auto?\s?/i
+      var autoPlace = autoToken.test(placement)
+      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
+
+      $tip
+        .detach()
+        .css({ top: 0, left: 0, display: 'block' })
+        .addClass(placement)
+        .data('bs.' + this.type, this)
+
+      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+      var pos          = this.getPosition()
+      var actualWidth  = $tip[0].offsetWidth
+      var actualHeight = $tip[0].offsetHeight
+
+      if (autoPlace) {
+        var orgPlacement = placement
+        var $parent      = this.$element.parent()
+        var parentDim    = this.getPosition($parent)
+
+        placement = placement == 'bottom' && pos.top   + pos.height       + actualHeight - parentDim.scroll > parentDim.height ? 'top'    :
+                    placement == 'top'    && pos.top   - parentDim.scroll - actualHeight < 0                                   ? 'bottom' :
+                    placement == 'right'  && pos.right + actualWidth      > parentDim.width                                    ? 'left'   :
+                    placement == 'left'   && pos.left  - actualWidth      < parentDim.left                                     ? 'right'  :
+                    placement
+
+        $tip
+          .removeClass(orgPlacement)
+          .addClass(placement)
+      }
+
+      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
+
+      this.applyPlacement(calculatedOffset, placement)
+
+      var complete = function () {
+        that.$element.trigger('shown.bs.' + that.type)
+        that.hoverState = null
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        $tip
+          .one('bsTransitionEnd', complete)
+          .emulateTransitionEnd(150) :
+        complete()
+    }
+  }
+
+  Tooltip.prototype.applyPlacement = function (offset, placement) {
+    var $tip   = this.tip()
+    var width  = $tip[0].offsetWidth
+    var height = $tip[0].offsetHeight
+
+    // manually read margins because getBoundingClientRect includes difference
+    var marginTop = parseInt($tip.css('margin-top'), 10)
+    var marginLeft = parseInt($tip.css('margin-left'), 10)
+
+    // we must check for NaN for ie 8/9
+    if (isNaN(marginTop))  marginTop  = 0
+    if (isNaN(marginLeft)) marginLeft = 0
+
+    offset.top  = offset.top  + marginTop
+    offset.left = offset.left + marginLeft
+
+    // $.fn.offset doesn't round pixel values
+    // so we use setOffset directly with our own function B-0
+    $.offset.setOffset($tip[0], $.extend({
+      using: function (props) {
+        $tip.css({
+          top: Math.round(props.top),
+          left: Math.round(props.left)
+        })
+      }
+    }, offset), 0)
+
+    $tip.addClass('in')
+
+    // check to see if placing tip in new offset caused the tip to resize itself
+    var actualWidth  = $tip[0].offsetWidth
+    var actualHeight = $tip[0].offsetHeight
+
+    if (placement == 'top' && actualHeight != height) {
+      offset.top = offset.top + height - actualHeight
+    }
+
+    var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight)
+
+    if (delta.left) offset.left += delta.left
+    else offset.top += delta.top
+
+    var arrowDelta          = delta.left ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
+    var arrowPosition       = delta.left ? 'left'        : 'top'
+    var arrowOffsetPosition = delta.left ? 'offsetWidth' : 'offsetHeight'
+
+    $tip.offset(offset)
+    this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], arrowPosition)
+  }
+
+  Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
+    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
+  }
+
+  Tooltip.prototype.setContent = function () {
+    var $tip  = this.tip()
+    var title = this.getTitle()
+
+    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+    $tip.removeClass('fade in top bottom left right')
+  }
+
+  Tooltip.prototype.hide = function () {
+    var that = this
+    var $tip = this.tip()
+    var e    = $.Event('hide.bs.' + this.type)
+
+    this.$element.removeAttr('aria-describedby')
+
+    function complete() {
+      if (that.hoverState != 'in') $tip.detach()
+      that.$element.trigger('hidden.bs.' + that.type)
+    }
+
+    this.$element.trigger(e)
+
+    if (e.isDefaultPrevented()) return
+
+    $tip.removeClass('in')
+
+    $.support.transition && this.$tip.hasClass('fade') ?
+      $tip
+        .one('bsTransitionEnd', complete)
+        .emulateTransitionEnd(150) :
+      complete()
+
+    this.hoverState = null
+
+    return this
+  }
+
+  Tooltip.prototype.fixTitle = function () {
+    var $e = this.$element
+    if ($e.attr('title') || typeof ($e.attr('data-original-title')) != 'string') {
+      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+    }
+  }
+
+  Tooltip.prototype.hasContent = function () {
+    return this.getTitle()
+  }
+
+  Tooltip.prototype.getPosition = function ($element) {
+    $element   = $element || this.$element
+    var el     = $element[0]
+    var isBody = el.tagName == 'BODY'
+    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : null, {
+      scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop(),
+      width:  isBody ? $(window).width()  : $element.outerWidth(),
+      height: isBody ? $(window).height() : $element.outerHeight()
+    }, isBody ? { top: 0, left: 0 } : $element.offset())
+  }
+
+  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
+    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
+        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
+
+  }
+
+  Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) {
+    var delta = { top: 0, left: 0 }
+    if (!this.$viewport) return delta
+
+    var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
+    var viewportDimensions = this.getPosition(this.$viewport)
+
+    if (/right|left/.test(placement)) {
+      var topEdgeOffset    = pos.top - viewportPadding - viewportDimensions.scroll
+      var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight
+      if (topEdgeOffset < viewportDimensions.top) { // top overflow
+        delta.top = viewportDimensions.top - topEdgeOffset
+      } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow
+        delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset
+      }
+    } else {
+      var leftEdgeOffset  = pos.left - viewportPadding
+      var rightEdgeOffset = pos.left + viewportPadding + actualWidth
+      if (leftEdgeOffset < viewportDimensions.left) { // left overflow
+        delta.left = viewportDimensions.left - leftEdgeOffset
+      } else if (rightEdgeOffset > viewportDimensions.width) { // right overflow
+        delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
+      }
+    }
+
+    return delta
+  }
+
+  Tooltip.prototype.getTitle = function () {
+    var title
+    var $e = this.$element
+    var o  = this.options
+
+    title = $e.attr('data-original-title')
+      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+    return title
+  }
+
+  Tooltip.prototype.getUID = function (prefix) {
+    do prefix += ~~(Math.random() * 1000000)
+    while (document.getElementById(prefix))
+    return prefix
+  }
+
+  Tooltip.prototype.tip = function () {
+    return (this.$tip = this.$tip || $(this.options.template))
+  }
+
+  Tooltip.prototype.arrow = function () {
+    return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
+  }
+
+  Tooltip.prototype.validate = function () {
+    if (!this.$element[0].parentNode) {
+      this.hide()
+      this.$element = null
+      this.options  = null
+    }
+  }
+
+  Tooltip.prototype.enable = function () {
+    this.enabled = true
+  }
+
+  Tooltip.prototype.disable = function () {
+    this.enabled = false
+  }
+
+  Tooltip.prototype.toggleEnabled = function () {
+    this.enabled = !this.enabled
+  }
+
+  Tooltip.prototype.toggle = function (e) {
+    var self = this
+    if (e) {
+      self = $(e.currentTarget).data('bs.' + this.type)
+      if (!self) {
+        self = new this.constructor(e.currentTarget, this.getDelegateOptions())
+        $(e.currentTarget).data('bs.' + this.type, self)
+      }
+    }
+
+    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
+  }
+
+  Tooltip.prototype.destroy = function () {
+    clearTimeout(this.timeout)
+    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
+  }
+
+
+  // TOOLTIP PLUGIN DEFINITION
+  // =========================
+
+  function Plugin(option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.tooltip')
+      var options = typeof option == 'object' && option
+
+      if (!data && option == 'destroy') return
+      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  var old = $.fn.tooltip
+
+  $.fn.tooltip             = Plugin
+  $.fn.tooltip.Constructor = Tooltip
+
+
+  // TOOLTIP NO CONFLICT
+  // ===================
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  }
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: popover.js v3.2.0
+ * http://getbootstrap.com/javascript/#popovers
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // POPOVER PUBLIC CLASS DEFINITION
+  // ===============================
+
+  var Popover = function (element, options) {
+    this.init('popover', element, options)
+  }
+
+  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
+
+  Popover.VERSION  = '3.2.0'
+
+  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
+    placement: 'right',
+    trigger: 'click',
+    content: '',
+    template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
+
+
+  // NOTE: POPOVER EXTENDS tooltip.js
+  // ================================
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
+
+  Popover.prototype.constructor = Popover
+
+  Popover.prototype.getDefaults = function () {
+    return Popover.DEFAULTS
+  }
+
+  Popover.prototype.setContent = function () {
+    var $tip    = this.tip()
+    var title   = this.getTitle()
+    var content = this.getContent()
+
+    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+    $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events
+      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
+    ](content)
+
+    $tip.removeClass('fade top bottom left right in')
+
+    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+    // this manually by checking the contents.
+    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
+  }
+
+  Popover.prototype.hasContent = function () {
+    return this.getTitle() || this.getContent()
+  }
+
+  Popover.prototype.getContent = function () {
+    var $e = this.$element
+    var o  = this.options
+
+    return $e.attr('data-content')
+      || (typeof o.content == 'function' ?
+            o.content.call($e[0]) :
+            o.content)
+  }
+
+  Popover.prototype.arrow = function () {
+    return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
+  }
+
+  Popover.prototype.tip = function () {
+    if (!this.$tip) this.$tip = $(this.options.template)
+    return this.$tip
+  }
+
+
+  // POPOVER PLUGIN DEFINITION
+  // =========================
+
+  function Plugin(option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.popover')
+      var options = typeof option == 'object' && option
+
+      if (!data && option == 'destroy') return
+      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  var old = $.fn.popover
+
+  $.fn.popover             = Plugin
+  $.fn.popover.Constructor = Popover
+
+
+  // POPOVER NO CONFLICT
+  // ===================
+
+  $.fn.popover.noConflict = function () {
+    $.fn.popover = old
+    return this
+  }
+
+}(jQuery);
+
+(function($, window) {
+  var Tour, document;
+  document = window.document;
+  Tour = (function() {
+    function Tour(options) {
+      var storage;
+      try {
+        storage = window.localStorage;
+      } catch (_error) {
+        storage = false;
+      }
+      this._options = $.extend({
+        name: 'tour',
+        steps: [],
+        container: 'body',
+        autoscroll: true,
+        keyboard: true,
+        storage: storage,
+        debug: false,
+        backdrop: false,
+        backdropPadding: 0,
+        redirect: true,
+        orphan: false,
+        duration: false,
+        delay: false,
+        basePath: '',
+        template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
+        afterSetState: function(key, value) {},
+        afterGetState: function(key, value) {},
+        afterRemoveState: function(key) {},
+        onStart: function(tour) {},
+        onEnd: function(tour) {},
+        onShow: function(tour) {},
+        onShown: function(tour) {},
+        onHide: function(tour) {},
+        onHidden: function(tour) {},
+        onNext: function(tour) {},
+        onPrev: function(tour) {},
+        onPause: function(tour, duration) {},
+        onResume: function(tour, duration) {}
+      }, options);
+      this._force = false;
+      this._inited = false;
+      this.backdrop = {
+        overlay: null,
+        $element: null,
+        $background: null,
+        backgroundShown: false,
+        overlayElementShown: false
+      };
+      this;
+    }
+
+    Tour.prototype.addSteps = function(steps) {
+      var step, _i, _len;
+      for (_i = 0, _len = steps.length; _i < _len; _i++) {
+        step = steps[_i];
+        this.addStep(step);
+      }
+      return this;
+    };
+
+    Tour.prototype.addStep = function(step) {
+      this._options.steps.push(step);
+      return this;
+    };
+
+    Tour.prototype.getStep = function(i) {
+      if (this._options.steps[i] != null) {
+        return $.extend({
+          id: "step-" + i,
+          path: '',
+          placement: 'right',
+          title: '',
+          content: '<p></p>',
+          next: i === this._options.steps.length - 1 ? -1 : i + 1,
+          prev: i - 1,
+          animation: true,
+          container: this._options.container,
+          autoscroll: this._options.autoscroll,
+          backdrop: this._options.backdrop,
+          backdropPadding: this._options.backdropPadding,
+          redirect: this._options.redirect,
+          orphan: this._options.orphan,
+          duration: this._options.duration,
+          delay: this._options.delay,
+          template: this._options.template,
+          onShow: this._options.onShow,
+          onShown: this._options.onShown,
+          onHide: this._options.onHide,
+          onHidden: this._options.onHidden,
+          onNext: this._options.onNext,
+          onPrev: this._options.onPrev,
+          onPause: this._options.onPause,
+          onResume: this._options.onResume
+        }, this._options.steps[i]);
+      }
+    };
+
+    Tour.prototype.init = function(force) {
+      this._force = force;
+      if (this.ended()) {
+        this._debug('Tour ended, init prevented.');
+        return this;
+      }
+      this.setCurrentStep();
+      this._initMouseNavigation();
+      this._initKeyboardNavigation();
+      this._onResize((function(_this) {
+        return function() {
+          return _this.showStep(_this._current);
+        };
+      })(this));
+      if (this._current !== null) {
+        this.showStep(this._current);
+      }
+      this._inited = true;
+      return this;
+    };
+
+    Tour.prototype.start = function(force) {
+      var promise;
+      if (force == null) {
+        force = false;
+      }
+      if (!this._inited) {
+        this.init(force);
+      }
+      if (this._current === null) {
+        promise = this._makePromise(this._options.onStart != null ? this._options.onStart(this) : void 0);
+        this._callOnPromiseDone(promise, this.showStep, 0);
+      }
+      return this;
+    };
+
+    Tour.prototype.next = function() {
+      var promise;
+      promise = this.hideStep(this._current);
+      return this._callOnPromiseDone(promise, this._showNextStep);
+    };
+
+    Tour.prototype.prev = function() {
+      var promise;
+      promise = this.hideStep(this._current);
+      return this._callOnPromiseDone(promise, this._showPrevStep);
+    };
+
+    Tour.prototype.goTo = function(i) {
+      var promise;
+      promise = this.hideStep(this._current);
+      return this._callOnPromiseDone(promise, this.showStep, i);
+    };
+
+    Tour.prototype.end = function() {
+      var endHelper, promise;
+      endHelper = (function(_this) {
+        return function(e) {
+          $(document).off("click.tour-" + _this._options.name);
+          $(document).off("keyup.tour-" + _this._options.name);
+          $(window).off("resize.tour-" + _this._options.name);
+          _this._setState('end', 'yes');
+          _this._inited = false;
+          _this._force = false;
+          _this._clearTimer();
+          if (_this._options.onEnd != null) {
+            return _this._options.onEnd(_this);
+          }
+        };
+      })(this);
+      promise = this.hideStep(this._current);
+      return this._callOnPromiseDone(promise, endHelper);
+    };
+
+    Tour.prototype.ended = function() {
+      return !this._force && !!this._getState('end');
+    };
+
+    Tour.prototype.restart = function() {
+      this._removeState('current_step');
+      this._removeState('end');
+      return this.start();
+    };
+
+    Tour.prototype.pause = function() {
+      var step;
+      step = this.getStep(this._current);
+      if (!(step && step.duration)) {
+        return this;
+      }
+      this._paused = true;
+      this._duration -= new Date().getTime() - this._start;
+      window.clearTimeout(this._timer);
+      this._debug("Paused/Stopped step " + (this._current + 1) + " timer (" + this._duration + " remaining).");
+      if (step.onPause != null) {
+        return step.onPause(this, this._duration);
+      }
+    };
+
+    Tour.prototype.resume = function() {
+      var step;
+      step = this.getStep(this._current);
+      if (!(step && step.duration)) {
+        return this;
+      }
+      this._paused = false;
+      this._start = new Date().getTime();
+      this._duration = this._duration || step.duration;
+      this._timer = window.setTimeout((function(_this) {
+        return function() {
+          if (_this._isLast()) {
+            return _this.next();
+          } else {
+            return _this.end();
+          }
+        };
+      })(this), this._duration);
+      this._debug("Started step " + (this._current + 1) + " timer with duration " + this._duration);
+      if ((step.onResume != null) && this._duration !== step.duration) {
+        return step.onResume(this, this._duration);
+      }
+    };
+
+    Tour.prototype.hideStep = function(i) {
+      var hideStepHelper, promise, step;
+      step = this.getStep(i);
+      if (!step) {
+        return;
+      }
+      this._clearTimer();
+      promise = this._makePromise(step.onHide != null ? step.onHide(this, i) : void 0);
+      hideStepHelper = (function(_this) {
+        return function(e) {
+          var $element;
+          $element = $(step.element);
+          if (!($element.data('bs.popover') || $element.data('popover'))) {
+            $element = $('body');
+          }
+          $element.popover('destroy').removeClass("tour-" + _this._options.name + "-element tour-" + _this._options.name + "-" + i + "-element");
+          if (step.reflex) {
+            $element.removeClass('tour-step-element-reflex').off("" + (_this._reflexEvent(step.reflex)) + ".tour-" + _this._options.name);
+          }
+          if (step.backdrop) {
+            _this._hideBackdrop();
+          }
+          if (step.onHidden != null) {
+            return step.onHidden(_this);
+          }
+        };
+      })(this);
+      this._callOnPromiseDone(promise, hideStepHelper);
+      return promise;
+    };
+
+    Tour.prototype.showStep = function(i) {
+      var promise, showStepHelper, skipToPrevious, step;
+      if (this.ended()) {
+        this._debug('Tour ended, showStep prevented.');
+        return this;
+      }
+      step = this.getStep(i);
+      if (!step) {
+        return;
+      }
+      skipToPrevious = i < this._current;
+      promise = this._makePromise(step.onShow != null ? step.onShow(this, i) : void 0);
+      showStepHelper = (function(_this) {
+        return function(e) {
+          var current_path, path, showPopoverAndOverlay;
+          _this.setCurrentStep(i);
+          path = (function() {
+            switch ({}.toString.call(step.path)) {
+              case '[object Function]':
+                return step.path();
+              case '[object String]':
+                return this._options.basePath + step.path;
+              default:
+                return step.path;
+            }
+          }).call(_this);
+          current_path = document.location.href;
+          if (_this._isRedirect(path, current_path)) {
+            if ({}.toString.call(path) === "[object RegExp]") {
+             _this._redirect(step, path);
+          }
+          else {
+            path = document.location.protocol+'//'+path;
+            _this._redirect(step, path);
+          }
+            return;
+          }
+          if (_this._isOrphan(step)) {
+            if (!step.orphan) {
+              _this._debug("Skip the orphan step " + (_this._current + 1) + ".\nOrphan option is false and the element does not exist or is hidden.");
+              if (skipToPrevious) {
+                _this._showPrevStep();
+              } else {
+                _this._showNextStep();
+              }
+              return;
+            }
+            _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true.");
+          }
+        if (step.title  === "" & step.content  === "") {
+            if (skipToPrevious) {
+              _this._showPrevStep();
+            } else {
+              _this._showNextStep();
+            }
+            return;
+        }
+          if (step.backdrop) {
+            _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0);
+          }
+          showPopoverAndOverlay = function() {
+            if (_this.getCurrentStep() !== i) {
+              return;
+            }
+            if ((step.element != null) && step.backdrop) {
+              _this._showOverlayElement(step);
+            }
+            _this._showPopover(step, i);
+            if (step.onShown != null) {
+              step.onShown(_this);
+            }
+            return _this._debug("Step " + (_this._current + 1) + " of " + _this._options.steps.length);
+          };
+          if (step.autoscroll) {
+            _this._scrollIntoView(step.element, showPopoverAndOverlay);
+          } else {
+            showPopoverAndOverlay();
+          }
+          if (step.duration) {
+            return _this.resume();
+          }
+        };
+      })(this);
+      if (step.delay) {
+        this._debug("Wait " + step.delay + " milliseconds to show the step " + (this._current + 1));
+        window.setTimeout((function(_this) {
+          return function() {
+            return _this._callOnPromiseDone(promise, showStepHelper);
+          };
+        })(this), step.delay);
+      } else {
+        this._callOnPromiseDone(promise, showStepHelper);
+      }
+      return promise;
+    };
+
+    Tour.prototype.getCurrentStep = function() {
+      return this._current;
+    };
+
+    Tour.prototype.setCurrentStep = function(value) {
+      if (value != null) {
+        this._current = value;
+        this._setState('current_step', value);
+      } else {
+        this._current = this._getState('current_step');
+        this._current = this._current === null ? null : parseInt(this._current, 10);
+      }
+      return this;
+    };
+
+    Tour.prototype._setState = function(key, value) {
+      var e, keyName;
+      if (this._options.storage) {
+        keyName = "" + this._options.name + "_" + key;
+        try {
+          this._options.storage.setItem(keyName, value);
+        } catch (_error) {
+          e = _error;
+          if (e.code === DOMException.QUOTA_EXCEEDED_ERR) {
+            this._debug('LocalStorage quota exceeded. State storage failed.');
+          }
+        }
+        return this._options.afterSetState(keyName, value);
+      } else {
+        if (this._state == null) {
+          this._state = {};
+        }
+        return this._state[key] = value;
+      }
+    };
+
+    Tour.prototype._removeState = function(key) {
+      var keyName;
+      if (this._options.storage) {
+        keyName = "" + this._options.name + "_" + key;
+        this._options.storage.removeItem(keyName);
+        return this._options.afterRemoveState(keyName);
+      } else {
+        if (this._state != null) {
+          return delete this._state[key];
+        }
+      }
+    };
+
+    Tour.prototype._getState = function(key) {
+      var keyName, value;
+      if (this._options.storage) {
+        keyName = "" + this._options.name + "_" + key;
+        value = this._options.storage.getItem(keyName);
+      } else {
+        if (this._state != null) {
+          value = this._state[key];
+        }
+      }
+      if (value === void 0 || value === 'null') {
+        value = null;
+      }
+      this._options.afterGetState(key, value);
+      return value;
+    };
+
+    Tour.prototype._showNextStep = function() {
+      var promise, showNextStepHelper, step;
+      step = this.getStep(this._current);
+      showNextStepHelper = (function(_this) {
+        return function(e) {
+          return _this.showStep(step.next);
+        };
+      })(this);
+      promise = this._makePromise(step.onNext != null ? step.onNext(this) : void 0);
+      return this._callOnPromiseDone(promise, showNextStepHelper);
+    };
+
+    Tour.prototype._showPrevStep = function() {
+      var promise, showPrevStepHelper, step;
+      step = this.getStep(this._current);
+      showPrevStepHelper = (function(_this) {
+        return function(e) {
+          return _this.showStep(step.prev);
+        };
+      })(this);
+      promise = this._makePromise(step.onPrev != null ? step.onPrev(this) : void 0);
+      return this._callOnPromiseDone(promise, showPrevStepHelper);
+    };
+
+    Tour.prototype._debug = function(text) {
+      if (this._options.debug) {
+        return window.console.log("Bootstrap Tour '" + this._options.name + "' | " + text);
+      }
+    };
+
+    Tour.prototype._isRedirect = function(path, currentPath) {
+      return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path !== currentPath.replace("http://", "").replace("https://", "")));
+    };
+
+    Tour.prototype._redirect = function(step, path) {
+      if ($.isFunction(step.redirect)) {
+        return step.redirect.call(this, path);
+      } else if (step.redirect === true) {
+        this._debug("Redirect to " + path);
+        return document.location.href = path;
+      }
+    };
+
+    Tour.prototype._isOrphan = function(step) {
+      return (step.element == null) || !$(step.element).length || $(step.element).is(':hidden') && ($(step.element)[0].namespaceURI !== 'http://www.w3.org/2000/svg');
+    };
+
+    Tour.prototype._isLast = function() {
+      return this._current < this._options.steps.length - 1;
+    };
+
+    Tour.prototype._showPopover = function(step, i) {
+      var $element, $tip, isOrphan, options;
+      $(".tour-" + this._options.name).remove();
+      options = $.extend({}, this._options);
+      isOrphan = this._isOrphan(step);
+      step.template = this._template(step, i);
+      if (isOrphan) {
+        step.element = 'body';
+        step.placement = 'top';
+      }
+      $element = $(step.element);
+      $element.addClass("tour-" + this._options.name + "-element tour-" + this._options.name + "-" + i + "-element");
+      if (step.options) {
+        $.extend(options, step.options);
+      }
+      if (step.reflex && !isOrphan) {
+        $element.addClass('tour-step-element-reflex');
+        $element.off("" + (this._reflexEvent(step.reflex)) + ".tour-" + this._options.name);
+        $element.on("" + (this._reflexEvent(step.reflex)) + ".tour-" + this._options.name, (function(_this) {
+          return function() {
+            if (_this._isLast()) {
+              return _this.next();
+            } else {
+              return _this.end();
+            }
+          };
+        })(this));
+      }
+      $element.popover({
+        placement: step.placement,
+        trigger: 'manual',
+        title: step.title,
+        content: step.content,
+        html: true,
+        animation: step.animation,
+        container: step.container,
+        template: step.template,
+        selector: step.element
+      }).popover('show');
+      $tip = $element.data('bs.popover') ? $element.data('bs.popover').tip() : $element.data('popover').tip();
+      $tip.attr('id', step.id);
+      this._reposition($tip, step);
+      if (isOrphan) {
+        return this._center($tip);
+      }
+    };
+
+    Tour.prototype._template = function(step, i) {
+      var $navigation, $next, $prev, $resume, $template;
+      $template = $.isFunction(step.template) ? $(step.template(i, step)) : $(step.template);
+      $navigation = $template.find('.popover-navigation');
+      $prev = $navigation.find('[data-role="prev"]');
+      $next = $navigation.find('[data-role="next"]');
+      $resume = $navigation.find('[data-role="pause-resume"]');
+      if (this._isOrphan(step)) {
+        $template.addClass('orphan');
+      }
+      $template.addClass("tour-" + this._options.name + " tour-" + this._options.name + "-" + i);
+      if (step.prev < 0) {
+        $prev.addClass('disabled');
+      }
+      if (step.next < 0) {
+        $next.addClass('disabled');
+      }
+      if (!step.duration) {
+        $resume.remove();
+      }
+      return $template.clone().wrap('<div>').parent().html();
+    };
+
+    Tour.prototype._reflexEvent = function(reflex) {
+      if ({}.toString.call(reflex) === '[object Boolean]') {
+        return 'click';
+      } else {
+        return reflex;
+      }
+    };
+
+    Tour.prototype._reposition = function($tip, step) {
+      var offsetBottom, offsetHeight, offsetRight, offsetWidth, originalLeft, originalTop, tipOffset;
+      offsetWidth = $tip[0].offsetWidth;
+      offsetHeight = $tip[0].offsetHeight;
+      tipOffset = $tip.offset();
+      originalLeft = tipOffset.left;
+      originalTop = tipOffset.top;
+      offsetBottom = $(document).outerHeight() - tipOffset.top - $tip.outerHeight();
+      if (offsetBottom < 0) {
+        tipOffset.top = tipOffset.top + offsetBottom;
+      }
+      offsetRight = $('html').outerWidth() - tipOffset.left - $tip.outerWidth();
+      if (offsetRight < 0) {
+        tipOffset.left = tipOffset.left + offsetRight;
+      }
+      if (tipOffset.top < 0) {
+        tipOffset.top = 0;
+      }
+      if (tipOffset.left < 0) {
+        tipOffset.left = 0;
+      }
+      $tip.offset(tipOffset);
+      if (step.placement === 'bottom' || step.placement === 'top') {
+        if (originalLeft !== tipOffset.left) {
+          return this._replaceArrow($tip, (tipOffset.left - originalLeft) * 2, offsetWidth, 'left');
+        }
+      } else {
+        if (originalTop !== tipOffset.top) {
+          return this._replaceArrow($tip, (tipOffset.top - originalTop) * 2, offsetHeight, 'top');
+        }
+      }
+    };
+
+    Tour.prototype._center = function($tip) {
+      return $tip.css('top', $(window).outerHeight() / 2 - $tip.outerHeight() / 2);
+    };
+
+    Tour.prototype._replaceArrow = function($tip, delta, dimension, position) {
+      return $tip.find('.arrow').css(position, delta ? 50 * (1 - delta / dimension) + '%' : '');
+    };
+
+    Tour.prototype._scrollIntoView = function(element, callback) {
+      var $element, $window, counter, offsetTop, scrollTop, windowHeight;
+      $element = $(element);
+      if (!$element.length) {
+        return callback();
+      }
+      $window = $(window);
+      offsetTop = $element.offset().top;
+      windowHeight = $window.height();
+      scrollTop = Math.max(0, offsetTop - (windowHeight / 2));
+      this._debug("Scroll into view. ScrollTop: " + scrollTop + ". Element offset: " + offsetTop + ". Window height: " + windowHeight + ".");
+      counter = 0;
+      return $('body, html').stop(true, true).animate({
+        scrollTop: Math.ceil(scrollTop)
+      }, (function(_this) {
+        return function() {
+          if (++counter === 2) {
+            callback();
+            return _this._debug("Scroll into view.\nAnimation end element offset: " + ($element.offset().top) + ".\nWindow height: " + ($window.height()) + ".");
+          }
+        };
+      })(this));
+    };
+
+    Tour.prototype._onResize = function(callback, timeout) {
+      return $(window).on("resize.tour-" + this._options.name, function() {
+        clearTimeout(timeout);
+        return timeout = setTimeout(callback, 100);
+      });
+    };
+
+    Tour.prototype._initMouseNavigation = function() {
+      var _this;
+      _this = this;
+      return $(document).off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='prev']").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='next']").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='end']").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='pause-resume']").on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='next']", (function(_this) {
+        return function(e) {
+          e.preventDefault();
+          return _this.next();
+        };
+      })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='prev']", (function(_this) {
+        return function(e) {
+          e.preventDefault();
+          return _this.prev();
+        };
+      })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='end']", (function(_this) {
+        return function(e) {
+          e.preventDefault();
+          return _this.end();
+        };
+      })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='pause-resume']", function(e) {
+        var $this;
+        e.preventDefault();
+        $this = $(this);
+        $this.text(_this._paused ? $this.data('pause-text') : $this.data('resume-text'));
+        if (_this._paused) {
+          return _this.resume();
+        } else {
+          return _this.pause();
+        }
+      });
+    };
+
+    Tour.prototype._initKeyboardNavigation = function() {
+      if (!this._options.keyboard) {
+        return;
+      }
+      return $(document).on("keyup.tour-" + this._options.name, (function(_this) {
+        return function(e) {
+          if (!e.which) {
+            return;
+          }
+          switch (e.which) {
+            case 39:
+              e.preventDefault();
+              if (_this._isLast()) {
+                return _this.next();
+              } else {
+                return _this.end();
+              }
+              break;
+            case 37:
+              e.preventDefault();
+              if (_this._current > 0) {
+                return _this.prev();
+              }
+              break;
+            case 27:
+              e.preventDefault();
+              return _this.end();
+          }
+        };
+      })(this));
+    };
+
+    Tour.prototype._makePromise = function(result) {
+      if (result && $.isFunction(result.then)) {
+        return result;
+      } else {
+        return null;
+      }
+    };
+
+    Tour.prototype._callOnPromiseDone = function(promise, cb, arg) {
+      if (promise) {
+        return promise.then((function(_this) {
+          return function(e) {
+            return cb.call(_this, arg);
+          };
+        })(this));
+      } else {
+        return cb.call(this, arg);
+      }
+    };
+
+    Tour.prototype._showBackdrop = function(element) {
+      if (this.backdrop.backgroundShown) {
+        return;
+      }
+      this.backdrop = $('<div>', {
+        "class": 'tour-backdrop'
+      });
+      this.backdrop.backgroundShown = true;
+      return $('body').append(this.backdrop);
+    };
+
+    Tour.prototype._hideBackdrop = function() {
+      this._hideOverlayElement();
+      return this._hideBackground();
+    };
+
+    Tour.prototype._hideBackground = function() {
+      if (this.backdrop) {
+        this.backdrop.remove();
+        this.backdrop.overlay = null;
+        return this.backdrop.backgroundShown = false;
+      }
+    };
+
+    Tour.prototype._showOverlayElement = function(step) {
+      var $element, elementData;
+      $element = $(step.element);
+      if (!$element || $element.length === 0 || this.backdrop.overlayElementShown) {
+        return;
+      }
+      this.backdrop.overlayElementShown = true;
+      this.backdrop.$element = $element.addClass('tour-step-backdrop');
+      this.backdrop.$background = $('<div>', {
+        "class": 'tour-step-background'
+      });
+      elementData = {
+        width: $element.innerWidth(),
+        height: $element.innerHeight(),
+        offset: $element.offset()
+      };
+      this.backdrop.$background.appendTo('body');
+      if (step.backdropPadding) {
+        elementData = this._applyBackdropPadding(step.backdropPadding, elementData);
+      }
+      return this.backdrop.$background.width(elementData.width).height(elementData.height).offset(elementData.offset);
+    };
+
+    Tour.prototype._hideOverlayElement = function() {
+      if (!this.backdrop.overlayElementShown) {
+        return;
+      }
+      this.backdrop.$element.removeClass('tour-step-backdrop');
+      this.backdrop.$background.remove();
+      this.backdrop.$element = null;
+      this.backdrop.$background = null;
+      return this.backdrop.overlayElementShown = false;
+    };
+
+    Tour.prototype._applyBackdropPadding = function(padding, data) {
+      if (typeof padding === 'object') {
+        if (padding.top == null) {
+          padding.top = 0;
+        }
+        if (padding.right == null) {
+          padding.right = 0;
+        }
+        if (padding.bottom == null) {
+          padding.bottom = 0;
+        }
+        if (padding.left == null) {
+          padding.left = 0;
+        }
+        data.offset.top = data.offset.top - padding.top;
+        data.offset.left = data.offset.left - padding.left;
+        data.width = data.width + padding.left + padding.right;
+        data.height = data.height + padding.top + padding.bottom;
+      } else {
+        data.offset.top = data.offset.top - padding;
+        data.offset.left = data.offset.left - padding;
+        data.width = data.width + (padding * 2);
+        data.height = data.height + (padding * 2);
+      }
+      return data;
+    };
+
+    Tour.prototype._clearTimer = function() {
+      window.clearTimeout(this._timer);
+      this._timer = null;
+      return this._duration = null;
+    };
+
+    return Tour;
+
+  })();
+  return window.Tour = Tour;
+})(jQuery, window);
diff --git a/sources/plugins/TakeATour/js/custom.patch b/sources/plugins/TakeATour/js/custom.patch
index 0ad5f0b..c372de0 100644
--- a/sources/plugins/TakeATour/js/custom.patch
+++ b/sources/plugins/TakeATour/js/custom.patch
@@ -1,43 +1,43 @@
---- E:/Program Files/EasyPHP/www/SITE/sandbox/pwg_test/piwigo_trunk/plugins/TakeATour/js/903.js	Mon Jun 23 21:44:59 2014
-+++ E:/Program Files/EasyPHP/www/SITE/sandbox/pwg_test/piwigo_trunk/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js	Sun Apr 13 19:05:42 2014
-@@ -849,9 +849,15 @@
-                 return step.path;
-             }
-           }).call(_this);
--          current_path = [document.location.pathname, document.location.hash].join("");
-+        current_path = document.location.href;
-           if (_this._isRedirect(path, current_path)) {
-+          if (toString.call(path) === "[object RegExp]") {
-             _this._redirect(step, path);
-+          }
-+          else {
-+            path = document.location.protocol+'//'+path;
-+            _this._redirect(step, path);
-+          }
-             return;
-           }
-           if (_this._isOrphan(step)) {
-@@ -866,6 +872,14 @@
-             }
-             _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true.");
-           }
-+        if (step.title  === "" & step.content  === "") {
-+            if (skipToPrevious) {
-+              _this._showPrevStep();
-+            } else {
-+              _this._showNextStep();
-+            }
-+            return;
-+        }
-           if (step.backdrop) {
-             _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0);
-           }
-@@ -988,7 +1002,7 @@
-     };
- 
-     Tour.prototype._isRedirect = function(path, currentPath) {
--      return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
-+      return (path != null) && path !== "" && ((toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || (toString.call(path) === "[object String]" && path !== currentPath.replace("http://", "").replace("https://", "")));
-     };
- 
-     Tour.prototype._redirect = function(step, path) {
+--- bootstrap-tour-standalone.js.orig	2015-02-10 14:28:55.000000000 +0100
++++ bootstrap-tour-standalone.js	2015-02-10 14:35:03.000000000 +0100
+@@ -870,9 +870,15 @@
+                 return step.path;
+             }
+           }).call(_this);
+-          current_path = [document.location.pathname, document.location.hash].join('');
++          current_path = document.location.href;
+           if (_this._isRedirect(path, current_path)) {
++            if ({}.toString.call(path) === "[object RegExp]") {
++             _this._redirect(step, path);
++          }
++          else {
++            path = document.location.protocol+'//'+path;
+             _this._redirect(step, path);
++          }
+             return;
+           }
+           if (_this._isOrphan(step)) {
+@@ -887,6 +893,14 @@
+             }
+             _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true.");
+           }
++        if (step.title  === "" & step.content  === "") {
++            if (skipToPrevious) {
++              _this._showPrevStep();
++            } else {
++              _this._showNextStep();
++            }
++            return;
++        }
+           if (step.backdrop) {
+             _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0);
+           }
+@@ -1023,7 +1037,7 @@
+     };
+ 
+     Tour.prototype._isRedirect = function(path, currentPath) {
+-      return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, '')));
++      return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path !== currentPath.replace("http://", "").replace("https://", "")));
+     };
+ 
+     Tour.prototype._redirect = function(step, path) {
diff --git a/sources/plugins/TakeATour/language/ca_ES/plugin.lang.php b/sources/plugins/TakeATour/language/ca_ES/plugin.lang.php
index a18a4ec..b74b8cb 100755
--- a/sources/plugins/TakeATour/language/ca_ES/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/ca_ES/plugin.lang.php
@@ -33,4 +33,6 @@ $lang['End tour'] = 'Acaba l\'exploració';
 $lang['Next '] = 'Següent';
 $lang['Prev'] = 'Anterior';
 $lang['Privacy'] = 'Privacitat';
-$lang['privacy_descrp'] = 'Aquesta exploració presenta tots els camins per protegir les vostres fotos de l\'accés públic afegint permisos en els àlbums i fotos, i evitant la còpia d\'imatges protegides.';
\ No newline at end of file
+$lang['privacy_descrp'] = 'Aquesta exploració presenta tots els camins per protegir les vostres fotos de l\'accés públic afegint permisos en els àlbums i fotos, i evitant la còpia d\'imatges protegides.';
+$lang['2.8 Tour'] = 'Explora 2.8';
+$lang['2_8_0_descrp'] = 'Descobreix algunes noves funcionalitats de Piwigo 2.8. Llegiu els detalls visitant les <a href="%s">notes de la versió</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/ca_ES/tour_2_7_0.lang.php b/sources/plugins/TakeATour/language/ca_ES/tour_2_7_0.lang.php
index eba1913..7f75e3f 100755
--- a/sources/plugins/TakeATour/language/ca_ES/tour_2_7_0.lang.php
+++ b/sources/plugins/TakeATour/language/ca_ES/tour_2_7_0.lang.php
@@ -1,36 +1,36 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 $lang['2_7_0_stp6'] = 'La caixa de selecció d\'àlbums, etiquetes, etc ha canviat en una de nova molt més entenedora. Prova-la a sota';
 $lang['2_7_0_stp4'] = 'La pàgina de cerca s\'ha refet: habilitat de seleccionar propietats en les quals la paraula clau s\'apliqui, llista d\'autors trobats en la base de dades, llista de auto-compleció d\'etiquetes, llista d\'auto-compleció d\'àlbums...';
 $lang['2_7_0_stp2b'] = 'El nou formulari de càrrega de Piwigo 2.7 està basat en HTML5 en comptes de Flash, això significa una millor compatibilitat amb els navegadors web moderns i una millor confiança amb connexions lentes. L\'opció de clicar i arrastrar farà molt més fàcil la selecció de fotos! ';
-$lang['2_7_0_stp9'] = 'S\'ha afegit un filtre en el gestor per lots. Inclou una potent sintaxi de cerca de fotos per dates, etiquetes, mides, nom d\'arxius i també opcions de cerca com exact, match, AND/OR, grouping, exclusion. Més tard podeu llegir l\'ajuda detallada. La mateixa sintaxi s\'aplica en el camp de cerca ràpida en menú del costat públic.';
+$lang['2_7_0_stp9'] = 'S\'ha afegit un filtre en el gestor de processament per lots. Inclou una potent sintaxi de cerca de fotos per dates, etiquetes, mides, nom d\'arxius i també opcions de cerca com exact, match, AND/OR, grouping, exclusion. Més tard podeu llegir l\'ajuda detallada. La mateixa sintaxi s\'aplica en el camp de cerca ràpida en menú del costat públic.';
 $lang['2_7_0_stp5'] = 'Podeu indicar l\'hora i la data, utilitzant els sliders Hora i Minut';
 $lang['2_7_0_stp7'] = 'Ara podreu ordenar els àlbums en la data de creació o d\'enviament de les fotos.';
 $lang['2_7_0_stp8'] = 'Acció senzilla per buidar el carret en un únic clic';
 $lang['2_7_0_title2b'] = 'Nova pujada de';
 $lang['2_7_0_title8'] = 'Buida el carret';
 $lang['2_7_0_title9'] = 'Filtre de cerca';
-$lang['2_7_0_stp10'] = 'S\'ha afegit un filtre de mida de fitxer en el gestor per lots. Podeu seleccionar un rang amb un valor mínim i màxim.';
+$lang['2_7_0_stp10'] = 'S\'ha afegit un filtre de mida de fitxer en el gestor de processament per lots. Podeu seleccionar un rang amb un valor mínim i màxim.';
 $lang['2_7_0_stp2'] = 'Com podeu veure, s\'ha afegit un nou connector: Exploreu. Aquest connector us ajudarà a descobrir Piwigo. Aquí hi ha una llista de totes les possibles exploracions. <br/> Aquesta pàgina està disponible a <em>Connectors » Exploreu </em>';
 $lang['2_7_0_stp11'] = 'Aquesta exploració s\'ha acabat <p style="text-align:center"> Gaudiu de Piwigo 2.7</p> Si us agrada Piwigo i voleu donar-nos suport, podeu contribuir ajudant a traduir, donant, etc. <a href="http://piwigo.org/basics/contribute" target="_blank">Cliqueu aquí per donar suport </a>  Gràcies!';
 $lang['2_7_0_title10'] = 'Filtre de mida de fitxer';
diff --git a/sources/plugins/TakeATour/language/ca_ES/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/ca_ES/tour_first_contact.lang.php
index 07b2963..c4a0278 100644
--- a/sources/plugins/TakeATour/language/ca_ES/tour_first_contact.lang.php
+++ b/sources/plugins/TakeATour/language/ca_ES/tour_first_contact.lang.php
@@ -1,7 +1,7 @@
 <?php
 $lang['first_contact_stp2'] = 'L\'enllaç és aquí. Cliqueu a Següent per a continuar';
 $lang['first_contact_stp11'] = 'Per tant, aquí podeu seleccionar una o més d\'una fotos';
-$lang['first_contact_stp10'] = 'Aquí hi ha l\'enllaç per accedir directament al vostre carret. Aquest és una eina per als administrador que permet a un conjunt de fotos configurar-les o editar-les en el gestor per lots. Podeu afegir fotos al carret des de la pàgina d\'imatges publicades si heu entrat com a usuari administrador, o utilitzant l\'acció \"Afegeix al carret\" en el gestor per lots. ';
+$lang['first_contact_stp10'] = 'Aquí hi ha l\'enllaç per accedir directament al vostre carret. Aquest és una eina per als administrador que permet a un conjunt de fotos configurar-les o editar-les en el gestor de processament per lots. Podeu afegir fotos al carret des de la pàgina d\'imatges publicades si heu entrat com a usuari administrador, o utilitzant l\'acció \"Afegeix al carret\" en el gestor de processament per lots. ';
 $lang['first_contact_stp16'] = 'aquí hi ha l\'opció per afegir o eliminar la foto dels àlbums. l\'enllaç es virtual, físicament mai no es mou cap foto .';
 $lang['first_contact_stp15'] = 'En aquesta pàgina podeu editar totes les propietats d\'una foto, per exemple...';
 $lang['first_contact_title14'] = '';
@@ -38,11 +38,11 @@ $lang['first_contact_title5'] = '';
 $lang['first_contact_title6'] = '';
 $lang['first_contact_title7'] = '';
 $lang['first_contact_title8'] = '';
-$lang['first_contact_title9'] = 'El gestor per lots';
+$lang['first_contact_title9'] = 'El gestor de processament per lots';
 $lang['first_contact_stp30'] = 'Començarem canviant el títol';
 $lang['first_contact_stp32'] = 'Ara guardeu els canvis';
 $lang['first_contact_stp14'] = 'Ara veurem la pàgina d\'edició d\'una imatge. Aquesta pàgina es pot trobar aquí, però també des de una pàgina publica entrant com a administrador. Cliqueu a sobre d\'Edita o aneu al següent pas.';
-$lang['first_contact_stp13'] = 'Amb el mode unitari del processament per lots podeu editar les descripcions i altres camps. De moment ens quedem amb el mode global.';
+$lang['first_contact_stp13'] = 'Amb el mode unitari del gestor de processament per lots podeu editar les descripcions i altres camps. De moment ens quedem amb el mode global.';
 $lang['first_contact_stp38'] = 'Els connectors són una forma molt senzilla de personalitzar el vostre Piwigo. Poden fer moltes coses, des d\'afegir un petit text, fins al connector Community que permet als usuaris penjar fotos sense entrar a la part d\'administració.';
 $lang['first_contact_stp39'] = 'En aquesta primera pàgina hi ha llistats els connectors instal·lats. A la part de dalt hi ha llistats els connectors que estan actius i que s\'estan executant. A la part de baix hi ha els connectors que estan instal·lats a la carpeta /plugins, però que estan deshabilitats. La majoria dels connectors quan es deshabiliten mantenen la informació registrada pel propi connector. Quan s\'elimina un connector s\'elimina tota traça del connector (fitxers, opcions, etc). ';
 $lang['first_contact_stp4'] = 'Primer escolliu un àlbum; creeu-ne un si encara no n\'hi ha cap.';
@@ -51,4 +51,22 @@ $lang['first_contact_stp41'] = 'En l\'anterior pestanya heu pogut veure tots els
 $lang['first_contact_stp43'] = 'Aquesta exploració ha estat una mica llarga, però només hem vist una petita part de totes les característiques de Piwigo. Tot té un final i aquesta exploració preliminar s\'ha acabat.<br/> Podeu descobrir més característiques de Piwigo agafant una altra exploració o llegint la documentació al lloc web de piwigo.org';
 $lang['first_contact_stp20'] = 'Quan el ratolí passa per sobre d\'un àlbum apareix la informació i els enllaços. Quan cliqueu i arrastreu un àlbum -un bloc arrodonit- podeu canviar la posició i més tard guardar o cancel·lar l\'ordre manual.';
 $lang['first_contact_stp19_b'] = 'Aquí hi ha un llistat dels àlbums \'arrel\'';
-$lang['first_contact_stp12'] = 'després podeu editar-les emprant una acció';
\ No newline at end of file
+$lang['first_contact_stp12'] = 'després podeu editar-les emprant una acció';
+$lang['first_contact_title15'] = 'La pàgina d\'edició d\'una foto';
+$lang['first_contact_title33'] = 'Configuració de l\'usuari visitant';
+$lang['first_contact_stp35'] = 'Indiqueu el tema que més us agradi com a tema predeterminat';
+$lang['first_contact_stp34'] = 'La primera cosa que s\'ha de fer per personalitzar Piwigo és escollir un tema. Els temes instal·lats es mostren aquí. <br>Es pot habilitar més d\'un tema: Els usuaris poden canviar el seu tema escollint entre tots els que s\'habiliten aquí, si la opció \'Permet la personalitzacio als usuaris\' està activa a la pàgina d\'opcions.';
+$lang['first_contact_stp23'] = 'Bloquejar un àlbum significa que només els administradors són capaços de veure aquell àlbum: molt útil quan es prepara l\'àlbum abans de publicar-lo.';
+$lang['first_contact_stp18'] = 'Anem a veure com gestionar els àlbums. Cliqueu a <em>Àlbums » Gestiona </em> o cliqueu a Següent';
+$lang['first_contact_stp22'] = 'Com una foto, aquí es poden editar les propietats d\'un àlbum';
+$lang['first_contact_title43'] = 'Ha estat un plaer';
+$lang['first_contact_stp6'] = 'Veieu les fotos que s\'han llistat. Quan estigueu preparats cliqueu el boto Inicia càrrega';
+$lang['first_contact_stp21'] = 'La següent pestanya és una pàgina que permet moure qualsevol àlbum virtual. <br>L\'enllaç permanent de la pestanya permet configurar una url particular per un àlbum.<br>Anem a editar un àlbum: cliqueu sobre Edita un àlbum ';
+$lang['first_contact_stp3'] = 'En la primera pestanya es on podeu afegir fotos directament des del vostre navegador. La resta de pestanyes permeten afegir fotos d\'altres maneres.';
+$lang['first_contact_stp29'] = 'Aquí, en aquesta primera pàgina, podeu configurar la configuració bàsica de la vostra galeria.';
+$lang['first_contact_stp28'] = 'Ara mirarem les opcions possibles per configurar Piwigo al vostre gust. Cliqueu a Configuració -> Opcions o simplement cliqueu a Següent.';
+$lang['first_contact_stp37'] = 'Per instal·lar nous temes, podeu descargar-los directament a la pestanya \'Afegeix un nou tema\'. Només es mostren els temes compatibles amb la vostra versió de Piwigo. <br><br> Anem ara a descobrir els connectors! Cliqueu sobre <em>Connectors  » Gestiona </em>';
+$lang['first_contact_stp9'] = 'Ara esteu en el Gestor de processament per lots, aquí podeu editar múltiples fotos al mateix temps. <br> <br> Aquí el pre-filtre està seleccionat al "Carret" ja que venim de la pàgina de pujades.';
+$lang['first_contact_stp8'] = 'Som-hi, edite-lo! Cliqueu sobre l\'enllaç';
+$lang['first_contact_stp5'] = 'Després feu clic al botó per seleccionar les fotos a enviar, o simplement cliqueu i arrossegueu els vostres fitxers.';
+$lang['first_contact_stp17'] = 'Aquí podeu posar la foto com a miniatura d\'un o diversos àlbums. La foto no ha d\'estar associada amb l\'àlbum per poder ser la seva miniatura. Si la foto està associada amb l\'àlbum es tan simple d\'indicar-ho des de la pàgina pública de la foto (pista: utilitzeu el connector Admin Tools per que sigui encara més fàcil).';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/ca_ES/tour_privacy.lang.php b/sources/plugins/TakeATour/language/ca_ES/tour_privacy.lang.php
index 840ddac..13c2b84 100644
--- a/sources/plugins/TakeATour/language/ca_ES/tour_privacy.lang.php
+++ b/sources/plugins/TakeATour/language/ca_ES/tour_privacy.lang.php
@@ -15,3 +15,7 @@ $lang['privacy_title6'] = 'Nivell de privacitat';
 $lang['privacy_title7'] = 'Nivell de privacitat';
 $lang['privacy_title8'] = 'Nivell de privacitat';
 $lang['privacy_title9'] = 'Nivell de privacitat';
+$lang['privacy_stp8'] = 'Seleccioneu una o més fotografies...';
+$lang['privacy_stp3'] = 'Preneu-vos un moment per llegir la informació de sota.';
+$lang['privacy_stp13'] = 'Ara feu clic sobre privat';
+$lang['privacy_stp11'] = 'Ara feu clic sobre la pestanya de Permisos';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/cs_CZ/plugin.lang.php b/sources/plugins/TakeATour/language/cs_CZ/plugin.lang.php
index 5ae18e6..fad4377 100644
--- a/sources/plugins/TakeATour/language/cs_CZ/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/cs_CZ/plugin.lang.php
@@ -13,3 +13,5 @@ $lang['2.7 Tour'] = 'Ukázka 2.7';
 $lang['2_7_0_descrp'] = 'Zjisti co je nového v Piwigo 2.7';
 $lang['Privacy'] = 'Soukromí';
 $lang['privacy_descrp'] = 'Tato ukázka prezentuje vše okolo ochrany vašich fotografií před veřejným přístupem díky možnostem nastavit oprávnění pro přístup na každé album a fotku a zamezení snadnému kopírování použitím aktivní ochrany obrázků.';
+$lang['2.8 Tour'] = '2.8 Prohlídka';
+$lang['2_8_0_descrp'] = 'Objevte některé nové funkce Piwigo verze 2.8. Přečíst si více v <a href="%s">podrobnostech k vydání</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/da_DK/plugin.lang.php b/sources/plugins/TakeATour/language/da_DK/plugin.lang.php
index bf0bf37..5310a71 100755
--- a/sources/plugins/TakeATour/language/da_DK/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/da_DK/plugin.lang.php
@@ -36,4 +36,6 @@ $lang['2.7 Tour'] = 'Udflugt i 2.7';
 $lang['2_7_0_descrp'] = 'Opdag nyhederne i Piwigo 2.7';
 
 $lang['privacy_descrp'] = 'Denne udflugt præsenterer dig for alle de måder, du kan beskytte et fotografi mod offentlig adgang ved hjælp af rettighedssysteer pr. album og pr. billede, og mod kopiering ved hjælp af billedbeskyttelser.';
-$lang['Privacy'] = 'Privatliv';
\ No newline at end of file
+$lang['Privacy'] = 'Privatliv';
+$lang['2.8 Tour'] = 'Udflugt i 2.8';
+$lang['2_8_0_descrp'] = 'Opdag nogle af de nye funktioner i Piwigo 2.8. Læs flere oplysninger i <a href="%s">udgivelsesbemærkningerne</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/de_DE/plugin.lang.php b/sources/plugins/TakeATour/language/de_DE/plugin.lang.php
index 15e3dea..bda7d8a 100755
--- a/sources/plugins/TakeATour/language/de_DE/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/de_DE/plugin.lang.php
@@ -24,16 +24,18 @@ $lang['takeatour_configpage'] = 'Mache eine Tour >> Liste der Touren';
 $lang['Take a tour and discover the features of your Piwigo gallery » Go to the available tours'] = 'Mache eine Tour und entdecke die Funktionen deiner Piwigo Galerie >> Gehe zu den verfügbaren Touren ';
 $lang['Start the Tour'] = 'Tour starten';
 $lang['Visit your Piwigo!'] = 'Besuche dein Piwigo!';
-$lang['TAT_descrp'] = 'Herzlich Willkommen! Hier findest du die Liste aller verfügbaren Touren zu den Funktionen der Piwigo Galerie. <br> Starte unten eine Tour und folge den Anweisungen. Klicke auf \"Vorhergehende\" / \"Nächste\" (oder benutze die Pfeile auf der Tastatur) um in einer Tour zu navigieren. Wenn du beim Rundgang zur Verwaltungs-Seite gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet. Falls du stecken bleibst und die Tour nicht beenden kannst, gehe auf das Plugin <em> » Mache eine Tour </ em> um die Tour zu beenden.';
+$lang['TAT_descrp'] = 'Herzlich Willkommen! Hier findest du die Liste aller verfügbaren Touren zu den Funktionen der Piwigo Galerie. <br> Starte unten eine Tour und folge den Anweisungen. Klicke auf "Vorhergehende" / "Nächste" (oder benutze die Pfeile auf der Tastatur) um in einer Tour zu navigieren. Wenn du beim Rundgang zur Verwaltungs-Seite gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet. Falls du stecken bleibst und die Tour nicht beenden kannst, gehe auf das Plugin <em> » Mache eine Tour </ em> um die Tour zu beenden.';
 $lang['Prev'] = 'Vorhergehende';
 $lang['Next '] = 'Nächste';
 $lang['End tour'] = 'Tour beenden';
 
 $lang['First Contact'] = 'Erster Kontakt';
-$lang['first_contact_descrp'] = 'Empfohlen für Anfänger, diese Tour stellt dir die Grundlagen von Piwigo vor. Sie startet mit hinzufügen und verwalten von Bildern. Die Tour geht weiter mit Album-Management und Zugriffsrechte und endet mit individueller Konfiguration der Themen und Plugins.';
+$lang['first_contact_descrp'] = 'Empfohlen für Anfänger, diese Tour stellt dir die Grundlagen von Piwigo vor. Sie startet mit dem Hinzufügen und Verwalten von Bildern. Die Tour geht weiter mit Album-Management und Zugriffsrechte und endet mit individueller Konfiguration der Themen und Plugins.';
 
 $lang['privacy_descrp'] = 'Diese Tour beschreibt alle Möglichkeiten, deine Fotos mit dem Zugriffssystem pro Album oder Foto vor dem öffentlichen Zugriff und mit dem Bildschutz vor dem Kopieren zu schützen.';
 
 $lang['2.7 Tour'] = '2.7 Tour';
 $lang['2_7_0_descrp'] = 'Endecke die Neuigkeiten in Piwigo 2.7';
-$lang['Privacy'] = 'Privatsphäre';
\ No newline at end of file
+$lang['Privacy'] = 'Privatsphäre';
+$lang['2.8 Tour'] = '2.8 Tour';
+$lang['2_8_0_descrp'] = 'Lerne einige der neuen Funktionen von Piwigo 2.8 kennen. Lies Einzelheiten dazu in den <a href="%s">Versionshinweisen</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/de_DE/tour_2_7_0.lang.php b/sources/plugins/TakeATour/language/de_DE/tour_2_7_0.lang.php
index 4a6cfaf..7ee4ef1 100644
--- a/sources/plugins/TakeATour/language/de_DE/tour_2_7_0.lang.php
+++ b/sources/plugins/TakeATour/language/de_DE/tour_2_7_0.lang.php
@@ -8,7 +8,7 @@ $lang['2_7_0_title5'] = 'Zeit';
 $lang['2_7_0_title1'] = 'Willkommen bei Piwigo 2.7';
 $lang['2_7_0_title11'] = 'Bis bald!';
 $lang['2_7_0_title2'] = 'Die ersten neuen Funktionen';
-$lang['2_7_0_stp2'] = 'Wie du siehst, wurde ein vorgegebenes Plugin hinzugefügt. Take a Tour. Dieses Plugin hilft dir Piwigo zu entdecken. Hier sind alle verfügbaren Touren aufgelistet. <br> Diese Seite ist in <em> Plugins » Take a Tour</em> verfügbar ';
+$lang['2_7_0_stp2'] = 'Wie du siehst, wurde ein vorgegebenes Plugin hinzugefügt. "Take a Tour". Dieses Plugin hilft dir Piwigo zu entdecken. Hier sind alle verfügbaren Touren aufgelistet. <br> Diese Seite ist in <em> Plugins » Take a Tour</em> verfügbar ';
 $lang['2_7_0_stp11'] = 'Diese Tour ist zu Ende. <p style="text-align:center"> Freue dich über Piwigo 2.7! </p> Wenn dir Piwigo gefällt und du uns unterstützen möchtest, dann kannst du beim übersetzen helfen, etwas Spenden usw.  <a href="http://piwigo.org/basics/contribute" target="_blank"> Klicke hier um uns zu unterstützen </a>';
 $lang['2_7_0_stp1'] = 'Hallo! Ich begleite dich, um Piwigo zu entdecken. Bitte folge meinen Anweisungen und klicke auf Nächste (oder benutze die Pfeile der Tastatur) zum navigieren. Wenn du auf andere Seiten gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet.';
 $lang['2_7_0_stp9'] = 'Ein Suchfilter wurde der Stapelverarbeitung spendiert. Er verfügt über eine mächtige Syntax um Fotos nach Datum, Schlagworten, Größe, Dateinamen zu suchen. Optionen wie Exakt, Und/Oder, Gruppierung und Exkludieren werden unterstützt. Du kannst später die detaillierte Hilfe hierzu lesen. Die gleiche Syntax gilt für die Schnellsuche auf der öffentlichen Seite im Menü.';
diff --git a/sources/plugins/TakeATour/language/de_DE/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/de_DE/tour_first_contact.lang.php
index 7dadaec..65d2d87 100644
--- a/sources/plugins/TakeATour/language/de_DE/tour_first_contact.lang.php
+++ b/sources/plugins/TakeATour/language/de_DE/tour_first_contact.lang.php
@@ -48,7 +48,7 @@ $lang['first_contact_stp2'] = 'Der Link ist hier. Klicke "Nächste" zum weiterma
 $lang['first_contact_stp14'] = 'Wir sehen hier die Bearbeitungs-Seite eines Bildes. Dise Seite ist von hier aus erreichbar, aber auch von der öffentlichen Seite, wenn du als Administrator angemeldet bist. Klicke auf Bearbeiten oder Nächste';
 $lang['first_contact_stp13'] = 'Du kannst Beschreibungen und mehr in der Stapelverarbeitung im Einzelmodus bearbeiten. Aber jetzt wollen wir im Global-Modus bleiben';
 $lang['first_contact_stp10'] = 'Hier ist der Link, um direkt auf deinen Sammelkorb zuzugreifen: Das ist ein Tool für Administratoren um auf einfache Weise Bilder zu einem Satz hinzuzufügen und in der Stapelverarbeitung zu bearbeiten. Wenn du als Admin angemeldet bist, kannst du Fotos zum Sammelkorb aus der öffentlichen Seite hinzufügen, oder die Aktion "In den Sammelkorb" der Stapelverarbeitung benutzen.';
-$lang['first_contact_stp1'] = 'Hallo! Ich werde dein Begleiter sein, um Piwigo zu entdecken. Bitte folge meinen Anweisungen und klicke auf "Nächste" (oder benutze die Pfeile auf der Tastatur) zum navigieren. Wenn du beim Rundgang zur Verwaltungs-Seite gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet. Falls du stecken bleibst und die Tour nicht beenden kannst, gehe auf das Plugins <em> » Mache  eine Tour </ em> um die Tour zu beenden. <br> Lass uns beginnen, indem wir Bilder hinzufügen!';
+$lang['first_contact_stp1'] = 'Hallo! Ich werde dein Begleiter sein, um Piwigo zu entdecken. Bitte folge meinen Anweisungen und klicke auf "Nächste" (oder benutze die Pfeile auf der Tastatur) zum Navigieren. Wenn du beim Rundgang zur Verwaltungs-Seite gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet. Falls du stecken bleibst und die Tour nicht beenden kannst, gehe zu <em>Plugins » Mache  eine Tour</em>, um die Tour zu beenden. <br> Lass uns beginnen, indem wir Bilder hinzufügen!';
 $lang['first_contact_stp16'] = 'Hier kannst du Bilder den Alben hinzufügen oder dies entfernen. Die Verknüpfung ist virtuell, keine Bilder werden physikalisch verschoben.';
 $lang['first_contact_stp20'] = 'Wenn deine Maus über einem Album ist, werden Links und Informationen angezeigt. Die Position eines Album kannst du per klicken & ziehen ändern, dann kannst du diese manuelle Änderung speichern oder abbrechen.';
 $lang['first_contact_stp43'] = 'Diese Tour war sehr lange, wir haben aber nur einen kleinen Teil gesehen, wie mächtig Piwigo ist. Alles hat ein Ende, diese Übersicht ist nun beendet. <br> Du kannst viel tiefer in die Eigenschaften von Piwigo einsteigen, indem du eine andere Tour nimmst oder unserer Dokumentation auf der Website piwigo.org liest.';
@@ -68,7 +68,7 @@ $lang['first_contact_stp38'] = 'Plugins sind sehr einfache Möglichkeiten, dein
 $lang['first_contact_stp34'] = 'Ein Thema zu wählen ist der erste Schritt Piwigo anzupassen. Installierte Themen werden hier aufgelistet.<br>Es kann mehr als ein Thema aktiviert werden. Benutzer können so ihr eigenes Thema aus den freigeschalteten Themen wählen, falls die Option \'Erlaube Anpassungen durch Benutzer\' auf der Optionsseite eingeschaltet wurde.';
 $lang['first_contact_stp35'] = 'Setze dein favorisiertes Thema als Standard.';
 $lang['first_contact_stp5'] = 'Dann klicke den Schalter um gewählte Fotos zu senden oder ziehe einfach die Dateien.';
-$lang['first_contact_stp21'] = 'Der nächste Reiter ist eine Seite auf der du jedes virtuelle Album bewegen kannst.<br>Der Permalinks Reiter existiert, um für ein bestimmtes Album einen URL-Verweis zu setzen.<br>Aber lass uns erst ein Album editieren: Klicke auf Album verwalten.';
+$lang['first_contact_stp21'] = 'Der nächste Reiter ist eine Seite auf der du jedes virtuelle Album bewegen kannst.<br>Der Permalinks Reiter existiert, um für Alben feste Adressen (URLs) festzulegen.<br>Aber lass uns erst ein Album editieren: Klicke auf <em>Bearbeiten</em>.';
 $lang['first_contact_stp19'] = 'Hier sind nun alle Haupt-Alben gelistet. Wenn du ein Album mit gestricheltem Hintergrund siehst, ist dies ein physisches Album aus einer FTP Synchronisation. Physische Alben können an dieser Stelle nicht verschoben oder gelöscht werden. Alle anderen Alben nennt man Virtuelle Alben.';
 $lang['first_contact_stp19_b'] = 'Hier sind Haupt-Alben gelistet.';
 $lang['first_contact_stp18'] = 'Lass uns nun ansehen wie man Alben verwaltet. Klicke auf <em>Alben » Verwalten</em> oder Nächste';
diff --git a/sources/plugins/TakeATour/language/el_GR/plugin.lang.php b/sources/plugins/TakeATour/language/el_GR/plugin.lang.php
index 1154e91..0149534 100755
--- a/sources/plugins/TakeATour/language/el_GR/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/el_GR/plugin.lang.php
@@ -37,4 +37,7 @@ $lang['2_7_0_descrp'] = 'Ανακαλύψτε τι νέο υπάρχει στο
 $lang['2.7 Tour'] = '2.7 Tour';
 
 $lang['privacy_descrp'] = 'Η περιήγηση αυτή παρουσιάζει τρόπους να προστατέψετε τις φωτογραφίες σας από δημόσια πρόσβαση με ένα σύστημα αδειών ανά λεύκωμα και ανά εικόνα, και από την αντιγραφή χρησιμοποιώντας προστασία εικόνας.  ';
-$lang['Privacy'] = 'Προστασία Προσωπικών Δεδομένων';
\ No newline at end of file
+$lang['Privacy'] = 'Προστασία Προσωπικών Δεδομένων';
+$lang['2_8_0_descrp'] = 'Ανακαλύψτε μερικά νέα χαρακτηριστικά του  Piwigo 2.8. Διαβάστε σχετικά λεπτομέρειες στο <a href="%s">the release notes</a>.
+';
+$lang['2.8 Tour'] = 'Περιήγηση 2.8 ';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/en_UK/plugin.lang.php b/sources/plugins/TakeATour/language/en_UK/plugin.lang.php
index 893ad63..41edc3b 100644
--- a/sources/plugins/TakeATour/language/en_UK/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/en_UK/plugin.lang.php
@@ -12,4 +12,6 @@ $lang['first_contact_descrp'] = 'Recommended for beginners, this tour introduce
 $lang['2.7 Tour'] = '2.7 Tour';
 $lang['2_7_0_descrp'] = 'Discover What\'s New in Piwigo 2.7';
 $lang['Privacy'] = 'Privacy';
-$lang['privacy_descrp'] = 'This tour presents all the ways to protect your photo from public access with permissions per album and per photo, and from copying using image protections.';
\ No newline at end of file
+$lang['privacy_descrp'] = 'This tour presents all the ways to protect your photo from public access with permissions per album and per photo, and from copying using image protections.';
+$lang['2.8 Tour'] = '2.8 Tour';
+$lang['2_8_0_descrp'] = 'Discover some Piwigo 2.8 new features. Read details on <a href="%s">the release notes</a>.';
diff --git a/sources/plugins/TakeATour/language/eo_EO/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/eo_EO/tour_first_contact.lang.php
index 7b66f68..5bdd0bc 100644
--- a/sources/plugins/TakeATour/language/eo_EO/tour_first_contact.lang.php
+++ b/sources/plugins/TakeATour/language/eo_EO/tour_first_contact.lang.php
@@ -21,11 +21,11 @@ $lang['first_contact_stp2'] = 'La ligilo estas ĉi-tie. Alklaku sur Sekva por ko
 $lang['first_contact_stp15'] = 'Sur tiu paĝo vi povas redakti ĉiujn ecojn de foto, ekzemple...';
 $lang['first_contact_stp11'] = 'Do vi povas selekti ĉitie inter unu kaj pli da fotoj';
 $lang['first_contact_stp29'] = 'Ĉi-tie, sur tiu unua paĝo, vi elektos la ĉefan kaj bazan agordon sur via galerio.';
-$lang['first_contact_stp30'] = 'Komencu ni per ŝanĝo de la titolo';
+$lang['first_contact_stp30'] = 'Eku ni ŝanĝante la titolon';
 $lang['first_contact_stp1'] = 'Saluton! Mi estos via ĉiĉerono por malkovri na Piwigo. Bonvolu sekvi miajn instrukciojn, kaj alklaku Sekvanta (aŭ uzu la sagojn el via klavaro) por navigi. Se vi iras al alia paĝo de la administrado, vi estos alidirektita al la aktuala paĝo de la travizito. Se vi estas blokita kaj ne povas fini la traviziton, iri al <em>Kromaĵoj » Traviziti</em> finos la travizion. <br>Komencu ni per aldono de bildoj!';
 $lang['first_contact_stp13'] = 'Vi povas redakti priskribojn kaj pli el la stapla mastrumilo dum unuopa modo. Sed nun, pludaŭrigu la ĝenerala modo.';
 $lang['first_contact_stp16'] = 'ĉi-tie por aldoni aŭ forigi la foton el fotaroj. La ligo estas virtuala, neniu foto estos forigita iam ajn.';
-$lang['first_contact_stp32'] = 'Nun savu viajn ŝanĝojn';
+$lang['first_contact_stp32'] = 'Nun konservu viajn ŝanĝojn';
 $lang['first_contact_stp28'] = 'Nun ni interesiĝos pri la opcioj disponeblaj por agordi, ke Piwigo funkciu kiel vi deziras. Alklaku sur Agordoj->Opcioj aŭ simple sur sekvanta.';
 $lang['first_contact_stp23'] = 'Ŝlosi fotaron signifas, ke nur administrantoj rajtos vidi tiun fotaron: ege utilas kiam vi preparas fotaron antaŭ publikigado';
 $lang['first_contact_stp3'] = 'La unua langeto estas, kie vi aldonas fotojn rekte el via dosieresplorilo. La aliaj langetoj traktas pri la aliaj manieroj elŝuti fotojn';
@@ -40,4 +40,29 @@ $lang['first_contact_stp6'] = 'Vi vidas, ke fotoj listiĝas. Kiam vi pretas, mus
 $lang['first_contact_stp19_b'] = 'Jen la listo de \'radikaj\' fotaroj.';
 $lang['first_contact_stp21'] = 'La venonta langeto estas paĝo, kie eblas al vi movigi iun ajn virtualan fotaron.<br>La konstantliga langeto servas por agordi apartan retadreson al fotaro.<br>Sed redaktu ni fotaron: musklaku sur Redakti fotaron';
 $lang['first_contact_stp18'] = 'Nun, vidu ni pri la mastrumado de fotaroj. Musklaku sur <em>Fotaro » Mastrumado</em> aŭ sur Poste';
-$lang['first_contact_stp12'] = 'kaj, poste, redaktu ilin uzante agon';
\ No newline at end of file
+$lang['first_contact_stp12'] = 'kaj, poste, redaktu ilin uzante agon';
+$lang['first_contact_title37'] = 'Temoj';
+$lang['first_contact_title38'] = 'Kromprogramoj';
+$lang['first_contact_title39'] = 'Kromprogramoj';
+$lang['first_contact_title4'] = 'Aldonu ni foton!';
+$lang['first_contact_title43'] = 'Kiel mojosa momento';
+$lang['first_contact_title9'] = 'Stapla Mastrumilo';
+$lang['first_contact_title22'] = 'Fotaroredakta paĝo';
+$lang['first_contact_title28'] = 'Agordoj';
+$lang['first_contact_title29'] = '<em>Agordoj » Elektebloj » Ĝeneralaj</em>';
+$lang['first_contact_title3'] = 'Aldoni fotopaĝon';
+$lang['first_contact_title33'] = 'Agordoj de invitito';
+$lang['first_contact_title34'] = 'Temoj';
+$lang['first_contact_title35'] = 'Temoj';
+$lang['first_contact_title11'] = 'Kiel redakti foton';
+$lang['first_contact_title15'] = 'La redakta paĝo de foto';
+$lang['first_contact_title18'] = 'Mastrumi fotarojn';
+$lang['first_contact_title19'] = 'Mastrumi Fotarojn';
+$lang['first_contact_title20'] = 'Mastrumi Fotarojn';
+$lang['first_contact_title21'] = 'Aliaj langetoj';
+$lang['first_contact_stp10'] = 'Jen la ligilo por rekte atingi vian korbon: estas ilo por ke la administrantoj facile kolektu fotojn dum foliumado de la publika parto, cele al redakti ilin en la Stapla Mastrumilo.
+<br><br>Vi povas aldoni fotojn al la korbon de la publikfoto-paĝo, post ensaluto kiel administranto, aŭ uzante la ago "Aldoni al korbo" de la Stapla Mastrumilo.';
+$lang['first_contact_stp14'] = 'Nun ni vidu la <b>redaktopaĝon</b> de iu foto. Tiu paĝo atingeblas de tie sed ankaŭ de la publika fotopaĝo, se vi ensalutas kiel administranto.<br><br>Musumu la miniaturon kaj poste musklaku na Redakti.';
+$lang['first_contact_stp17'] = 'Ĉitie eblas al vi estigi la foton kiel miniaturo de unu aŭ pluraj fotaroj. Ne nepras ke la foto estu asociita kun la fotaro, eĉ pli simplas estigi ĝin kiel fotara miniaturo de la publika paĝo de la foto (truko: uzu la kromprogramon Administradaj Iloj por eĉ pli da simpleco)';
+$lang['first_contact_stp31'] = 'Tiam la rubando, kiu montriĝos supre de ĉiuj paĝoj. Kiel vi vidas, HTML-etikedoj estas permesitaj ĉi-tie. Vi povas uzi ankaŭ la ŝlosilvorton %gallery_title% por vidigi la titolon, kiun vi ĵus tajpis supre.';
+$lang['first_contact_stp20'] = 'Kiam vi musumas super fotaro, ligiloj kaj informoj aperas. Kiam vi ŝovmetas fotaron (rondigitan blokon), vi ŝanĝos ĝian pozicion kaj tiel vi povas konservi aŭ malfari vian permanan ordonon.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/es_ES/plugin.lang.php b/sources/plugins/TakeATour/language/es_ES/plugin.lang.php
index 4ac754f..15ff225 100755
--- a/sources/plugins/TakeATour/language/es_ES/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/es_ES/plugin.lang.php
@@ -37,4 +37,6 @@ $lang['2.7 Tour'] = '2.7 Tour';
 $lang['2_7_0_descrp'] = 'Descubre las novedades de Piwigo 2.7';
 
 $lang['privacy_descrp'] = 'Este tour le presenta todas las formas de proteger sus fotos del acceso público con sistemas de permisos por álbum y por imagen, y de las copias mediante protecciones de imagen.';
-$lang['Privacy'] = 'Privacidad';
\ No newline at end of file
+$lang['Privacy'] = 'Privacidad';
+$lang['2.8 Tour'] = 'Tour 2.8';
+$lang['2_8_0_descrp'] = 'Descubre alguna de las nuevas funciones de Piwigo 2.8. Lee todos los detalles en <a href="%s">la nota de la versión</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/fi_FI/plugin.lang.php b/sources/plugins/TakeATour/language/fi_FI/plugin.lang.php
index 3a11615..db32eac 100755
--- a/sources/plugins/TakeATour/language/fi_FI/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/fi_FI/plugin.lang.php
@@ -33,4 +33,6 @@ $lang['Take a tour and discover the features of your Piwigo gallery » Go to the
 $lang['Visit your Piwigo!'] = 'Käy Piwigossasi!';
 $lang['first_contact_descrp'] = 'Suositeltu aloittelijoille, tämä esittely tutustuttaa sinut Piwigoon ja sen perus ominaisuuksiin. Se alkaa näyttämällä miten kuvia lisätään ja hallitaan. Esittely jatkuu albumien hallinnalla ja loppuu kustomointiin käyttäen asetuksia, teemoja ja laajennuksia.';
 $lang['privacy_descrp'] = 'Tämä esittely näyttää kaikki eri tavat, jolla voit suojella kuviasi julkiselta pääsyltä albumi ja kuva kohtaisesti kopioinnista kuvien suojaukseen.';
-$lang['takeatour_configpage'] = 'Katso esittely » Lista esittelyistä';
\ No newline at end of file
+$lang['takeatour_configpage'] = 'Katso esittely » Lista esittelyistä';
+$lang['2.8 Tour'] = '2.8 Esittely';
+$lang['2_8_0_descrp'] = 'Tutki joitain Piwigo 2.8:n uusia ominaisuuksia. Lue yksityiskohdat <a href="%s"> julkaisu tiedoista.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/fr_FR/plugin.lang.php b/sources/plugins/TakeATour/language/fr_FR/plugin.lang.php
index da5bcfa..5dd8dbf 100644
--- a/sources/plugins/TakeATour/language/fr_FR/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/fr_FR/plugin.lang.php
@@ -15,4 +15,7 @@ $lang['2_7_0_descrp'] = 'Découvrez ce qui est nouveau avec Piwigo 2.7';
 $lang['2.7 Tour'] = 'Visite 2.7';
 
 $lang['Privacy'] = 'Vie privée';
-$lang['privacy_descrp'] = 'Cette visite vous explique comment protéger vos photos de l\'accès public avec des systèmes de permissions par album et par photo, et vous protège de la copie à l\'aide de la protection d\'image.';
\ No newline at end of file
+$lang['privacy_descrp'] = 'Cette visite vous explique comment protéger vos photos de l\'accès public avec des systèmes de permissions par album et par photo, et vous protège de la copie à l\'aide de la protection d\'image.';
+
+$lang['2.8 Tour'] = 'Version 2.8';
+$lang['2_8_0_descrp'] = 'Découvrez quelques nouvelles fonctionnalités de Piwigo 2.8. Lire tous les détails sur <a href="%s">les notes de la version</a>.';
diff --git a/sources/plugins/TakeATour/language/it_IT/plugin.lang.php b/sources/plugins/TakeATour/language/it_IT/plugin.lang.php
index dbbce48..94cf90d 100755
--- a/sources/plugins/TakeATour/language/it_IT/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/it_IT/plugin.lang.php
@@ -36,4 +36,6 @@ $lang['2_7_0_descrp'] = 'Scopri le Novità di Piwigo 2.7';
 $lang['TAT_descrp'] = 'Benvenuti! Ecco un elenco di tutti i tour disponibili per aiutarti a scoprire le caratteristiche della tua galleria Piwigo.<br><br>Avvia un tour qui sotto, quindi segui le istruzioni. Clicca  Avanti/Indietro (o utilizza le frecce della tastiera) per navigare durante un tour. Mentre si è in un tour, se vai in un\'altra pagina dell\'amministrazione, sarai reindirizzato alla pagina corrente del Tour. Se sei bloccato e non puoi terminare il giro, vai a <em>Plugins » Scegli un Tour</em> terminerai il tour.';
 $lang['first_contact_descrp'] = 'Consigliato per i principianti, questo tour ti introduce a Piwigo e alle sue caratteristiche di base. Esso si avvierà mostrando come aggiungere foto e quindi gestirle. Il tour prosegue con la gestione album e termina con la personalizzazione tramite configurazione, temi e plugin.';
 $lang['privacy_descrp'] = 'Questo tour presenta tutti i modi per proteggere le tue foto da pubblico accesso con autorizzazioni per album, foto e da copia utilizzando protezioni di immagine.';
-$lang['Privacy'] = 'Privacy';
\ No newline at end of file
+$lang['Privacy'] = 'Privacy';
+$lang['2.8 Tour'] = '2.8 Tour';
+$lang['2_8_0_descrp'] = 'Scopri alcune nuove funzionalità di Piwigo 2.8. Leggi i dettagli sulle <a href="%s">note della versione</a>';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/lv_LV/plugin.lang.php b/sources/plugins/TakeATour/language/lv_LV/plugin.lang.php
index f3f90f0..2589df6 100755
--- a/sources/plugins/TakeATour/language/lv_LV/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/lv_LV/plugin.lang.php
@@ -36,4 +36,6 @@ $lang['2.7 Tour'] = '2.7 Apskats';
 $lang['2_7_0_descrp'] = 'Atklājiet, kas jauns Piwigo 2.7';
 
 $lang['privacy_descrp'] = 'Šis apskats iepazīstina ar visiem veidiem, kā aizsargāt savu foto no publiskas piekļuves, izmantojot atļauju sistēmu vienam albūmam un vienam attēlam, un pret kopēšanu, izmantojot attēlu aizsardzību.';
-$lang['Privacy'] = 'Privātums';
\ No newline at end of file
+$lang['Privacy'] = 'Privātums';
+$lang['2.8 Tour'] = '2.8 Tūre';
+$lang['2_8_0_descrp'] = 'Atklājiet dažas Piwigo 2.8 jaunās funkcijas. Lasīt informāciju <a href="%s"> relīzē</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/nb_NO/plugin.lang.php b/sources/plugins/TakeATour/language/nb_NO/plugin.lang.php
index f08c63f..5600753 100755
--- a/sources/plugins/TakeATour/language/nb_NO/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/nb_NO/plugin.lang.php
@@ -33,4 +33,6 @@ $lang['takeatour_configpage'] = 'Ta en Omvisning » Liste over Omvisninger';
 $lang['privacy_descrp'] = 'Denne omvisningen presenterer alle måter å beskytte dine bilder fra offentligheten med tillatelser per album og per bilde, og fra å kopiere ved hjelp av bilde beskyttelse.';
 $lang['first_contact_descrp'] = 'Anbefales for nybegynnere, denne omvisningen inntroduserer deg for Piwigo og dens grunnleggende funksjoner. Den vil starte med å vise deg hvordan legge til bilder og administrere de. Omvisningen forsetter med album administrasjon og slutter med tilpasning ved å bruke innstillinger, temaer og tillegsprogrammer.';
 $lang['Take a tour and discover the features of your Piwigo gallery » Go to the available tours'] = 'Ta en omvisning og oppdag alle funksjonene i ditt Piwigo galleri » Gå til tilgjengelige omvisninger';
-$lang['TAT_descrp'] = 'Velkommen! Her er en liste over alle tilgjengelige omvisninger som vil hjelpe deg å oppdage funksjonene i ditt Piwigo galleri.<br><br> Start en omvisning nedenfor, følg deretter instruksjonene. Klikk på Neste/Forrige (eller bruk pilene på tastaturet) for å navigere i løpet av omvisningen. Mens du holder på med en omvisning og går til en annen side i administrasjonen, vil du bli omdirigert til den gjeldende siden i omvisningen. Hvis du står fast og ikke klarer å avslutte omvisningen, gå til <em> Tillegsprogrammer »Ta en omvisning </em> dette vil avslutte omvisningen.';
\ No newline at end of file
+$lang['TAT_descrp'] = 'Velkommen! Her er en liste over alle tilgjengelige omvisninger som vil hjelpe deg å oppdage funksjonene i ditt Piwigo galleri.<br><br> Start en omvisning nedenfor, følg deretter instruksjonene. Klikk på Neste/Forrige (eller bruk pilene på tastaturet) for å navigere i løpet av omvisningen. Mens du holder på med en omvisning og går til en annen side i administrasjonen, vil du bli omdirigert til den gjeldende siden i omvisningen. Hvis du står fast og ikke klarer å avslutte omvisningen, gå til <em> Tillegsprogrammer »Ta en omvisning </em> dette vil avslutte omvisningen.';
+$lang['2.8 Tour'] = '2.8 Omvisning tur';
+$lang['2_8_0_descrp'] = 'Utforsk Piwigo 2.8 sine nye funksjoner. Les detaljer om <a href="%s"> siste utgivelse.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/nl_NL/plugin.lang.php b/sources/plugins/TakeATour/language/nl_NL/plugin.lang.php
index 78f40ed..d94683a 100755
--- a/sources/plugins/TakeATour/language/nl_NL/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/nl_NL/plugin.lang.php
@@ -36,4 +36,6 @@ $lang['2.7 Tour'] = '2.7 rondleiding';
 $lang['2_7_0_descrp'] = 'Ontdek wat er nieuw is in Piwigo 2.7';
 
 $lang['privacy_descrp'] = 'Deze rondleiding toont alle manieren om je foto te beschermen tegen openbare toegang met behulp van toestemmingssytemen per album en per afbeelding. En ook tegen kopiëren door middel van afbeeldingsbescherming.';
-$lang['Privacy'] = 'Privé';
\ No newline at end of file
+$lang['Privacy'] = 'Privé';
+$lang['2_8_0_descrp'] = 'Ontdek nieuwe mogelijkheden van Piwigo 2.8. Lees de details in <a href="%s">de release notes</a>.';
+$lang['2.8 Tour'] = '2.8 Rondleiding';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/pt_BR/plugin.lang.php b/sources/plugins/TakeATour/language/pt_BR/plugin.lang.php
index d1d7c7c..b075707 100755
--- a/sources/plugins/TakeATour/language/pt_BR/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/pt_BR/plugin.lang.php
@@ -36,4 +36,6 @@ $lang['2.7 Tour'] = '2.7 Tour';
 $lang['2_7_0_descrp'] = 'Descubra o que há de novo no Piwigo 2.7';
 
 $lang['privacy_descrp'] = 'Este tour irá apresentar-lhe todas as maneiras de proteger suas foto do acesso público com os sistemas de permissão por álbum e por imagem, e de copiar usando proteções de imagem.';
-$lang['Privacy'] = 'Privacidade';
\ No newline at end of file
+$lang['Privacy'] = 'Privacidade';
+$lang['2.8 Tour'] = '2.8 Tour';
+$lang['2_8_0_descrp'] = 'Descubra alguns novos recursos do Piwik 2.8. Leia mais detalhes nas <a href="%s">notas de lançamento</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/ru_RU/plugin.lang.php b/sources/plugins/TakeATour/language/ru_RU/plugin.lang.php
index 597cce3..b8f565e 100755
--- a/sources/plugins/TakeATour/language/ru_RU/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/ru_RU/plugin.lang.php
@@ -15,4 +15,6 @@ $lang['2_7_0_descrp'] = 'Что нового в Piwigo 2.7';
 $lang['2.7 Tour'] = 'Тур по версии 2.7';
 
 $lang['privacy_descrp'] = 'Этот тур раскроет Вам все способы защиты изображений из публичного доступа через системы разрешений для альбомов и изображений, а также защиты изображения от копирования';
-$lang['Privacy'] = 'Конфиденциальность';
\ No newline at end of file
+$lang['Privacy'] = 'Конфиденциальность';
+$lang['2.8 Tour'] = 'Тур по Piiwigo 2.8';
+$lang['2_8_0_descrp'] = 'Откройте новые возможности Piiwigo 2.8. Читайте подробности по адресу <a href="%s">Заметки к релизу</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/sk_SK/plugin.lang.php b/sources/plugins/TakeATour/language/sk_SK/plugin.lang.php
index d5eed6b..329c7c0 100755
--- a/sources/plugins/TakeATour/language/sk_SK/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/sk_SK/plugin.lang.php
@@ -33,4 +33,6 @@ $lang['First Contact'] = 'Prvý kontakt';
 $lang['End tour'] = 'Koniec prehliadky';
 $lang['2_7_0_descrp'] = 'Zistite, čo je nové v Piwigo 2.7';
 $lang['2.7 Tour'] = '2.7 Tour';
-$lang['Privacy'] = 'O ochrane osobných údajov';
\ No newline at end of file
+$lang['Privacy'] = 'O ochrane osobných údajov';
+$lang['2_8_0_descrp'] = 'Objavte niektoré nové funkcie Piwigo 2.8. Prečítajte si podrobnosti v <a href="%s">poznámkach k vydaniu</a>.';
+$lang['2.8 Tour'] = 'Prehliadka 2.8';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/sl_SI/plugin.lang.php b/sources/plugins/TakeATour/language/sl_SI/plugin.lang.php
index 4e5818f..102851e 100755
--- a/sources/plugins/TakeATour/language/sl_SI/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/sl_SI/plugin.lang.php
@@ -36,4 +36,6 @@ $lang['Privacy'] = 'Zasebnost';
 $lang['Visit your Piwigo!'] = 'Oglejte si vaš Piwigo!';
 $lang['takeatour_configpage'] = 'Začni predtavitev';
 $lang['privacy_descrp'] = 'Ta predstavitev vam prikaže vse možnosti zaščite fotografij pred javnim dostopom s pomočjo nastavitev pravic po Albumih in po fotografijah in zaščito pred kopiranjem z uporabo zaščite fotografij ';
-$lang['first_contact_descrp'] = 'Ta predstavitev je namenjena začetnikom, predstavi vam osnovne lastnosti Piwigo galerije in se prične s predstavitvijo kako dodati fotografije in jih nato upravljati. Predstavitev se nadaljuje z upravljanjem Albumov in se konča s predstavitvijo prilagajanja Piwigo z uporabo Konfiguracije, spreminjanje izgleda (Teme) in uporabo Vtičnikov.';
\ No newline at end of file
+$lang['first_contact_descrp'] = 'Ta predstavitev je namenjena začetnikom, predstavi vam osnovne lastnosti Piwigo galerije in se prične s predstavitvijo kako dodati fotografije in jih nato upravljati. Predstavitev se nadaljuje z upravljanjem Albumov in se konča s predstavitvijo prilagajanja Piwigo z uporabo Konfiguracije, spreminjanje izgleda (Teme) in uporabo Vtičnikov.';
+$lang['2.8 Tour'] = '2.8 Predstavitev';
+$lang['2_8_0_descrp'] = 'Odkrijte nekatere novosti Piwigo 2.8. Preberite podrobnosti v <a href="%s">opambah ob izdaji</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/sr_RS/plugin.lang.php b/sources/plugins/TakeATour/language/sr_RS/plugin.lang.php
index e7e57cc..4c4d319 100644
--- a/sources/plugins/TakeATour/language/sr_RS/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/sr_RS/plugin.lang.php
@@ -1,24 +1,24 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 $lang['takeatour_configpage'] = 'Крени у обилазак » Списак обиласка';
 $lang['Take a tour and discover the features of your Piwigo gallery » Go to the available tours'] = 'Крените у обилазак занимљивих могућности Piwigo галерије » Иди на доступне обиласке';
@@ -33,4 +33,6 @@ $lang['Next '] = 'Наредно';
 $lang['Prev'] = 'Претходно';
 $lang['Privacy'] = 'Приватност';
 $lang['Start the Tour'] = 'Започни обилазак';
-$lang['TAT_descrp'] = 'Добродошли! Овде се налази списак доступних упутстава која ће вас провести кроз Piwigo галерију.<br><br>Покрените неки од обиласка, а затим следите упутства. За кретање кликните на Наредно/Претходно или користите стрелице на вашој тастатури. Док сте у обиласку, одлазак на другу администраторску страницу ће вас преусмерити на тренутну страницу обилсака. Уколико се изгубите и не можете да напустите обилазак, идите на <em>Додаци » Крени у обилазак</em>.';
\ No newline at end of file
+$lang['TAT_descrp'] = 'Добродошли! Овде се налази списак доступних упутстава која ће вас провести кроз Piwigo галерију.<br><br>Покрените неки од обиласка, а затим следите упутства. За кретање кликните на Наредно/Претходно или користите стрелице на вашој тастатури. Док сте у обиласку, одлазак на другу администраторску страницу ће вас преусмерити на тренутну страницу обилсака. Уколико се изгубите и не можете да напустите обилазак, идите на <em>Додаци » Крени у обилазак</em>.';
+$lang['2.8 Tour'] = 'Обилазак верзије 2.8';
+$lang['2_8_0_descrp'] = 'Откријте нове могућности у Piwigo верзији 2.8. Више на <a href="%s">страници са новостима</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/sv_SE/plugin.lang.php b/sources/plugins/TakeATour/language/sv_SE/plugin.lang.php
index c0fcee2..f219e7c 100755
--- a/sources/plugins/TakeATour/language/sv_SE/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/sv_SE/plugin.lang.php
@@ -34,4 +34,6 @@ $lang['Take a tour and discover the features of your Piwigo gallery » Go to the
 $lang['Visit your Piwigo!'] = 'Besök ditt Piwigo!';
 $lang['first_contact_descrp'] = 'Rekommenderas för nybörjare. Denna rundtur presenterar Piwigo och de grundläggande funktionerna. Den börjar med att visa hur du lägger till bilder och sedan hur du hanterar dem. Rundturen fortsätter sedan med albumhantering och slutar med anpassningar via konfigurationer, teman och insticksmoduler.';
 $lang['privacy_descrp'] = 'Rundturen visar alla sätt att skydda ditt foto från allmän åtkomst med rättigheter per album och per foto, och från kopiering.';
-$lang['takeatour_configpage'] = 'Ta en rundtur » Lista över rundturer';
\ No newline at end of file
+$lang['takeatour_configpage'] = 'Ta en rundtur » Lista över rundturer';
+$lang['2.8 Tour'] = '2.8 rundtur';
+$lang['2_8_0_descrp'] = 'Upptäck <a href="%s">nya funktioner i Piwigo 2.8</a>.';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/sv_SE/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/sv_SE/tour_first_contact.lang.php
index bc13246..73a2301 100644
--- a/sources/plugins/TakeATour/language/sv_SE/tour_first_contact.lang.php
+++ b/sources/plugins/TakeATour/language/sv_SE/tour_first_contact.lang.php
@@ -16,4 +16,58 @@ $lang['first_contact_title5'] = '';
 $lang['first_contact_title6'] = '';
 $lang['first_contact_title7'] = '';
 $lang['first_contact_title8'] = '';
-$lang['first_contact_stp1'] = 'Hej! Jag är din Guide för att upptäcka Piwigo! Följ mina instruktioner och klicka på "Nästa"(eller använd piltangenterna på ditt tangentbord) för att navigera. Går du till en anna del av Administrationen så får du en annan sekvens av denna Guide, relevant för den sidan. Fastnar detta, kan du gå till <em>Plugins > Take a Tour</em>så stannar den. Låt oss börja med att lägga till några bilder!';
\ No newline at end of file
+$lang['first_contact_stp1'] = 'Hej! Jag är din Guide för att upptäcka Piwigo! Följ mina instruktioner och klicka på "Nästa"(eller använd piltangenterna på ditt tangentbord) för att navigera. Går du till en anna del av Administrationen så får du en annan sekvens av denna Guide, relevant för den sidan. Fastnar detta, kan du gå till <em>Plugins > Take a Tour</em>så stannar den. Låt oss börja med att lägga till några bilder!';
+$lang['first_contact_stp38'] = 'Tillägg är ett enkelt sätt att hantera din Piwigo med. De kan göra nästan allt du kan tänka dig, från små text-tillägg till hela presentationer, som tex Gemenskaps-tillägget som tillåter icke-administratörer att ladda upp utan att gå in i administrations-delen.';
+$lang['first_contact_stp37'] = 'För att installera nya temor, kan man ladda ner dem direkt från fliken "Lägg till tema". Bara de temor som är kompatibla med din Piwigo-version visas.<br><br>Låt oss undersöka tillägen nu! Klicka på <em>Tillägg » Hantera</em>';
+$lang['first_contact_stp34'] = 'Att välja ett tema är det första steget för att kustomisera din Piwigo. Installerade teman listas här.
+<br>Mer än ett tema kan aktiveras: användare kan ändra sina teman genom att välja ett av de aktiverade temorna här, om valet "Tillåt användar-kustomisering" är förbockat på Inställningssidan.';
+$lang['first_contact_stp33'] = 'Bara ett sista ord om inställningarna, Gäst-inställingarna är för att ställa in preferenserna för oregistrerade besökare. Varje gång Piwigo refererar till en "gäst", betyder det en oregistrerad besökare.
+<br>Låt oss fortsätta med konfigurationen: klicka på <em>Konfiguration » Teman</em> eller klicka på Nästa.';
+$lang['first_contact_stp32'] = 'Spara ändringarna nu';
+$lang['first_contact_stp31'] = 'Sen baneren, som kommer att synas högst upp på alla sidor. Som du kan se, är HTML-taggar tillåtna här. Du kan också använda %gallery_title%-taggen för att visa titeln du just skrev in ovan.';
+$lang['first_contact_title9'] = 'Batch Managern';
+$lang['first_contact_title43'] = 'Det har varit fantastiskt';
+$lang['first_contact_title4'] = 'Låt oss lägga till ett foto!';
+$lang['first_contact_title38'] = 'Tillägg';
+$lang['first_contact_title39'] = 'Tillägg';
+$lang['first_contact_title35'] = 'Teman';
+$lang['first_contact_title37'] = 'Teman';
+$lang['first_contact_title34'] = 'Teman';
+$lang['first_contact_title33'] = 'Gäst-inställningar';
+$lang['first_contact_title3'] = 'Lägg till foto-sidan';
+$lang['first_contact_title29'] = '<em>Konfiguration » Inställningar » Generellt</em>';
+$lang['first_contact_title28'] = 'Konfiguration';
+$lang['first_contact_title22'] = 'Editeringssida för album';
+$lang['first_contact_title21'] = 'Andra flikar';
+$lang['first_contact_title20'] = 'Hantera album';
+$lang['first_contact_title19'] = 'Hantera album';
+$lang['first_contact_title18'] = 'Hantera album';
+$lang['first_contact_title15'] = 'Editeringssidan för ett foto';
+$lang['first_contact_title11'] = 'Hur man editerar ett foto';
+$lang['first_contact_title1'] = 'Välkommen till ditt Piwigo-galleri';
+$lang['first_contact_stp8'] = 'Låt oss editera dem! Klicka på länken';
+$lang['first_contact_stp6'] = 'Du ser att foton listas. När du är klar, klicka på knappen Börja Uppladdning';
+$lang['first_contact_stp5'] = 'Klicka sen på knappen för att välja foton att sända, eller dra och släpp dina filer.';
+$lang['first_contact_stp4'] = 'Välj ett album först; skapa ett om det inte finns något än.';
+$lang['first_contact_stp35'] = 'Sätt ditt favorittema som standardtema.';
+$lang['first_contact_stp19'] = 'Här listas "rot"-albumen. Om du ser ett album med en streckad bakgrund, betyder det att det är ett fysiskt album från en FTp-synkronisering. Fysiska album kan inte flyttas eller tas bort härifrån. De andra albumen kallas virtuella album.';
+$lang['first_contact_stp3'] = 'På första fliken kan man lägga till foton direkt from webbläsaren. De andra flikarna är för andra sätt att ladda upp foton';
+$lang['first_contact_stp28'] = 'Nu ska vi titta på valen som finns för att få Piwigo att bete sig precis som vi vill. Klicka på Konfiguration->Inställningar eller klicka på Nästa.';
+$lang['first_contact_stp23'] = 'Att låsa ett album, innebär att bara en administratör kommer att kunna se albumet: detta är användbart när man förbereder ett album för publicering';
+$lang['first_contact_stp21'] = 'Nästa flik är en sida där du kan flytta omkring alla virtuella album.<br>Permallink-fliken är satt till en specifik URL for albumet.<br>Låt oss editera ett album';
+$lang['first_contact_stp20'] = 'När din muspekare hovraröver ett album, syns länkar och information. När du drar och släpper ett album - ett rundat block - , kommer du att ändra dess position och kan då spara eller ångra din manuella sorteringsinställning.';
+$lang['first_contact_stp19_b'] = 'Här listas "rot"-albumen.';
+$lang['first_contact_stp17'] = 'Här kan man sätta ett foto som tumnagel för ett eller flera album.  Fotot behöver inte vara associerat med albumet på något sätt för att sättas som tumnagel. Om fotot är associerat med albumet, är det ännu enklare att sätta det som album-tumnagel från den publika sidan. (Tips: Använd tillägget Admin Tools för ännu enklare hantering).';
+$lang['first_contact_stp16'] = 'i vilket album fotot ska vara.<br><br>Här kan man ta bort eller lägga till foton från album. Länken är virtuell, inga foton kommer någonsin att flyttas fysiskt.';
+$lang['first_contact_stp14'] = 'Nu ser vi <b>editeringssidan</b> för ett foto. Denna sida är tillgänglig härifrån men också från den publika fotosidan när man är påloggad som administratör.<br><br>Hovra över tumnageln och klicka sen på Editera.';
+$lang['first_contact_stp13'] = 'Du kan editera beskrivningar och annat från Batch Managern i singel-läget. Men låt oss stanna i det globala läget för tillfället';
+$lang['first_contact_stp12'] = 'och sen editera dem med en åtgärd';
+$lang['first_contact_stp10'] = 'Här är länken för direkt-åtkomst till caddien: Det är ett verktyg för administratörerna att enkelt kunna välja foton när man bläddrar i den publika delen och sen editera dem i Batch Managern.<br>
+<br>Du kan lägga till foton i caddien från den publika fotosidan när du är inloggad som en admin, eller genom åtgärden "Lägg till i caddien" i Batch Managern.';
+$lang['first_contact_stp30'] = 'Låt oss börja med att ändra titeln';
+$lang['first_contact_stp29'] = 'Här, på den första sidan, ställer man in de nödvändiga och grundläggande konfigurationerna på ditt galleri';
+$lang['first_contact_stp22'] = 'Som för ett foto, kan man editera albumets egenskaper';
+$lang['first_contact_stp2'] = 'Här är länken. Klicka på den eller klicka Nästa för att fortsätta';
+$lang['first_contact_stp18'] = 'Låt oss se hur hanterar album nu. Klicka <em>På album » Hantera</em> eller klicka på Nästa';
+$lang['first_contact_stp15'] = 'På denna sida kan du editera alla egenskaper för ett foto, till exempel...';
+$lang['first_contact_stp11'] = 'Härifrån kan du välja ett eller flera foton';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/tr_TR/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/tr_TR/tour_first_contact.lang.php
index c69edc8..22aae01 100644
--- a/sources/plugins/TakeATour/language/tr_TR/tour_first_contact.lang.php
+++ b/sources/plugins/TakeATour/language/tr_TR/tour_first_contact.lang.php
@@ -1,24 +1,24 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 $lang['first_contact_title28'] = 'Yapılandırma';
 $lang['first_contact_title33'] = 'Misafir ayarları';
@@ -30,4 +30,17 @@ $lang['first_contact_title34'] = 'Temalar';
 $lang['first_contact_title35'] = 'Temalar';
 $lang['first_contact_title37'] = 'Temalar';
 $lang['first_contact_title38'] = 'Eklentiler';
-$lang['first_contact_title39'] = 'Eklentiler';
\ No newline at end of file
+$lang['first_contact_title39'] = 'Eklentiler';
+$lang['first_contact_title11'] = 'Bir foto nasıl düzenlenir';
+$lang['first_contact_title15'] = 'Foto düzenleme sayfası';
+$lang['first_contact_title21'] = 'Diğer Sekmeler';
+$lang['first_contact_title22'] = 'Albüm Düzenleme Sayfası';
+$lang['first_contact_title3'] = 'Foto Sayfası Ekle ';
+$lang['first_contact_title43'] = 'Harika bir zaman oldu';
+$lang['first_contact_title9'] = 'Toplu İş Yöneticisi';
+$lang['first_contact_title29'] = '<em>Yapılandırma  » Seçenekler » Genel</em>';
+$lang['first_contact_stp30'] = 'Başlangıç olarak başlığı değiştirelim';
+$lang['first_contact_stp32'] = 'Şimdi değiştirdikleri kaydet';
+$lang['first_contact_stp35'] = 'En sevdiğin tema varsayılan olarak belirle.';
+$lang['first_contact_stp4'] = 'Önce bir albüm seç; albüm bulunmazsa bir tane oluştur.';
+$lang['first_contact_title1'] = 'Piwigo Galeri\'de Hoş Geldin';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/language/zh_CN/plugin.lang.php b/sources/plugins/TakeATour/language/zh_CN/plugin.lang.php
index 7079559..a71e75f 100755
--- a/sources/plugins/TakeATour/language/zh_CN/plugin.lang.php
+++ b/sources/plugins/TakeATour/language/zh_CN/plugin.lang.php
@@ -36,4 +36,6 @@ $lang['2.7 Tour'] = 'Piwigo 2.7 导览';
 $lang['2_7_0_descrp'] = '探索 Piwigo 2.7 的新特性';
 
 $lang['privacy_descrp'] = '本导览向您展示通过涵盖每个相册及每张图片的许可系统保护您的图片免于公共访问的各种方法，以及通过图片保护防止拷贝。';
-$lang['Privacy'] = '隐私';
\ No newline at end of file
+$lang['Privacy'] = '隐私';
+$lang['2_8_0_descrp'] = '探索 Piwigo 2.8 的一些新特性。详见 <a href="%s">发布公告</a>。';
+$lang['2.8 Tour'] = '2.8 导览';
\ No newline at end of file
diff --git a/sources/plugins/TakeATour/main.inc.php b/sources/plugins/TakeATour/main.inc.php
index c71b89b..f5673c7 100644
--- a/sources/plugins/TakeATour/main.inc.php
+++ b/sources/plugins/TakeATour/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Take A Tour of Your Piwigo
-Version: 2.7.4
+Version: 2.8.2
 Description: Visit your Piwigo to discover its features. This plugin has multiple thematic tours for beginners and advanced users.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=776
 Author:Piwigo Team
@@ -29,7 +29,7 @@ elseif ( isset($_GET['tour_ended']) and defined('IN_ADMIN') and IN_ADMIN )
 /*
  * CHANGE FOR RELEASE
 $version_=str_replace('.','_',PHPWG_VERSION);*/
-$version_="2_7_0";
+$version_="2_8_0";
 /***/
 if (pwg_get_session_var('tour_to_launch')!='tours/'.$version_ and isset($_GET['page']) and $_GET['page']=="plugin-TakeATour")
 { 
@@ -42,6 +42,11 @@ elseif ( pwg_get_session_var('tour_to_launch') )
 
 function TAT_tour_setup()
 {
+  if (!is_admin())
+  {
+    return;
+  }
+
   global $template, $TAT_restart, $conf;
   $tour_to_launch=pwg_get_session_var('tour_to_launch');
   load_language('plugin.lang', PHPWG_PLUGINS_PATH .'TakeATour/', array('force_fallback'=>'en_UK'));
@@ -61,8 +66,15 @@ function TAT_tour_setup()
   $tat_path=str_replace(basename($_SERVER['SCRIPT_NAME']),'', $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']);
   $template->assign('TAT_path', $tat_path);
   $template->assign('ABS_U_ADMIN', get_absolute_root_url());// absolute one due to public pages and $conf['question_mark_in_urls'] = false+$conf['php_extension_in_urls'] = false;
+
+  // some tours may need admin functions (like 2_8_0 needs get_orphans)
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+
   include($tour_to_launch.'/config.inc.php');
   $template->set_filename('TAT_tour_tpl', $TOUR_PATH);
+
+  trigger_notify('TAT_before_parse_tour');
+
   $template->parse('TAT_tour_tpl');
 }
 
@@ -119,4 +131,4 @@ function TAT_admin_menu($menu)
   );
   return $menu;
 }
-?>
\ No newline at end of file
+?>
diff --git a/sources/plugins/TakeATour/tpl/admin.tpl b/sources/plugins/TakeATour/tpl/admin.tpl
index c89494f..2ec113f 100644
--- a/sources/plugins/TakeATour/tpl/admin.tpl
+++ b/sources/plugins/TakeATour/tpl/admin.tpl
@@ -1,3 +1,7 @@
+{footer_script require="jquery"}
+jQuery('.TAT_description a[href*="piwigo.org"]').addClass("externalLink");
+{/footer_script}
+
 <div class="titrePage">
   <h2>{'takeatour_configpage'|@translate}</h2>
 </div>
@@ -25,6 +29,17 @@
     </form>
   </fieldset>
   {/if}
+  {if !isset($TAT_tour_ignored) or (isset($TAT_tour_ignored) and in_array(2_8_0, $TAT_tour_ignored))}
+  <fieldset>
+    <legend>{'2.8 Tour'|@translate}</legend>
+    <div class="TAT_description">{'2_8_0_descrp'|@translate|sprintf:$TAT_28URL}</div>
+    <form action="{$F_ACTION}" method="post">
+      <input type="hidden" name="submited_tour_path" value="tours/2_8_0">
+      <input type="hidden" name="pwg_token" value="{$pwg_token}">
+      <input type="submit" name="button2" id="button2" value="{'Start the Tour'|@translate}">
+    </form>
+  </fieldset>
+  {/if}
   {if !isset($TAT_tour_ignored) or (isset($TAT_tour_ignored) and in_array(2_7_0, $TAT_tour_ignored))}
   <fieldset>
     <legend>{'2.7 Tour'|@translate}</legend>
diff --git a/sources/plugins/index.php b/sources/plugins/index.php
index c8de97f..0b96c3e 100644
--- a/sources/plugins/index.php
+++ b/sources/plugins/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/plugins/language_switch/language_switch.css b/sources/plugins/language_switch/language_switch.css
index 356a43e..9cdbe29 100644
--- a/sources/plugins/language_switch/language_switch.css
+++ b/sources/plugins/language_switch/language_switch.css
@@ -88,6 +88,7 @@
 .langflag-ec { background-position:0px -64px; }
 .langflag-et_EE { background-position:-24px -64px; }
 .langflag-eg { background-position:-48px -64px; }
+.langflag-ar_EG { background-position:-48px -64px; }
 .langflag-eh { background-position:-72px -64px; }
 .langflag-en_UK { background-position:-96px -64px; }
 .langflag-eo_EO { background-position:-120px -64px; }
diff --git a/sources/plugins/language_switch/main.inc.php b/sources/plugins/language_switch/main.inc.php
index 8af8a23..cac2b35 100644
--- a/sources/plugins/language_switch/main.inc.php
+++ b/sources/plugins/language_switch/main.inc.php
@@ -23,7 +23,7 @@
 
 /*
 Plugin Name: Language Switch
-Version: 2.7.1
+Version: 2.8.2
 Description: Switch to another language from flags on your gallery home page.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=123
 Author: Piwigo team
@@ -39,4 +39,4 @@ include_once(LANGUAGE_SWITCH_PATH.'language_switch.inc.php');
 add_event_handler('loading_lang', 'language_controler_switch', 5 );
 add_event_handler('loc_end_index', 'language_controler_flags', 95 );
 
-?>
\ No newline at end of file
+?>
diff --git a/sources/plugins/language_switch/style.css b/sources/plugins/language_switch/style.css
index 55992d3..476ab4a 100644
--- a/sources/plugins/language_switch/style.css
+++ b/sources/plugins/language_switch/style.css
@@ -20,4 +20,10 @@
 }
 #languageSwitchBox a:hover {
   color:#ddd;
-}
\ No newline at end of file
+}
+
+[class*="langflag-"] {
+  overflow: hidden;
+  text-indent: -9999px;
+  vertical-align: bottom;
+}
diff --git a/sources/popuphelp.php b/sources/popuphelp.php
index 52958d2..f8bb08c 100644
--- a/sources/popuphelp.php
+++ b/sources/popuphelp.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/profile.php b/sources/profile.php
index 372f5cc..3f60fde 100644
--- a/sources/profile.php
+++ b/sources/profile.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -207,6 +207,8 @@ function save_profile_from_post($userdata, &$errors)
         $fields[] = $conf['user_fields']['password'];
         // password is hashed with function $conf['password_hash']
         $data{$conf['user_fields']['password']} = $conf['password_hash']($_POST['use_new_pwd']);
+
+        deactivate_user_auth_keys($userdata['id']);
       }
       
       // username is updated only if allowed
diff --git a/sources/qsearch.php b/sources/qsearch.php
index a19efa5..f614e83 100644
--- a/sources/qsearch.php
+++ b/sources/qsearch.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/random.php b/sources/random.php
index 74cad94..7577303 100644
--- a/sources/random.php
+++ b/sources/random.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/register.php b/sources/register.php
index 9f95d51..40897af 100644
--- a/sources/register.php
+++ b/sources/register.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/search.php b/sources/search.php
index e4528ea..f8f0a19 100644
--- a/sources/search.php
+++ b/sources/search.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -72,6 +72,11 @@ if (isset($_POST['submit']))
       'mode' => $_POST['mode'],
       'fields' => $_POST['fields'],
       );
+
+    if (isset($_POST['search_in_tags']))
+    {
+      $search['fields']['search_in_tags'] = true;
+    }
   }
 
   if (isset($_POST['tags']))
@@ -119,7 +124,7 @@ if (isset($_POST['submit']))
   {
     $search['fields'][$type_date.'-after'] = array(
       'date' => sprintf(
-        '%d-%02d-%02d',
+        '%d-%02d-%02d 00:00:00',
         $_POST['start_year'],
         $_POST['start_month'] != 0 ? $_POST['start_month'] : '01',
         $_POST['start_day']   != 0 ? $_POST['start_day']   : '01'
@@ -132,7 +137,7 @@ if (isset($_POST['submit']))
   {
     $search['fields'][$type_date.'-before'] = array(
       'date' => sprintf(
-        '%d-%02d-%02d',
+        '%d-%02d-%02d 23:59:59',
         $_POST['end_year'],
         $_POST['end_month'] != 0 ? $_POST['end_month'] : '12',
         $_POST['end_day']   != 0 ? $_POST['end_day']   : '31'
diff --git a/sources/search_rules.php b/sources/search_rules.php
index 34854d2..7ec39ac 100644
--- a/sources/search_rules.php
+++ b/sources/search_rules.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/tags.php b/sources/tags.php
index f4ac851..b781830 100644
--- a/sources/tags.php
+++ b/sources/tags.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/template-extension/index.php b/sources/template-extension/index.php
index c8de97f..0b96c3e 100644
--- a/sources/template-extension/index.php
+++ b/sources/template-extension/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/template-extension/yoga/index.php b/sources/template-extension/yoga/index.php
index c8de97f..0b96c3e 100644
--- a/sources/template-extension/yoga/index.php
+++ b/sources/template-extension/yoga/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/template-extension/yoga/local/index.php b/sources/template-extension/yoga/local/index.php
index c8de97f..0b96c3e 100644
--- a/sources/template-extension/yoga/local/index.php
+++ b/sources/template-extension/yoga/local/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/Sylvia/icon/index.php b/sources/themes/Sylvia/icon/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/Sylvia/icon/index.php
+++ b/sources/themes/Sylvia/icon/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/Sylvia/icon/mimetypes/index.php b/sources/themes/Sylvia/icon/mimetypes/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/Sylvia/icon/mimetypes/index.php
+++ b/sources/themes/Sylvia/icon/mimetypes/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/Sylvia/index.php b/sources/themes/Sylvia/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/Sylvia/index.php
+++ b/sources/themes/Sylvia/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/Sylvia/themeconf.inc.php b/sources/themes/Sylvia/themeconf.inc.php
index 0ca6ae4..27a3bbc 100644
--- a/sources/themes/Sylvia/themeconf.inc.php
+++ b/sources/themes/Sylvia/themeconf.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Theme Name: Sylvia
-Version: 2.7.0
+Version: 2.8.2
 Description: Dark background, flora and pink decorations.
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=368
 Author: Piwigo team
diff --git a/sources/themes/clear/index.php b/sources/themes/clear/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/clear/index.php
+++ b/sources/themes/clear/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/clear/themeconf.inc.php b/sources/themes/clear/themeconf.inc.php
index c10d3cf..0d74687 100644
--- a/sources/themes/clear/themeconf.inc.php
+++ b/sources/themes/clear/themeconf.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Theme Name: clear
-Version: 2.7.0
+Version: 2.8.2
 Description: White background, soft gray.
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=9
 Author: Piwigo team
diff --git a/sources/themes/dark/images/index.php b/sources/themes/dark/images/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/dark/images/index.php
+++ b/sources/themes/dark/images/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/dark/index.php b/sources/themes/dark/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/dark/index.php
+++ b/sources/themes/dark/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/dark/themeconf.inc.php b/sources/themes/dark/themeconf.inc.php
index 6da1d7c..c8d89d5 100644
--- a/sources/themes/dark/themeconf.inc.php
+++ b/sources/themes/dark/themeconf.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Theme Name: dark
-Version: 2.7.0
+Version: 2.8.2
 Description: Dark background, grayscale.
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=369
 Author: Piwigo team
diff --git a/sources/themes/default/icon/index.php b/sources/themes/default/icon/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/default/icon/index.php
+++ b/sources/themes/default/icon/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/default/icon/mimetypes/index.php b/sources/themes/default/icon/mimetypes/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/default/icon/mimetypes/index.php
+++ b/sources/themes/default/icon/mimetypes/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/default/images/index.php b/sources/themes/default/images/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/default/images/index.php
+++ b/sources/themes/default/images/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/default/index.php b/sources/themes/default/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/default/index.php
+++ b/sources/themes/default/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/default/js/jquery.js b/sources/themes/default/js/jquery.js
index d4b67f7..6feb110 100644
--- a/sources/themes/default/js/jquery.js
+++ b/sources/themes/default/js/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.11.1
+ * jQuery JavaScript Library v1.11.3
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2014-05-01T17:42Z
+ * Date: 2015-04-28T16:19Z
  */
 
 (function( global, factory ) {
@@ -64,7 +64,7 @@ var support = {};
 
 
 var
-	version = "1.11.1",
+	version = "1.11.3",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -269,7 +269,8 @@ jQuery.extend({
 		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
 		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
 		// subtraction forces infinities to NaN
-		return !jQuery.isArray( obj ) && obj - parseFloat( obj ) >= 0;
+		// adding 1 corrects loss of precision from parseFloat (#15100)
+		return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
 	},
 
 	isEmptyObject: function( obj ) {
@@ -568,7 +569,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
 });
 
 function isArraylike( obj ) {
-	var length = obj.length,
+
+	// Support: iOS 8.2 (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = "length" in obj && obj.length,
 		type = jQuery.type( obj );
 
 	if ( type === "function" || jQuery.isWindow( obj ) ) {
@@ -584,14 +590,14 @@ function isArraylike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v1.10.19
+ * Sizzle CSS Selector Engine v2.2.0-pre
  * http://sizzlejs.com/
  *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
+ * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2014-04-18
+ * Date: 2014-12-16
  */
 (function( window ) {
 
@@ -618,7 +624,7 @@ var i,
 	contains,
 
 	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
+	expando = "sizzle" + 1 * new Date(),
 	preferredDoc = window.document,
 	dirruns = 0,
 	done = 0,
@@ -633,7 +639,6 @@ var i,
 	},
 
 	// General-purpose constants
-	strundefined = typeof undefined,
 	MAX_NEGATIVE = 1 << 31,
 
 	// Instance methods
@@ -643,12 +648,13 @@ var i,
 	push_native = arr.push,
 	push = arr.push,
 	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
+	// Use a stripped-down indexOf as it's faster than native
+	// http://jsperf.com/thor-indexof-vs-for/5
+	indexOf = function( list, elem ) {
 		var i = 0,
-			len = this.length;
+			len = list.length;
 		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
+			if ( list[i] === elem ) {
 				return i;
 			}
 		}
@@ -688,6 +694,7 @@ var i,
 		")\\)|)",
 
 	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rwhitespace = new RegExp( whitespace + "+", "g" ),
 	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
 
 	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
@@ -739,6 +746,14 @@ var i,
 				String.fromCharCode( high + 0x10000 ) :
 				// Supplemental Plane codepoint (surrogate pair)
 				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	},
+
+	// Used for iframes
+	// See setDocument()
+	// Removing the function wrapper causes a "Permission Denied"
+	// error in IE
+	unloadHandler = function() {
+		setDocument();
 	};
 
 // Optimize for push.apply( _, NodeList )
@@ -781,19 +796,18 @@ function Sizzle( selector, context, results, seed ) {
 
 	context = context || document;
 	results = results || [];
+	nodeType = context.nodeType;
+
+	if ( typeof selector !== "string" || !selector ||
+		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
 
-	if ( !selector || typeof selector !== "string" ) {
 		return results;
 	}
 
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
+	if ( !seed && documentIsHTML ) {
 
-	if ( documentIsHTML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
+		// Try to shortcut find operations when possible (e.g., not under DocumentFragment)
+		if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
 			// Speed-up: Sizzle("#ID")
 			if ( (m = match[1]) ) {
 				if ( nodeType === 9 ) {
@@ -825,7 +839,7 @@ function Sizzle( selector, context, results, seed ) {
 				return results;
 
 			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
+			} else if ( (m = match[3]) && support.getElementsByClassName ) {
 				push.apply( results, context.getElementsByClassName( m ) );
 				return results;
 			}
@@ -835,7 +849,7 @@ function Sizzle( selector, context, results, seed ) {
 		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
 			nid = old = expando;
 			newContext = context;
-			newSelector = nodeType === 9 && selector;
+			newSelector = nodeType !== 1 && selector;
 
 			// qSA works strangely on Element-rooted queries
 			// We can work around this by specifying an extra ID on the root
@@ -1022,7 +1036,7 @@ function createPositionalPseudo( fn ) {
  * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
  */
 function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== strundefined && context;
+	return context && typeof context.getElementsByTagName !== "undefined" && context;
 }
 
 // Expose support vars for convenience
@@ -1046,9 +1060,8 @@ isXML = Sizzle.isXML = function( elem ) {
  * @returns {Object} Returns the current document
  */
 setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare,
-		doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
+	var hasCompare, parent,
+		doc = node ? node.ownerDocument || node : preferredDoc;
 
 	// If no document and documentElement is available, return
 	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
@@ -1058,9 +1071,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Set our document
 	document = doc;
 	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsHTML = !isXML( doc );
+	parent = doc.defaultView;
 
 	// Support: IE>8
 	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
@@ -1069,21 +1080,22 @@ setDocument = Sizzle.setDocument = function( node ) {
 	if ( parent && parent !== parent.top ) {
 		// IE11 does not have attachEvent, so all must suffer
 		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", function() {
-				setDocument();
-			}, false );
+			parent.addEventListener( "unload", unloadHandler, false );
 		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", function() {
-				setDocument();
-			});
+			parent.attachEvent( "onunload", unloadHandler );
 		}
 	}
 
+	/* Support tests
+	---------------------------------------------------------------------- */
+	documentIsHTML = !isXML( doc );
+
 	/* Attributes
 	---------------------------------------------------------------------- */
 
 	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
+	// Verify that getAttribute really returns attributes and not properties
+	// (excepting IE8 booleans)
 	support.attributes = assert(function( div ) {
 		div.className = "i";
 		return !div.getAttribute("className");
@@ -1098,17 +1110,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 		return !div.getElementsByTagName("*").length;
 	});
 
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
+	// Support: IE<9
+	support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
 
 	// Support: IE<10
 	// Check if getElementById returns elements by name
@@ -1122,7 +1125,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// ID find and filter
 	if ( support.getById ) {
 		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var m = context.getElementById( id );
 				// Check parentNode to catch when Blackberry 4.6 returns
 				// nodes that are no longer in the document #6963
@@ -1143,7 +1146,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		Expr.filter["ID"] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+				var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
 				return node && node.value === attrId;
 			};
 		};
@@ -1152,14 +1155,20 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Tag
 	Expr.find["TAG"] = support.getElementsByTagName ?
 		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
 				return context.getElementsByTagName( tag );
+
+			// DocumentFragment nodes don't have gEBTN
+			} else if ( support.qsa ) {
+				return context.querySelectorAll( tag );
 			}
 		} :
+
 		function( tag, context ) {
 			var elem,
 				tmp = [],
 				i = 0,
+				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
 				results = context.getElementsByTagName( tag );
 
 			// Filter out possible comments
@@ -1177,7 +1186,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 	// Class
 	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
+		if ( documentIsHTML ) {
 			return context.getElementsByClassName( className );
 		}
 	};
@@ -1206,13 +1215,15 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// setting a boolean content attribute,
 			// since its presence should be enough
 			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select msallowclip=''><option selected=''></option></select>";
+			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
+				"<select id='" + expando + "-\f]' msallowcapture=''>" +
+				"<option selected=''></option></select>";
 
 			// Support: IE8, Opera 11-12.16
 			// Nothing should be selected when empty strings follow ^= or $= or *=
 			// The test attribute must be unknown in Opera but "safe" for WinRT
 			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowclip^='']").length ) {
+			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
 				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
 			}
 
@@ -1222,12 +1233,24 @@ setDocument = Sizzle.setDocument = function( node ) {
 				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
 			}
 
+			// Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+
+			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+				rbuggyQSA.push("~=");
+			}
+
 			// Webkit/Opera - :checked should return selected option elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			// IE8 throws error here and will not see later tests
 			if ( !div.querySelectorAll(":checked").length ) {
 				rbuggyQSA.push(":checked");
 			}
+
+			// Support: Safari 8+, iOS 8+
+			// https://bugs.webkit.org/show_bug.cgi?id=136851
+			// In-page `selector#id sibing-combinator selector` fails
+			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
+				rbuggyQSA.push(".#.+[+~]");
+			}
 		});
 
 		assert(function( div ) {
@@ -1344,7 +1367,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 			// Maintain original order
 			return sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
 				0;
 		}
 
@@ -1371,7 +1394,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 				aup ? -1 :
 				bup ? 1 :
 				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
 				0;
 
 		// If the nodes are siblings, we can do a quick check
@@ -1434,7 +1457,7 @@ Sizzle.matchesSelector = function( elem, expr ) {
 					elem.document && elem.document.nodeType !== 11 ) {
 				return ret;
 			}
-		} catch(e) {}
+		} catch (e) {}
 	}
 
 	return Sizzle( expr, document, null, [ elem ] ).length > 0;
@@ -1653,7 +1676,7 @@ Expr = Sizzle.selectors = {
 			return pattern ||
 				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
 				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
 				});
 		},
 
@@ -1675,7 +1698,7 @@ Expr = Sizzle.selectors = {
 					operator === "^=" ? check && result.indexOf( check ) === 0 :
 					operator === "*=" ? check && result.indexOf( check ) > -1 :
 					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
 					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
 					false;
 			};
@@ -1795,7 +1818,7 @@ Expr = Sizzle.selectors = {
 							matched = fn( seed, argument ),
 							i = matched.length;
 						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
+							idx = indexOf( seed, matched[i] );
 							seed[ idx ] = !( matches[ idx ] = matched[i] );
 						}
 					}) :
@@ -1834,6 +1857,8 @@ Expr = Sizzle.selectors = {
 				function( elem, context, xml ) {
 					input[0] = elem;
 					matcher( input, null, xml, results );
+					// Don't keep the element (issue #299)
+					input[0] = null;
 					return !results.pop();
 				};
 		}),
@@ -1845,6 +1870,7 @@ Expr = Sizzle.selectors = {
 		}),
 
 		"contains": markFunction(function( text ) {
+			text = text.replace( runescape, funescape );
 			return function( elem ) {
 				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
 			};
@@ -2266,7 +2292,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				i = matcherOut.length;
 				while ( i-- ) {
 					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
 
 						seed[temp] = !(results[temp] = elem);
 					}
@@ -2301,13 +2327,16 @@ function matcherFromTokens( tokens ) {
 			return elem === checkContext;
 		}, implicitRelative, true ),
 		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
+			return indexOf( checkContext, elem ) > -1;
 		}, implicitRelative, true ),
 		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
 				(checkContext = context).nodeType ?
 					matchContext( elem, context, xml ) :
 					matchAnyContext( elem, context, xml ) );
+			// Avoid hanging onto element (issue #299)
+			checkContext = null;
+			return ret;
 		} ];
 
 	for ( ; i < len; i++ ) {
@@ -2557,7 +2586,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 // Sort stability
 support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
 
-// Support: Chrome<14
+// Support: Chrome 14-35+
 // Always assume duplicates if they aren't passed to the comparison function
 support.detectDuplicates = !!hasDuplicate;
 
@@ -6115,7 +6144,14 @@ var getStyles, curCSS,
 
 if ( window.getComputedStyle ) {
 	getStyles = function( elem ) {
-		return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
+		// IE throws on elements created in popups
+		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+		if ( elem.ownerDocument.defaultView.opener ) {
+			return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+		}
+
+		return window.getComputedStyle( elem, null );
 	};
 
 	curCSS = function( elem, name, computed ) {
@@ -6363,6 +6399,8 @@ function addGetHookIf( conditionFn, hookFn ) {
 
 			reliableMarginRightVal =
 				!parseFloat( ( window.getComputedStyle( contents, null ) || {} ).marginRight );
+
+			div.removeChild( contents );
 		}
 
 		// Support: IE8
@@ -9070,7 +9108,8 @@ jQuery.extend({
 		}
 
 		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
+		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+		fireGlobals = jQuery.event && s.global;
 
 		// Watch for a new set of requests
 		if ( fireGlobals && jQuery.active++ === 0 ) {
@@ -9329,13 +9368,6 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 	};
 });
 
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-});
-
 
 jQuery._evalUrl = function( url ) {
 	return jQuery.ajax({
@@ -9561,8 +9593,9 @@ var xhrId = 0,
 
 // Support: IE<10
 // Open requests must be manually aborted on unload (#5280)
-if ( window.ActiveXObject ) {
-	jQuery( window ).on( "unload", function() {
+// See https://support.microsoft.com/kb/2856746 for more info
+if ( window.attachEvent ) {
+	window.attachEvent( "onunload", function() {
 		for ( var key in xhrCallbacks ) {
 			xhrCallbacks[ key ]( undefined, true );
 		}
@@ -9996,6 +10029,16 @@ jQuery.fn.load = function( url, params, callback ) {
 
 
 
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
+	};
+});
+
+
+
+
 jQuery.expr.filters.animated = function( elem ) {
 	return jQuery.grep(jQuery.timers, function( fn ) {
 		return elem === fn.elem;
diff --git a/sources/themes/default/js/jquery.min.js b/sources/themes/default/js/jquery.min.js
index ab28a24..0f60b7b 100644
--- a/sources/themes/default/js/jquery.min.js
+++ b/sources/themes/default/js/jquery.min.js
@@ -1,4 +1,5 @@
-/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;
-if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ab,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=bb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=bb),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function db(a){var b=eb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var eb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fb=/ jQuery\d+="(?:null|\d+)"/g,gb=new RegExp("<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/<tbody/i,lb=/<|&#?\w+;/,mb=/<(?:script|style|link)/i,nb=/checked\s*(?:[^=]|=\s*.checked.)/i,ob=/^$|\/(?:java|ecma)script/i,pb=/^true\/(.*)/,qb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,rb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"<table>"!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Cb[0].contentWindow||Cb[0].contentDocument).document,b.write(),b.close(),c=Eb(a,b),Cb.detach()),Db[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Gb=/^margin/,Hb=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ib,Jb,Kb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ib=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Hb.test(g)&&Gb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ib=function(a){return a.currentStyle},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Hb.test(g)&&!Kb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Lb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Mb=/alpha\([^)]*\)/i,Nb=/opacity\s*=\s*([^)]*)/,Ob=/^(none|table(?!-c[ea]).+)/,Pb=new RegExp("^("+S+")(.*)$","i"),Qb=new RegExp("^([+-])=("+S+")","i"),Rb={position:"absolute",visibility:"hidden",display:"block"},Sb={letterSpacing:"0",fontWeight:"400"},Tb=["Webkit","O","Moz","ms"];function Ub(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Tb.length;while(e--)if(b=Tb[e]+c,b in a)return b;return d}function Vb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fb(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wb(a,b,c){var d=Pb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Yb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ib(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Jb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Hb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xb(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Jb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ub(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ub(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Jb(a,b,d)),"normal"===f&&b in Sb&&(f=Sb[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Ob.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Rb,function(){return Yb(a,b,d)}):Yb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ib(a);return Wb(a,c,d?Xb(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Nb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Mb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Mb.test(f)?f.replace(Mb,e):f+" "+e)}}),m.cssHooks.marginRight=Lb(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Jb,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Gb.test(a)||(m.cssHooks[a+b].set=Wb)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ib(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Vb(this,!0)},hide:function(){return Vb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Zb(a,b,c,d,e){return new Zb.prototype.init(a,b,c,d,e)}m.Tween=Zb,Zb.prototype={constructor:Zb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")
-},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Zb.propHooks.scrollTop=Zb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Zb.prototype.init,m.fx.step={};var $b,_b,ac=/^(?:toggle|show|hide)$/,bc=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cc=/queueHooks$/,dc=[ic],ec={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bc.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bc.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fc(){return setTimeout(function(){$b=void 0}),$b=m.now()}function gc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hc(a,b,c){for(var d,e=(ec[b]||[]).concat(ec["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ic(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fb(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fb(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ac.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fb(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hc(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jc(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kc(a,b,c){var d,e,f=0,g=dc.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$b||fc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$b||fc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jc(k,j.opts.specialEasing);g>f;f++)if(d=dc[f].call(j,a,k,j.opts))return d;return m.map(k,hc,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kc,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ec[c]=ec[c]||[],ec[c].unshift(b)},prefilter:function(a,b){b?dc.unshift(a):dc.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kc(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gc(b,!0),a,d,e)}}),m.each({slideDown:gc("show"),slideUp:gc("hide"),slideToggle:gc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($b=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$b=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_b||(_b=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_b),_b=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lc=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lc,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mc,nc,oc=m.expr.attrHandle,pc=/^(?:checked|selected)$/i,qc=k.getSetAttribute,rc=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nc:mc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rc&&qc||!pc.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qc?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nc={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rc&&qc||!pc.test(c)?a.setAttribute(!qc&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=oc[b]||m.find.attr;oc[b]=rc&&qc||!pc.test(b)?function(a,b,d){var e,f;return d||(f=oc[b],oc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,oc[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rc&&qc||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mc&&mc.set(a,b,c)}}),qc||(mc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},oc.id=oc.name=oc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mc.set},m.attrHooks.contenteditable={set:function(a,b,c){mc.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sc=/^(?:input|select|textarea|button|object)$/i,tc=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sc.test(a.nodeName)||tc.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var uc=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(uc," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vc=m.now(),wc=/\?/,xc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yc,zc,Ac=/#.*$/,Bc=/([?&])_=[^&]*/,Cc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Dc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Ec=/^(?:GET|HEAD)$/,Fc=/^\/\//,Gc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hc={},Ic={},Jc="*/".concat("*");try{zc=location.href}catch(Kc){zc=y.createElement("a"),zc.href="",zc=zc.href}yc=Gc.exec(zc.toLowerCase())||[];function Lc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mc(a,b,c,d){var e={},f=a===Ic;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nc(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Oc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zc,type:"GET",isLocal:Dc.test(yc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nc(Nc(a,m.ajaxSettings),b):Nc(m.ajaxSettings,a)},ajaxPrefilter:Lc(Hc),ajaxTransport:Lc(Ic),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zc)+"").replace(Ac,"").replace(Fc,yc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yc[1]&&c[2]===yc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yc[3]||("http:"===yc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mc(Hc,k,b,v),2===t)return v;h=k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Ec.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bc.test(e)?e.replace(Bc,"$1_="+vc++):e+(wc.test(e)?"&":"?")+"_="+vc++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mc(Ic,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Oc(k,v,c)),u=Pc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qc=/%20/g,Rc=/\[\]$/,Sc=/\r?\n/g,Tc=/^(?:submit|button|image|reset|file)$/i,Uc=/^(?:input|select|textarea|keygen)/i;function Vc(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rc.test(a)?d(a,e):Vc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vc(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vc(c,a[c],b,e);return d.join("&").replace(Qc,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Uc.test(this.nodeName)&&!Tc.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sc,"\r\n")}}):{name:b.name,value:c.replace(Sc,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zc()||$c()}:Zc;var Wc=0,Xc={},Yc=m.ajaxSettings.xhr();a.ActiveXObject&&m(a).on("unload",function(){for(var a in Xc)Xc[a](void 0,!0)}),k.cors=!!Yc&&"withCredentials"in Yc,Yc=k.ajax=!!Yc,Yc&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xc[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zc(){try{return new a.XMLHttpRequest}catch(b){}}function $c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _c=[],ad=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_c.pop()||m.expando+"_"+vc++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ad.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ad.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ad,"$1"+e):b.jsonp!==!1&&(b.url+=(wc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_c.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bd=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bd)return bd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
+/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ca()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ca()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?aa:ba):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=aa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=aa,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=aa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=ba;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=ba),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function da(a){var b=ea.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var ea="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fa=/ jQuery\d+="(?:null|\d+)"/g,ga=new RegExp("<(?:"+ea+")[\\s/>]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/<tbody/i,la=/<|&#?\w+;/,ma=/<(?:script|style|link)/i,na=/checked\s*(?:[^=]|=\s*.checked.)/i,oa=/^$|\/(?:java|ecma)script/i,pa=/^true\/(.*)/,qa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ra={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?"<table>"!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ca[0].contentWindow||Ca[0].contentDocument).document,b.write(),b.close(),c=Ea(a,b),Ca.detach()),Da[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Ga=/^margin/,Ha=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ia,Ja,Ka=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ia=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Ha.test(g)&&Ga.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ia=function(a){return a.currentStyle},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ha.test(g)&&!Ka.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function La(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight),b.removeChild(i)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Ma=/alpha\([^)]*\)/i,Na=/opacity\s*=\s*([^)]*)/,Oa=/^(none|table(?!-c[ea]).+)/,Pa=new RegExp("^("+S+")(.*)$","i"),Qa=new RegExp("^([+-])=("+S+")","i"),Ra={position:"absolute",visibility:"hidden",display:"block"},Sa={letterSpacing:"0",fontWeight:"400"},Ta=["Webkit","O","Moz","ms"];function Ua(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ta.length;while(e--)if(b=Ta[e]+c,b in a)return b;return d}function Va(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fa(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wa(a,b,c){var d=Pa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Ya(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ia(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Ja(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ha.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xa(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ja(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ua(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qa.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ua(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Ja(a,b,d)),"normal"===f&&b in Sa&&(f=Sa[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Oa.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Ra,function(){return Ya(a,b,d)}):Ya(a,b,d):void 0},set:function(a,c,d){var e=d&&Ia(a);return Wa(a,c,d?Xa(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Na.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Ma,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Ma.test(f)?f.replace(Ma,e):f+" "+e)}}),m.cssHooks.marginRight=La(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Ja,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Ga.test(a)||(m.cssHooks[a+b].set=Wa)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ia(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Va(this,!0)},hide:function(){return Va(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Za(a,b,c,d,e){
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Za.propHooks._default.set(this),this}},Za.prototype.init.prototype=Za.prototype,Za.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Za.propHooks.scrollTop=Za.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Za.prototype.init,m.fx.step={};var $a,_a,ab=/^(?:toggle|show|hide)$/,bb=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cb=/queueHooks$/,db=[ib],eb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bb.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bb.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fb(){return setTimeout(function(){$a=void 0}),$a=m.now()}function gb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hb(a,b,c){for(var d,e=(eb[b]||[]).concat(eb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fa(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fa(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ab.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fa(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hb(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=db.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$a||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$a||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);g>f;f++)if(d=db[f].call(j,a,k,j.opts))return d;return m.map(k,hb,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kb,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],eb[c]=eb[c]||[],eb[c].unshift(b)},prefilter:function(a,b){b?db.unshift(a):db.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kb(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),m.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($a=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$a=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_a||(_a=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_a),_a=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lb=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lb,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mb,nb,ob=m.expr.attrHandle,pb=/^(?:checked|selected)$/i,qb=k.getSetAttribute,rb=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nb:mb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rb&&qb||!pb.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qb?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nb={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rb&&qb||!pb.test(c)?a.setAttribute(!qb&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ob[b]||m.find.attr;ob[b]=rb&&qb||!pb.test(b)?function(a,b,d){var e,f;return d||(f=ob[b],ob[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,ob[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rb&&qb||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mb&&mb.set(a,b,c)}}),qb||(mb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},ob.id=ob.name=ob.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mb.set},m.attrHooks.contenteditable={set:function(a,b,c){mb.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sb=/^(?:input|select|textarea|button|object)$/i,tb=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sb.test(a.nodeName)||tb.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var ub=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ub," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vb=m.now(),wb=/\?/,xb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yb,zb,Ab=/#.*$/,Bb=/([?&])_=[^&]*/,Cb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Db=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Eb=/^(?:GET|HEAD)$/,Fb=/^\/\//,Gb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hb={},Ib={},Jb="*/".concat("*");try{zb=location.href}catch(Kb){zb=y.createElement("a"),zb.href="",zb=zb.href}yb=Gb.exec(zb.toLowerCase())||[];function Lb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mb(a,b,c,d){var e={},f=a===Ib;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nb(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Ob(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zb,type:"GET",isLocal:Db.test(yb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nb(Nb(a,m.ajaxSettings),b):Nb(m.ajaxSettings,a)},ajaxPrefilter:Lb(Hb),ajaxTransport:Lb(Ib),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cb.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zb)+"").replace(Ab,"").replace(Fb,yb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gb.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yb[1]&&c[2]===yb[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yb[3]||("http:"===yb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mb(Hb,k,b,v),2===t)return v;h=m.event&&k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Eb.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wb.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bb.test(e)?e.replace(Bb,"$1_="+vb++):e+(wb.test(e)?"&":"?")+"_="+vb++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jb+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mb(Ib,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Ob(k,v,c)),u=Pb(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qb=/%20/g,Rb=/\[\]$/,Sb=/\r?\n/g,Tb=/^(?:submit|button|image|reset|file)$/i,Ub=/^(?:input|select|textarea|keygen)/i;function Vb(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rb.test(a)?d(a,e):Vb(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vb(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vb(c,a[c],b,e);return d.join("&").replace(Qb,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Ub.test(this.nodeName)&&!Tb.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sb,"\r\n")}}):{name:b.name,value:c.replace(Sb,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zb()||$b()}:Zb;var Wb=0,Xb={},Yb=m.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Xb)Xb[a](void 0,!0)}),k.cors=!!Yb&&"withCredentials"in Yb,Yb=k.ajax=!!Yb,Yb&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xb[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xb[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zb(){try{return new a.XMLHttpRequest}catch(b){}}function $b(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _b=[],ac=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_b.pop()||m.expando+"_"+vb++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ac.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ac.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ac,"$1"+e):b.jsonp!==!1&&(b.url+=(wb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_b.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bc=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bc)return bc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cc=a.document.documentElement;function dc(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cc;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cc})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=La(k.pixelPosition,function(a,c){return c?(c=Ja(a,b),Ha.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ec=a.jQuery,fc=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fc),b&&a.jQuery===m&&(a.jQuery=ec),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ar.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ar.js
new file mode 100644
index 0000000..6c4228c
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ar.js
@@ -0,0 +1,15 @@
+/*
+  jQuery Colorbox language configuration
+  language: Arabic (ar)
+  translated by: A.Rhman Sayes
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+  current: "الصورة {current} من {total}",
+	previous: "السابق",
+	next: "التالي",
+	close: "إغلاق",
+	xhrError: "حدث خطأ أثناء تحميل المحتوى.",
+	imgError: "حدث خطأ أثناء تحميل الصورة.",
+	slideshowStart: "تشغيل العرض",
+	slideshowStop: "إيقاف العرض"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-bg.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-bg.js
new file mode 100644
index 0000000..de7e4a1
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-bg.js
@@ -0,0 +1,16 @@
+/*
+  jQuery Colorbox language configuration
+	language: Bulgarian (bg)
+	translated by: Marian M.Bida
+	site: webmax.bg
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "изображение {current} от {total}",
+	previous: "предишна",
+	next: "следваща",
+	close: "затвори",
+	xhrError: "Неуспешно зареждане на съдържанието.",
+	imgError: "Неуспешно зареждане на изображението.",
+	slideshowStart: "пусни слайд-шоу",
+	slideshowStop: "спри слайд-шоу"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-bn.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-bn.js
new file mode 100644
index 0000000..946229d
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-bn.js
@@ -0,0 +1,16 @@
+/*
+jQuery Colorbox language configuration
+language: Bengali (bn)
+translated by: Arkaprava Majumder
+http://github.com/arkaindas
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+current: "ছবি {current} এর {total}",
+previous: "আগে",
+next: "পরে",
+close: "বন্ধ",
+xhrError: "এই কন্টেন্ট লোড করা যায়নি.",
+imgError: "এই ছবিটি লোড করা যায়নি.",
+slideshowStart: "স্লাইডশো শুরু",
+slideshowStop: "স্লাইডশো বন্ধ"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ca.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ca.js
new file mode 100644
index 0000000..173c05f
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ca.js
@@ -0,0 +1,13 @@
+/*
+	jQuery Colorbox language configuration
+	language: Catala (ca)
+	translated by: eduard salla
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Imatge {current} de {total}",
+	previous: "Anterior",
+	next: "Següent",
+	close: "Tancar",
+	xhrError: "Error en la càrrega del contingut.",
+	imgError: "Error en la càrrega de la imatge."
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-cs.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-cs.js
new file mode 100644
index 0000000..9649fd4
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-cs.js
@@ -0,0 +1,16 @@
+/*
+	jQuery Colorbox language configuration
+	language: Czech (cs)
+	translated by: Filip Novak
+	site: mame.napilno.cz/filip-novak
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{current}. obrázek z {total}",
+	previous: "Předchozí",
+	next: "Následující",
+	close: "Zavřít",
+	xhrError: "Obsah se nepodařilo načíst.",
+	imgError: "Obrázek se nepodařilo načíst.",
+	slideshowStart: "Spustit slideshow",
+	slideshowStop: "Zastavit slideshow"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-da.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-da.js
new file mode 100644
index 0000000..676fffe
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-da.js
@@ -0,0 +1,16 @@
+/*
+	jQuery Colorbox language configuration
+	language: Danish (da)
+	translated by: danieljuhl
+	site: danieljuhl.dk
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Billede {current} af {total}",
+	previous: "Forrige",
+	next: "Næste",
+	close: "Luk",
+	xhrError: "Indholdet fejlede i indlæsningen.",
+	imgError: "Billedet fejlede i indlæsningen.",
+	slideshowStart: "Start slideshow",
+	slideshowStop: "Stop slideshow"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-de.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-de.js
new file mode 100644
index 0000000..d489379
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-de.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: German (de)
+	translated by: wallenium
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Bild {current} von {total}",
+	previous: "Zurück",
+	next: "Vor",
+	close: "Schließen",
+	xhrError: "Dieser Inhalt konnte nicht geladen werden.",
+	imgError: "Dieses Bild konnte nicht geladen werden.",
+	slideshowStart: "Slideshow starten",
+	slideshowStop: "Slideshow anhalten"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-es.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-es.js
new file mode 100644
index 0000000..11296fc
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-es.js
@@ -0,0 +1,13 @@
+/*
+  jQuery Colorbox language configuration
+	language: Spanish (es)
+	translated by: migolo
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Imagen {current} de {total}",
+	previous: "Anterior",
+	next: "Siguiente",
+	close: "Cerrar",
+	xhrError: "Error en la carga del contenido.",
+	imgError: "Error en la carga de la imagen."
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-et.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-et.js
new file mode 100644
index 0000000..60a4e88
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-et.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Estonian (et)
+	translated by: keevitaja
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{current}/{total}",
+	previous: "eelmine",
+	next: "järgmine",
+	close: "sulge",
+	xhrError: "Sisu ei õnnestunud laadida.",
+	imgError: "Pilti ei õnnestunud laadida.",
+	slideshowStart: "Käivita slaidid",
+	slideshowStop: "Peata slaidid"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fa.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fa.js
new file mode 100644
index 0000000..dbe70e1
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fa.js
@@ -0,0 +1,18 @@
+/*
+	jQuery Colorbox language configuration
+	language: Persian (Farsi)
+	translated by: Mahdi Jaberzadeh Ansari (MJZSoft)
+	site: www.mjzsoft.ir
+	email: mahdijaberzadehansari (at) yahoo.co.uk
+	Please note : Persian language is right to left like arabic.
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "تصویر {current} از {total}",
+	previous: "قبلی",
+	next: "بعدی",
+	close: "بستن",
+	xhrError: "متاسفانه محتویات مورد نظر قابل نمایش نیست.",
+	imgError: "متاسفانه بارگذاری این عکس با مشکل مواجه شده است.",
+	slideshowStart: "آغاز نمایش خودکار",
+	slideshowStop: "توقف نمایش خودکار"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fi.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fi.js
new file mode 100644
index 0000000..ac03fe0
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fi.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Finnish (fi)
+	translated by: Mikko
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Kuva {current} / {total}",
+	previous: "Edellinen",
+	next: "Seuraava",
+	close: "Sulje",
+	xhrError: "Sisällön lataaminen epäonnistui.",
+	imgError: "Kuvan lataaminen epäonnistui.",
+	slideshowStart: "Aloita kuvaesitys.",
+	slideshowStop: "Lopeta kuvaesitys."	
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fr.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fr.js
new file mode 100644
index 0000000..f76352b
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fr.js
@@ -0,0 +1,15 @@
+/*
+  jQuery Colorbox language configuration
+  language: French (fr)
+  translated by: oaubert
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "image {current} sur {total}",
+	previous: "pr&eacute;c&eacute;dente",
+	next: "suivante",
+	close: "fermer",
+	xhrError: "Impossible de charger ce contenu.",
+	imgError: "Impossible de charger cette image.",
+	slideshowStart: "d&eacute;marrer la pr&eacute;sentation",
+	slideshowStop: "arr&ecirc;ter la pr&eacute;sentation"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-gl.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-gl.js
new file mode 100644
index 0000000..3641b51
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-gl.js
@@ -0,0 +1,13 @@
+/*
+  jQuery Colorbox language configuration
+	language: Galician (gl)
+	translated by: donatorouco
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Imaxe {current} de {total}",
+	previous: "Anterior",
+	next: "Seguinte",
+	close: "Pechar",
+	xhrError: "Erro na carga do contido.",
+	imgError: "Erro na carga da imaxe."
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-gr.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-gr.js
new file mode 100644
index 0000000..0d2c1bb
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-gr.js
@@ -0,0 +1,16 @@
+/*
+	jQuery Colorbox language configuration
+	language: Greek (gr)
+	translated by: S.Demirtzoglou
+	site: webiq.gr
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Εικόνα {current} από {total}",
+	previous: "Προηγούμενη",
+	next: "Επόμενη",
+	close: "Απόκρυψη",
+	xhrError: "Το περιεχόμενο δεν μπόρεσε να φορτωθεί.",
+	imgError: "Απέτυχε η φόρτωση της εικόνας.",
+	slideshowStart: "Έναρξη παρουσίασης",
+	slideshowStop: "Παύση παρουσίασης"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-he.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-he.js
new file mode 100644
index 0000000..78908e3
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-he.js
@@ -0,0 +1,16 @@
+/*
+	jQuery Colorbox language configuration
+	language: Hebrew (he)
+	translated by: DavidCo
+	site: DavidCo.me
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "תמונה {current} מתוך {total}",
+	previous: "הקודם",
+	next: "הבא",
+	close: "סגור",
+	xhrError: "שגיאה בטעינת התוכן.",
+	imgError: "שגיאה בטעינת התמונה.",
+	slideshowStart: "התחל מצגת",
+	slideshowStop: "עצור מצגת"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-hr.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-hr.js
new file mode 100644
index 0000000..9e0d0f4
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-hr.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Croatian (hr)
+	translated by: Mladen Bicanic (base.hr)
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Slika {current} od {total}",
+	previous: "Prethodna",
+	next: "Sljedeća",
+	close: "Zatvori",
+	xhrError: "Neuspješno učitavanje sadržaja.",
+	imgError: "Neuspješno učitavanje slike.",
+	slideshowStart: "Pokreni slideshow",
+	slideshowStop: "Zaustavi slideshow"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-hu.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-hu.js
new file mode 100644
index 0000000..72e9d36
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-hu.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Hungarian (hu)
+	translated by: kovadani
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{current}/{total} kép",
+	previous: "Előző",
+	next: "Következő",
+	close: "Bezár",
+	xhrError: "A tartalmat nem sikerült betölteni.",
+	imgError: "A képet nem sikerült betölteni.",
+	slideshowStart: "Diavetítés indítása",
+	slideshowStop: "Diavetítés leállítása"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-id.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-id.js
new file mode 100644
index 0000000..81a62df
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-id.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Indonesian (id)
+	translated by: sarwasunda
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "ke {current} dari {total}",
+	previous: "Sebelumnya",
+	next: "Berikutnya",
+	close: "Tutup",
+	xhrError: "Konten ini tidak dapat dimuat.",
+	imgError: "Gambar ini tidak dapat dimuat.",
+	slideshowStart: "Putar",
+	slideshowStop: "Berhenti"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-it.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-it.js
new file mode 100644
index 0000000..2a4af64
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-it.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Italian (it)
+	translated by: maur8ino
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Immagine {current} di {total}",
+	previous: "Precedente",
+	next: "Successiva",
+	close: "Chiudi",
+	xhrError: "Errore nel caricamento del contenuto.",
+	imgError: "Errore nel caricamento dell'immagine.",
+	slideshowStart: "Inizia la presentazione",
+	slideshowStop: "Termina la presentazione"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ja.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ja.js
new file mode 100644
index 0000000..067612c
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ja.js
@@ -0,0 +1,15 @@
+/*
+  jQuery Colorbox language configuration
+  language: Japanaese (ja)
+  translated by: Hajime Fujimoto
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{total}枚中{current}枚目",
+	previous: "前",
+	next: "次",
+	close: "閉じる",
+	xhrError: "コンテンツの読み込みに失敗しました",
+	imgError: "画像の読み込みに失敗しました",
+	slideshowStart: "スライドショー開始",
+	slideshowStop: "スライドショー終了"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-kr.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-kr.js
new file mode 100644
index 0000000..b95702b
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-kr.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Korean (kr)
+	translated by: lunareffect
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "총 {total} 중 {current}",
+	previous: "이전",
+	next: "다음",
+	close: "닫기",
+	xhrError: "컨텐츠를 불러오는 데 실패했습니다.",
+	imgError: "이미지를 불러오는 데 실패했습니다.",
+	slideshowStart: "슬라이드쇼 시작",
+	slideshowStop: "슬라이드쇼 중지"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-lt.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-lt.js
new file mode 100644
index 0000000..a513fcf
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-lt.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Lithuanian (lt)
+	translated by: Tomas Norkūnas
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Nuotrauka {current} iš {total}",
+	previous: "Atgal",
+	next: "Pirmyn",
+	close: "Uždaryti",
+	xhrError: "Nepavyko užkrauti turinio.",
+	imgError: "Nepavyko užkrauti nuotraukos.",
+	slideshowStart: "Pradėti automatinę peržiūrą",
+	slideshowStop: "Sustabdyti automatinę peržiūrą"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-lv.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-lv.js
new file mode 100644
index 0000000..e376366
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-lv.js
@@ -0,0 +1,16 @@
+/*
+	jQuery Colorbox language configuration
+	language: Latvian (lv)
+	translated by: Matiss Roberts Treinis
+    site: x0.lv
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "attēls {current} no {total}",
+	previous: "iepriekšējais",
+	next: "nākamais",
+	close: "aizvērt",
+	xhrError: "Neizdevās ielādēt saturu.",
+	imgError: "Neizdevās ielādēt attēlu.",
+        slideshowStart: "sākt slaidrādi",
+        slideshowStop: "apturēt slaidrādi"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-my.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-my.js
new file mode 100644
index 0000000..216e252
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-my.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Myanmar (my)
+	translated by: Yan Naing
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+  current: "ပုံ {total} မှာ {current} မြောက်ပုံ",
+	previous: "ရှေ့သို့",
+	next: "နောက်သို့",
+	close: "ပိတ်မည်",
+	xhrError: "ပါဝင်သော အကြောင်းအရာများ ဖော်ပြရာတွင် အနည်းငယ် ချို့ယွင်းမှုရှိနေပါသည်",
+	imgError: "ပုံပြသရာတွင် အနည်းငယ် ချို့ယွင်းချက် ရှိနေပါသည်",
+	slideshowStart: "ပုံများ စတင်ပြသမည်",
+	slideshowStop: "ပုံပြသခြင်း ရပ်ဆိုင်မည်"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-nl.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-nl.js
new file mode 100644
index 0000000..dfc658e
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-nl.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Dutch (nl)
+	translated by: barryvdh
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Afbeelding {current} van {total}",
+	previous: "Vorige",
+	next: "Volgende",
+	close: "Sluiten",
+	xhrError: "Deze inhoud kan niet geladen worden.",
+	imgError: "Deze afbeelding kan niet geladen worden.",
+	slideshowStart: "Diashow starten",
+	slideshowStop: "Diashow stoppen"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-no.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-no.js
new file mode 100644
index 0000000..277c5d3
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-no.js
@@ -0,0 +1,16 @@
+/*
+	jQuery Colorbox language configuration
+	language: Norwegian (no)
+	translated by: lars-erik
+	site: markedspartner.no
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Bilde {current} av {total}",
+	previous: "Forrige",
+	next: "Neste",
+	close: "Lukk",
+	xhrError: "Feil ved lasting av innhold.",
+	imgError: "Feil ved lasting av bilde.",
+	slideshowStart: "Start lysbildefremvisning",
+	slideshowStop: "Stopp lysbildefremvisning"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-pl.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-pl.js
new file mode 100644
index 0000000..8cbdcab
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-pl.js
@@ -0,0 +1,16 @@
+/*
+	jQuery Colorbox language configuration
+	language: Polski (pl)
+	translated by: Tomasz Wasiński
+	site: 2bevisible.pl
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{current}. obrazek z {total}",
+	previous: "Poprzedni",
+	next: "Następny",
+	close: "Zamknij",
+	xhrError: "Nie udało się załadować treści.",
+	imgError: "Nie udało się załadować obrazka.",
+	slideshowStart: "rozpocznij pokaz slajdów",
+	slideshowStop: "zatrzymaj pokaz slajdów"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-pt_BR.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-pt_BR.js
new file mode 100644
index 0000000..a405d93
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-pt_BR.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Brazilian Portuguese (pt-BR)
+	translated by: ReinaldoMT
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Imagem {current} de {total}",
+	previous: "Anterior",
+	next: "Próxima",
+	close: "Fechar",
+	slideshowStart: "iniciar apresentação de slides",
+	slideshowStop: "parar apresentação de slides",
+	xhrError: "Erro ao carregar o conteúdo.",
+	imgError: "Erro ao carregar a imagem."
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ro.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ro.js
new file mode 100644
index 0000000..0a461e2
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ro.js
@@ -0,0 +1,15 @@
+/*
+  jQuery Colorbox language configuration
+  language: Romanian (ro)
+  translated by: shurub3l
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "imagine {current} din {total}",
+	previous: "precedenta",
+	next: "următoarea",
+	close: "închideți",
+	xhrError: "Acest conținut nu poate fi încărcat.",
+	imgError: "Această imagine nu poate fi încărcată",
+	slideshowStart: "începeți prezentarea (slideshow)",
+	slideshowStop: "opriți prezentarea (slideshow)"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ru.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ru.js
new file mode 100644
index 0000000..81b688f
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ru.js
@@ -0,0 +1,16 @@
+/*
+	jQuery Colorbox language configuration
+	language: Russian (ru)
+	translated by: Marfa
+	site: themarfa.name
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "изображение {current} из {total}",
+	previous: "назад",
+	next: "вперёд",
+	close: "закрыть",
+	xhrError: "Не удалось загрузить содержимое.",
+	imgError: "Не удалось загрузить изображение.",
+	slideshowStart: "начать слайд-шоу",
+	slideshowStop: "остановить слайд-шоу"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-si.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-si.js
new file mode 100644
index 0000000..8fac680
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-si.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Slovenian (si)
+	translated by: Boštjan Pišler (pisler.si)
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Slika {current} od {total}",
+	previous: "Prejšnja",
+	next: "Naslednja",
+	close: "Zapri",
+	xhrError: "Vsebine ni bilo mogoče naložiti.",
+	imgError: "Slike ni bilo mogoče naložiti.",
+	slideshowStart: "Zaženi prezentacijo",
+	slideshowStop: "Zaustavi prezentacijo"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sk.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sk.js
new file mode 100644
index 0000000..faa9291
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sk.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Slovak (sk)
+	translated by: Jaroslav Kostal
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{current}. obrázok z {total}",
+	previous: "Predchádzajúci",
+	next: "Následujúci",
+	close: "Zatvoriť",
+	xhrError: "Obsah sa nepodarilo načítať.",
+	imgError: "Obrázok sa nepodarilo načítať.",
+	slideshowStart: "Spustiť slideshow",
+	slideshowStop: "zastaviť slideshow"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sr.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sr.js
new file mode 100644
index 0000000..618e73c
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sr.js
@@ -0,0 +1,15 @@
+/*
+        jQuery Colorbox language configuration
+        language: Serbian (sr)
+        translated by: Sasa Stefanovic (baguje.com)
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+        current: "Slika {current} od {total}",
+        previous: "Prethodna",
+        next: "Sledeća",
+        close: "Zatvori",
+        xhrError: "Neuspešno učitavanje sadržaja.",
+        imgError: "Neuspešno učitavanje slike.",
+        slideshowStart: "Pokreni slideshow",
+        slideshowStop: "Zaustavi slideshow"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sv.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sv.js
new file mode 100644
index 0000000..01bb1d8
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sv.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Swedish (sv)
+	translated by: Mattias Reichel
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Bild {current} av {total}",
+	previous: "Föregående",
+	next: "Nästa",
+	close: "Stäng",
+	xhrError: "Innehållet kunde inte laddas.",
+	imgError: "Den här bilden kunde inte laddas.",
+	slideshowStart: "Starta bildspel",
+	slideshowStop: "Stoppa bildspel"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-tr.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-tr.js
new file mode 100644
index 0000000..d467c2e
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-tr.js
@@ -0,0 +1,19 @@
+/*
+	jQuery Colorbox language configuration
+	language: Turkish (tr)
+	translated by: Caner ÖNCEL
+	site: egonomik.com
+	
+	edited by: Sinan Eldem
+	www.sinaneldem.com.tr
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+  current: "Görsel {current} / {total}",
+  previous: "Önceki",
+  next: "Sonraki",
+  close: "Kapat",
+  xhrError: "İçerik yüklenirken hata meydana geldi.",
+  imgError: "Resim yüklenirken hata meydana geldi.",
+  slideshowStart: "Slaytı Başlat",
+  slideshowStop: "Slaytı Durdur"
+});
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-uk.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-uk.js
new file mode 100644
index 0000000..3f786d3
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-uk.js
@@ -0,0 +1,16 @@
+/*
+    jQuery ColorBox language configuration
+    language: Ukrainian (uk)
+    translated by: Andrew
+    http://acisoftware.com.ua
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+    current: "зображення {current} з {total}",
+    previous: "попереднє",
+    next: "наступне",
+    close: "закрити",
+    xhrError: "Не вдалося завантажити вміст.",
+    imgError: "Не вдалося завантажити зображення.",
+    slideshowStart: "почати слайд-шоу",
+    slideshowStop: "зупинити слайд-шоу"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-zh_CN.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-zh_CN.js
new file mode 100644
index 0000000..5b6ec04
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-zh_CN.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Chinese Simplified (zh-CN)
+	translated by: zhao weiming
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "当前图像 {current} 总共 {total}",
+	previous: "前一页",
+	next: "后一页",
+	close: "关闭",
+	xhrError: "此内容无法加载",
+	imgError: "此图片无法加载",
+	slideshowStart: "开始播放幻灯片",
+	slideshowStop: "停止播放幻灯片"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-zh_TW.js b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-zh_TW.js
new file mode 100644
index 0000000..b0c4f12
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-zh_TW.js
@@ -0,0 +1,15 @@
+/*
+	jQuery Colorbox language configuration
+	language: Chinese Traditional (zh-TW)
+	translated by: Atans Chiu
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "圖片 {current} 總共 {total}",
+	previous: "上一頁",
+	next: "下一頁",
+	close: "關閉",
+	xhrError: "此內容加載失敗.",
+	imgError: "此圖片加載失敗.",
+	slideshowStart: "開始幻燈片",
+	slideshowStop: "結束幻燈片"
+});
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/style1/colorbox.css b/sources/themes/default/js/plugins/colorbox/style1/colorbox.css
index b75b0ce..8a4ff99 100644
--- a/sources/themes/default/js/plugins/colorbox/style1/colorbox.css
+++ b/sources/themes/default/js/plugins/colorbox/style1/colorbox.css
@@ -1,8 +1,9 @@
 /*
-    ColorBox Core Style:
+    Colorbox Core Style:
     The following CSS is consistent between example themes and should not be altered.
 */
 #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxWrapper {max-width:none;}
 #cboxOverlay{position:fixed; width:100%; height:100%;}
 #cboxMiddleLeft, #cboxBottomLeft{clear:left;}
 #cboxContent{position:relative;}
@@ -10,16 +11,16 @@
 #cboxTitle{margin:0;}
 #cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
 #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
-.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
-.cboxIframe{width:100%; height:100%; display:block; border:0;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
+.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
 #colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
 
 /* 
     User Style:
-    Change the following styles to modify the appearance of ColorBox.  They are
+    Change the following styles to modify the appearance of Colorbox.  They are
     ordered & tabbed in a way that represents the nesting of the generated HTML.
 */
-#cboxOverlay{background:url(images/overlay.png) repeat 0 0;}
+#cboxOverlay{background:url(images/overlay.png) repeat 0 0; opacity: 0.9; filter: alpha(opacity = 90);}
 #colorbox{outline:0;}
     #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;}
     #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;}
@@ -66,28 +67,4 @@
 .cboxIE #cboxMiddleLeft,
 .cboxIE #cboxMiddleRight {
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
-}
-
-/*
-  The following provides PNG transparency support for IE6
-  Feel free to remove this and the /ie6/ directory if you have dropped IE6 support.
-*/
-.cboxIE6 #cboxTopLeft{background:url(images/ie6/borderTopLeft.png);}
-.cboxIE6 #cboxTopCenter{background:url(images/ie6/borderTopCenter.png);}
-.cboxIE6 #cboxTopRight{background:url(images/ie6/borderTopRight.png);}
-.cboxIE6 #cboxBottomLeft{background:url(images/ie6/borderBottomLeft.png);}
-.cboxIE6 #cboxBottomCenter{background:url(images/ie6/borderBottomCenter.png);}
-.cboxIE6 #cboxBottomRight{background:url(images/ie6/borderBottomRight.png);}
-.cboxIE6 #cboxMiddleLeft{background:url(images/ie6/borderMiddleLeft.png);}
-.cboxIE6 #cboxMiddleRight{background:url(images/ie6/borderMiddleRight.png);}
-
-.cboxIE6 #cboxTopLeft,
-.cboxIE6 #cboxTopCenter,
-.cboxIE6 #cboxTopRight,
-.cboxIE6 #cboxBottomLeft,
-.cboxIE6 #cboxBottomCenter,
-.cboxIE6 #cboxBottomRight,
-.cboxIE6 #cboxMiddleLeft,
-.cboxIE6 #cboxMiddleRight {
-    _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')");
-}
+}
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/border.png b/sources/themes/default/js/plugins/colorbox/style1/images/border.png
index f463a10..9386f35 100644
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/border.png and b/sources/themes/default/js/plugins/colorbox/style1/images/border.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/controls.png b/sources/themes/default/js/plugins/colorbox/style1/images/controls.png
index 9257176..1ec3cb1 100644
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/controls.png and b/sources/themes/default/js/plugins/colorbox/style1/images/controls.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomCenter.png b/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomCenter.png
deleted file mode 100644
index 0d4475e..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomCenter.png and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomLeft.png b/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomLeft.png
deleted file mode 100644
index 2775eba..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomLeft.png and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomRight.png b/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomRight.png
deleted file mode 100644
index f7f5137..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomRight.png and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleLeft.png b/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleLeft.png
deleted file mode 100644
index a2d63d1..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleLeft.png and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleRight.png b/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleRight.png
deleted file mode 100644
index fd7c3e8..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleRight.png and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopCenter.png b/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopCenter.png
deleted file mode 100644
index 2937a9c..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopCenter.png and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopLeft.png b/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopLeft.png
deleted file mode 100644
index f9d458b..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopLeft.png and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopRight.png b/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopRight.png
deleted file mode 100644
index 74b8583..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopRight.png and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/loading.gif b/sources/themes/default/js/plugins/colorbox/style1/images/loading.gif
index b4695d8..0325c8d 100644
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/loading.gif and b/sources/themes/default/js/plugins/colorbox/style1/images/loading.gif differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/loading_background.png b/sources/themes/default/js/plugins/colorbox/style1/images/loading_background.png
index 6ae83e6..23a336b 100644
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/loading_background.png and b/sources/themes/default/js/plugins/colorbox/style1/images/loading_background.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/images/overlay.png b/sources/themes/default/js/plugins/colorbox/style1/images/overlay.png
index 53ea98f..10362a4 100644
Binary files a/sources/themes/default/js/plugins/colorbox/style1/images/overlay.png and b/sources/themes/default/js/plugins/colorbox/style1/images/overlay.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style1/index.html b/sources/themes/default/js/plugins/colorbox/style1/index.html
deleted file mode 100644
index abf749c..0000000
--- a/sources/themes/default/js/plugins/colorbox/style1/index.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-	<meta charset=utf-8 />
-	<title>ColorBox Examples</title>
-	<style type="text/css">
-		body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
-		a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
-		h2{font-size:13px; margin:15px 0 0 0;}
-	</style>
-	<link media="screen" rel="stylesheet" href="colorbox.css" />
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
-	<script src="../colorbox/jquery.colorbox.js"></script>
-	<script>
-		$(document).ready(function(){
-			//Examples of how to assign the ColorBox event to elements
-			$("a[rel='example1']").colorbox();
-			$("a[rel='example2']").colorbox({transition:"fade"});
-			$("a[rel='example3']").colorbox({transition:"none", width:"75%", height:"75%"});
-			$("a[rel='example4']").colorbox({slideshow:true});
-			$(".example5").colorbox();
-			$(".example6").colorbox({iframe:true, innerWidth:425, innerHeight:344});
-			$(".example7").colorbox({width:"80%", height:"80%", iframe:true});
-			$(".example8").colorbox({width:"50%", inline:true, href:"#inline_example1"});
-			$(".example9").colorbox({
-				onOpen:function(){ alert('onOpen: colorbox is about to open'); },
-				onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
-				onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
-				onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
-				onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
-			});
-			
-			//Example of preserving a JavaScript event for inline calls.
-			$("#click").click(function(){ 
-				$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
-				return false;
-			});
-		});
-	</script>
-</head>
-<body>
-	<h1>ColorBox Demonstration</h1>
-	
-	<h2>Elastic Transition</h2>
-	<p><a href="../content/ohoopee1.jpg" rel="example1" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
-	<p><a href="../content/ohoopee2.jpg" rel="example1" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
-	<p><a href="../content/ohoopee3.jpg" rel="example1" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
-	
-	<h2>Fade Transition</h2>
-	<p><a href="../content/ohoopee1.jpg" rel="example2" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
-	<p><a href="../content/ohoopee2.jpg" rel="example2" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
-	<p><a href="../content/ohoopee3.jpg" rel="example2" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
-	
-	<h2>No Transition + fixed width and height (75% of screen size)</h2>
-	<p><a href="../content/ohoopee1.jpg" rel="example3"  title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
-	<p><a href="../content/ohoopee2.jpg" rel="example3"  title="On the Ohoopee as a child">Grouped Photo 2</a></p>
-	<p><a href="../content/ohoopee3.jpg" rel="example3"  title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
-	
-	<h2>Slideshow</h2>
-	<p><a href="../content/ohoopee1.jpg" rel="example4"  title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
-	<p><a href="../content/ohoopee2.jpg" rel="example4"  title="On the Ohoopee as a child">Grouped Photo 2</a></p>
-	<p><a href="../content/ohoopee3.jpg" rel="example4"  title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
-	
-	<h2>Other Content Types</h2>
-	<p><a class='example5' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
-	<p><a class='example5' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>
-	<p><a class='example6' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
-	<p><a class='example7' href="http://google.com">Outside Webpage (Iframe)</a></p>
-	<p><a class='example8' href="#">Inline HTML</a></p>
-	
-	<h2>Demonstration of using callbacks</h2>
-	<p><a class='example9' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
-	
-	<!-- This contains the hidden content for inline calls -->
-	<div style='display:none'>
-		<div id='inline_example1' style='padding:10px; background:#fff;'>
-		<p><strong>This content comes from a hidden element on this page.</strong></p>
-		<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.<br />
-		<a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
-		
-		<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>
-		<p>Updating Content Example:<br />
-		<a class="example5" href="../content/flash.html">Click here to load new content</a></p>
-		</div>
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/style2/colorbox.css b/sources/themes/default/js/plugins/colorbox/style2/colorbox.css
index 3ce2906..43254e4 100644
--- a/sources/themes/default/js/plugins/colorbox/style2/colorbox.css
+++ b/sources/themes/default/js/plugins/colorbox/style2/colorbox.css
@@ -1,8 +1,9 @@
 /*
-    ColorBox Core Style:
+    Colorbox Core Style:
     The following CSS is consistent between example themes and should not be altered.
 */
 #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxWrapper {max-width:none;}
 #cboxOverlay{position:fixed; width:100%; height:100%;}
 #cboxMiddleLeft, #cboxBottomLeft{clear:left;}
 #cboxContent{position:relative;}
@@ -10,16 +11,16 @@
 #cboxTitle{margin:0;}
 #cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
 #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
-.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
-.cboxIframe{width:100%; height:100%; display:block; border:0;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
+.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
 #colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
 
 /* 
     User Style:
-    Change the following styles to modify the appearance of ColorBox.  They are
+    Change the following styles to modify the appearance of Colorbox.  They are
     ordered & tabbed in a way that represents the nesting of the generated HTML.
 */
-#cboxOverlay{background:#000;}
+#cboxOverlay{background:#000; opacity: 0.9; filter: alpha(opacity = 90);}
 #colorbox{outline:0;}
     #cboxContent{margin-top:32px; overflow:visible; background:#000;}
         .cboxIframe{background:#fff;}
diff --git a/sources/themes/default/js/plugins/colorbox/style2/images/controls.png.old b/sources/themes/default/js/plugins/colorbox/style2/images/controls.png.old
deleted file mode 100644
index 8569b57..0000000
Binary files a/sources/themes/default/js/plugins/colorbox/style2/images/controls.png.old and /dev/null differ
diff --git a/sources/themes/default/js/plugins/colorbox/style2/images/loading.gif b/sources/themes/default/js/plugins/colorbox/style2/images/loading.gif
index 19c67bb..a32df5c 100644
Binary files a/sources/themes/default/js/plugins/colorbox/style2/images/loading.gif and b/sources/themes/default/js/plugins/colorbox/style2/images/loading.gif differ
diff --git a/sources/themes/default/js/plugins/colorbox/style2/index.html b/sources/themes/default/js/plugins/colorbox/style2/index.html
deleted file mode 100644
index abf749c..0000000
--- a/sources/themes/default/js/plugins/colorbox/style2/index.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-	<meta charset=utf-8 />
-	<title>ColorBox Examples</title>
-	<style type="text/css">
-		body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
-		a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
-		h2{font-size:13px; margin:15px 0 0 0;}
-	</style>
-	<link media="screen" rel="stylesheet" href="colorbox.css" />
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
-	<script src="../colorbox/jquery.colorbox.js"></script>
-	<script>
-		$(document).ready(function(){
-			//Examples of how to assign the ColorBox event to elements
-			$("a[rel='example1']").colorbox();
-			$("a[rel='example2']").colorbox({transition:"fade"});
-			$("a[rel='example3']").colorbox({transition:"none", width:"75%", height:"75%"});
-			$("a[rel='example4']").colorbox({slideshow:true});
-			$(".example5").colorbox();
-			$(".example6").colorbox({iframe:true, innerWidth:425, innerHeight:344});
-			$(".example7").colorbox({width:"80%", height:"80%", iframe:true});
-			$(".example8").colorbox({width:"50%", inline:true, href:"#inline_example1"});
-			$(".example9").colorbox({
-				onOpen:function(){ alert('onOpen: colorbox is about to open'); },
-				onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
-				onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
-				onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
-				onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
-			});
-			
-			//Example of preserving a JavaScript event for inline calls.
-			$("#click").click(function(){ 
-				$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
-				return false;
-			});
-		});
-	</script>
-</head>
-<body>
-	<h1>ColorBox Demonstration</h1>
-	
-	<h2>Elastic Transition</h2>
-	<p><a href="../content/ohoopee1.jpg" rel="example1" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
-	<p><a href="../content/ohoopee2.jpg" rel="example1" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
-	<p><a href="../content/ohoopee3.jpg" rel="example1" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
-	
-	<h2>Fade Transition</h2>
-	<p><a href="../content/ohoopee1.jpg" rel="example2" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
-	<p><a href="../content/ohoopee2.jpg" rel="example2" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
-	<p><a href="../content/ohoopee3.jpg" rel="example2" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
-	
-	<h2>No Transition + fixed width and height (75% of screen size)</h2>
-	<p><a href="../content/ohoopee1.jpg" rel="example3"  title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
-	<p><a href="../content/ohoopee2.jpg" rel="example3"  title="On the Ohoopee as a child">Grouped Photo 2</a></p>
-	<p><a href="../content/ohoopee3.jpg" rel="example3"  title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
-	
-	<h2>Slideshow</h2>
-	<p><a href="../content/ohoopee1.jpg" rel="example4"  title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
-	<p><a href="../content/ohoopee2.jpg" rel="example4"  title="On the Ohoopee as a child">Grouped Photo 2</a></p>
-	<p><a href="../content/ohoopee3.jpg" rel="example4"  title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
-	
-	<h2>Other Content Types</h2>
-	<p><a class='example5' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
-	<p><a class='example5' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>
-	<p><a class='example6' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
-	<p><a class='example7' href="http://google.com">Outside Webpage (Iframe)</a></p>
-	<p><a class='example8' href="#">Inline HTML</a></p>
-	
-	<h2>Demonstration of using callbacks</h2>
-	<p><a class='example9' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
-	
-	<!-- This contains the hidden content for inline calls -->
-	<div style='display:none'>
-		<div id='inline_example1' style='padding:10px; background:#fff;'>
-		<p><strong>This content comes from a hidden element on this page.</strong></p>
-		<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.<br />
-		<a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
-		
-		<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>
-		<p>Updating Content Example:<br />
-		<a class="example5" href="../content/flash.html">Click here to load new content</a></p>
-		</div>
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/style3/colorbox.css b/sources/themes/default/js/plugins/colorbox/style3/colorbox.css
new file mode 100644
index 0000000..1cebdff
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/style3/colorbox.css
@@ -0,0 +1,45 @@
+/*
+    Colorbox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxWrapper {max-width:none;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
+.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#000; opacity: 0.9; filter: alpha(opacity = 90);}
+#colorbox{outline:0;}
+    #cboxContent{margin-top:20px;background:#000;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{border:5px solid #000; background:#fff;}
+        #cboxTitle{position:absolute; top:-20px; left:0; color:#ccc;}
+        #cboxCurrent{position:absolute; top:-20px; right:0px; color:#ccc;}
+        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
+
+        /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+        #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
+        
+        /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+        #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
+        
+        #cboxSlideshow{position:absolute; top:-20px; right:90px; color:#fff;}
+        #cboxPrevious{position:absolute; top:50%; left:5px; margin-top:-32px; background:url(images/controls.png) no-repeat top left; width:28px; height:65px; text-indent:-9999px;}
+        #cboxPrevious:hover{background-position:bottom left;}
+        #cboxNext{position:absolute; top:50%; right:5px; margin-top:-32px; background:url(images/controls.png) no-repeat top right; width:28px; height:65px; text-indent:-9999px;}
+        #cboxNext:hover{background-position:bottom right;}
+        #cboxClose{position:absolute; top:5px; right:5px; display:block; background:url(images/controls.png) no-repeat top center; width:38px; height:19px; text-indent:-9999px;}
+        #cboxClose:hover{background-position:bottom center;}
diff --git a/sources/themes/default/js/plugins/colorbox/style3/images/controls.png b/sources/themes/default/js/plugins/colorbox/style3/images/controls.png
new file mode 100644
index 0000000..e1e9798
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style3/images/controls.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style3/images/loading.gif b/sources/themes/default/js/plugins/colorbox/style3/images/loading.gif
new file mode 100644
index 0000000..a32df5c
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style3/images/loading.gif differ
diff --git a/sources/themes/default/js/plugins/colorbox/style4/colorbox.css b/sources/themes/default/js/plugins/colorbox/style4/colorbox.css
new file mode 100644
index 0000000..d475a34
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/style4/colorbox.css
@@ -0,0 +1,66 @@
+/*
+    Colorbox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxWrapper {max-width:none;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
+.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#fff; opacity: 0.9; filter: alpha(opacity = 90);}
+#colorbox{outline:0;}
+    #cboxTopLeft{width:25px; height:25px; background:url(images/border1.png) no-repeat 0 0;}
+    #cboxTopCenter{height:25px; background:url(images/border1.png) repeat-x 0 -50px;}
+    #cboxTopRight{width:25px; height:25px; background:url(images/border1.png) no-repeat -25px 0;}
+    #cboxBottomLeft{width:25px; height:25px; background:url(images/border1.png) no-repeat 0 -25px;}
+    #cboxBottomCenter{height:25px; background:url(images/border1.png) repeat-x 0 -75px;}
+    #cboxBottomRight{width:25px; height:25px; background:url(images/border1.png) no-repeat -25px -25px;}
+    #cboxMiddleLeft{width:25px; background:url(images/border2.png) repeat-y 0 0;}
+    #cboxMiddleRight{width:25px; background:url(images/border2.png) repeat-y -25px 0;}
+    #cboxContent{background:#fff; overflow:hidden;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{margin-bottom:20px;}
+        #cboxTitle{position:absolute; bottom:0px; left:0; text-align:center; width:100%; color:#999;}
+        #cboxCurrent{position:absolute; bottom:0px; left:100px; color:#999;}
+        #cboxLoadingOverlay{background:#fff url(images/loading.gif) no-repeat 5px 5px;}
+
+        /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+        #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
+        
+        /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+        #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
+
+        #cboxSlideshow{position:absolute; bottom:0px; right:42px; color:#444;}
+        #cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
+        #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
+        #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
+
+/*
+  The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
+  when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to or needed in IE9.
+  See: http://jacklmoore.com/notes/ie-transparency-problems/
+*/
+.cboxIE #cboxTopLeft,
+.cboxIE #cboxTopCenter,
+.cboxIE #cboxTopRight,
+.cboxIE #cboxBottomLeft,
+.cboxIE #cboxBottomCenter,
+.cboxIE #cboxBottomRight,
+.cboxIE #cboxMiddleLeft,
+.cboxIE #cboxMiddleRight {
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
+}
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/style4/images/border1.png b/sources/themes/default/js/plugins/colorbox/style4/images/border1.png
new file mode 100644
index 0000000..ea73e15
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style4/images/border1.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style4/images/border2.png b/sources/themes/default/js/plugins/colorbox/style4/images/border2.png
new file mode 100644
index 0000000..72cad44
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style4/images/border2.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style4/images/loading.gif b/sources/themes/default/js/plugins/colorbox/style4/images/loading.gif
new file mode 100644
index 0000000..1f3a2c0
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style4/images/loading.gif differ
diff --git a/sources/themes/default/js/plugins/colorbox/style5/colorbox.css b/sources/themes/default/js/plugins/colorbox/style5/colorbox.css
new file mode 100644
index 0000000..889f20f
--- /dev/null
+++ b/sources/themes/default/js/plugins/colorbox/style5/colorbox.css
@@ -0,0 +1,58 @@
+/*
+    Colorbox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxWrapper {max-width:none;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
+.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#000; opacity: 0.9; filter: alpha(opacity = 90);}
+#colorbox{outline:0;}
+    #cboxTopLeft{width:14px; height:14px; background:url(images/controls.png) no-repeat 0 0;}
+    #cboxTopCenter{height:14px; background:url(images/border.png) repeat-x top left;}
+    #cboxTopRight{width:14px; height:14px; background:url(images/controls.png) no-repeat -36px 0;}
+    #cboxBottomLeft{width:14px; height:43px; background:url(images/controls.png) no-repeat 0 -32px;}
+    #cboxBottomCenter{height:43px; background:url(images/border.png) repeat-x bottom left;}
+    #cboxBottomRight{width:14px; height:43px; background:url(images/controls.png) no-repeat -36px -32px;}
+    #cboxMiddleLeft{width:14px; background:url(images/controls.png) repeat-y -175px 0;}
+    #cboxMiddleRight{width:14px; background:url(images/controls.png) repeat-y -211px 0;}
+    #cboxContent{background:#fff; overflow:visible;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{margin-bottom:5px;}
+        #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
+        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
+        #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;}
+        #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;}
+
+        /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+        #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible;  position:absolute; bottom:-29px; background:url(images/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;}
+        
+        /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+        #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
+
+        #cboxPrevious{left:0px; background-position: -51px -25px;}
+        #cboxPrevious:hover{background-position:-51px 0px;}
+        #cboxNext{left:27px; background-position:-75px -25px;}
+        #cboxNext:hover{background-position:-75px 0px;}
+        #cboxClose{right:0; background-position:-100px -25px;}
+        #cboxClose:hover{background-position:-100px 0px;}
+
+        .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;}
+        .cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;}
+        .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;}
+        .cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;}
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/colorbox/style5/images/border.png b/sources/themes/default/js/plugins/colorbox/style5/images/border.png
new file mode 100644
index 0000000..c1cd1a2
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style5/images/border.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style5/images/controls.png b/sources/themes/default/js/plugins/colorbox/style5/images/controls.png
new file mode 100644
index 0000000..259130c
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style5/images/controls.png differ
diff --git a/sources/themes/default/js/plugins/colorbox/style5/images/loading.gif b/sources/themes/default/js/plugins/colorbox/style5/images/loading.gif
new file mode 100644
index 0000000..dba33c8
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style5/images/loading.gif differ
diff --git a/sources/themes/default/js/plugins/colorbox/style5/images/loading_background.png b/sources/themes/default/js/plugins/colorbox/style5/images/loading_background.png
new file mode 100644
index 0000000..23a336b
Binary files /dev/null and b/sources/themes/default/js/plugins/colorbox/style5/images/loading_background.png differ
diff --git a/sources/themes/default/js/plugins/jquery.colorbox.min.js b/sources/themes/default/js/plugins/jquery.colorbox.min.js
index 45295d2..c0cbe5c 100644
--- a/sources/themes/default/js/plugins/jquery.colorbox.min.js
+++ b/sources/themes/default/js/plugins/jquery.colorbox.min.js
@@ -1,6 +1,6 @@
 /*!
-	jQuery ColorBox v1.4.1 - 2013-02-14
-	(c) 2013 Jack Moore - jacklmoore.com/colorbox
-	license: http://www.opensource.org/licenses/mit-license.php
+	Colorbox 1.5.14
+	license: MIT
+	http://www.jacklmoore.com/colorbox
 */
-(function(e,t,i){function o(i,o,n){var r=t.createElement(i);return o&&(r.id=Y+o),n&&(r.style.cssText=n),e(r)}function n(e){var t=T.length,i=(A+e)%t;return 0>i?t+i:i}function r(e,t){return Math.round((/%/.test(e)?("x"===t?k.width():k.height())/100:1)*parseInt(e,10))}function h(e){return K.photo||K.photoRegex.test(e)}function l(e){return K.retinaUrl&&i.devicePixelRatio>1?e.replace(K.photoRegex,K.retinaSuffix):e}function s(t){e.contains(w[0],t.target)||w[0]===t.target||(t.stopPropagation(),w.focus())}function a(){var t,i=e.data(N,V);null==i?(K=e.extend({},J),console&&console.log&&console.log("Error: cboxElement missing settings object")):K=e.extend({},i);for(t in K)e.isFunction(K[t])&&"on"!==t.slice(0,2)&&(K[t]=K[t].call(N));K.rel=K.rel||N.rel||e(N).data("rel")||"nofollow",K.href=K.href||e(N).attr("href"),K.title=K.title||N.title,"string"==typeof K.href&&(K.href=e.trim(K.href))}function d(i,o){e(t).trigger(i),at.trigger(i),e.isFunction(o)&&o.call(N)}function c(){var e,t,i,o,n,r=Y+"Slideshow_",h="click."+Y;K.slideshow&&T[1]?(t=function(){clearTimeout(e)},i=function(){(K.loop||T[A+1])&&(e=setTimeout(G.next,K.slideshowSpeed))},o=function(){M.html(K.slideshowStop).unbind(h).one(h,n),at.bind(it,i).bind(tt,t).bind(ot,n),w.removeClass(r+"off").addClass(r+"on")},n=function(){t(),at.unbind(it,i).unbind(tt,t).unbind(ot,n),M.html(K.slideshowStart).unbind(h).one(h,function(){G.next(),o()}),w.removeClass(r+"on").addClass(r+"off")},K.slideshowAuto?o():n()):w.removeClass(r+"off "+r+"on")}function u(i){U||(N=i,a(),T=e(N),A=0,"nofollow"!==K.rel&&(T=e("."+Z).filter(function(){var t,i=e.data(this,V);return i&&(t=e(this).data("rel")||i.rel||this.rel),t===K.rel}),A=T.index(N),-1===A&&(T=T.add(N),A=T.length-1)),m.css({opacity:parseFloat(K.opacity),cursor:K.overlayClose?"pointer":"auto",visibility:"visible"}).show(),j||(j=q=!0,w.css({visibility:"hidden",display:"block"}),E=o(dt,"LoadedContent","width:0; height:0; overflow:hidden").appendTo(v),_=x.height()+C.height()+v.outerHeight(!0)-v.height(),z=y.width()+b.width()+v.outerWidth(!0)-v.width(),D=E.outerHeight(!0),B=E.outerWidth(!0),K.w=r(K.initialWidth,"x"),K.h=r(K.initialHeight,"y"),G.position(),lt&&k.bind("resize."+st+" scroll."+st,function(){m.css({width:k.width(),height:k.height(),top:k.scrollTop(),left:k.scrollLeft()})}).trigger("resize."+st),c(),d(et,K.onOpen),P.add(W).hide(),R.html(K.close).show(),w.focus(),t.addEventListener&&(t.addEventListener("focus",s,!0),at.one(nt,function(){t.removeEventListener("focus",s,!0)})),K.returnFocus&&at.one(nt,function(){e(N).focus()})),G.load(!0))}function f(){!w&&t.body&&(X=!1,k=e(i),w=o(dt).attr({id:V,"class":ht?Y+(lt?"IE6":"IE"):"",role:"dialog",tabindex:"-1"}).hide(),m=o(dt,"Overlay",lt?"position:absolute":"").hide(),L=o(dt,"LoadingOverlay").add(o(dt,"LoadingGraphic")),g=o(dt,"Wrapper"),v=o(dt,"Content").append(W=o(dt,"Title"),H=o(dt,"Current"),F=o("button","Previous"),S=o("button","Next"),M=o("button","Slideshow"),L,R=o("button","Close")),g.append(o(dt).append(o(dt,"TopLeft"),x=o(dt,"TopCenter"),o(dt,"TopRight")),o(dt,!1,"clear:left").append(y=o(dt,"MiddleLeft"),v,b=o(dt,"MiddleRight")),o(dt,!1,"clear:left").append(o(dt,"BottomLeft"),C=o(dt,"BottomCenter"),o(dt,"BottomRight"))).find("div div").css({"float":"left"}),I=o(dt,!1,"position:absolute; width:9999px; visibility:hidden; display:none"),P=S.add(F).add(H).add(M),e(t.body).append(m,w.append(g,I)))}function p(){function i(e){e.which>1||e.shiftKey||e.altKey||e.metaKey||(e.preventDefault(),u(this))}return w?(X||(X=!0,S.click(function(){G.next()}),F.click(function(){G.prev()}),R.click(function(){G.close()}),m.click(function(){K.overlayClose&&G.close()}),e(t).bind("keydown."+Y,function(e){var t=e.keyCode;j&&K.escKey&&27===t&&(e.preventDefault(),G.close()),j&&K.arrowKey&&T[1]&&!e.altKey&&(37===t?(e.preventDefault(),F.click()):39===t&&(e.preventDefault(),S.click()))}),e.isFunction(e.fn.on)?e(t).on("click."+Y,"."+Z,i):e("."+Z).live("click."+Y,i)),!0):!1}var m,w,g,v,x,y,b,C,T,k,E,I,L,W,H,M,S,F,R,P,K,_,z,D,B,N,A,O,j,q,U,$,G,Q,X,J={transition:"elastic",speed:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,inline:!1,html:!1,iframe:!1,fastIframe:!0,photo:!1,href:!1,title:!1,rel:!1,opacity:.9,preloading:!0,className:!1,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",open:!1,returnFocus:!0,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0},V="colorbox",Y="cbox",Z=Y+"Element",et=Y+"_open",tt=Y+"_load",it=Y+"_complete",ot=Y+"_cleanup",nt=Y+"_closed",rt=Y+"_purge",ht=!e.support.leadingWhitespace,lt=ht&&!i.XMLHttpRequest,st=Y+"_IE6",at=e({}),dt="div";e.colorbox||(e(f),G=e.fn[V]=e[V]=function(t,i){var o=this;if(t=t||{},f(),p()){if(e.isFunction(o))o=e("<a/>"),t.open=!0;else if(!o[0])return o;i&&(t.onComplete=i),o.each(function(){e.data(this,V,e.extend({},e.data(this,V)||J,t))}).addClass(Z),(e.isFunction(t.open)&&t.open.call(o)||t.open)&&u(o[0])}return o},G.position=function(e,t){function i(e){x[0].style.width=C[0].style.width=v[0].style.width=parseInt(e.style.width,10)-z+"px",v[0].style.height=y[0].style.height=b[0].style.height=parseInt(e.style.height,10)-_+"px"}var o,n,h,l=0,s=0,a=w.offset();k.unbind("resize."+Y),w.css({top:-9e4,left:-9e4}),n=k.scrollTop(),h=k.scrollLeft(),K.fixed&&!lt?(a.top-=n,a.left-=h,w.css({position:"fixed"})):(l=n,s=h,w.css({position:"absolute"})),s+=K.right!==!1?Math.max(k.width()-K.w-B-z-r(K.right,"x"),0):K.left!==!1?r(K.left,"x"):Math.round(Math.max(k.width()-K.w-B-z,0)/2),l+=K.bottom!==!1?Math.max(k.height()-K.h-D-_-r(K.bottom,"y"),0):K.top!==!1?r(K.top,"y"):Math.round(Math.max(k.height()-K.h-D-_,0)/2),w.css({top:a.top,left:a.left,visibility:"visible"}),e=w.width()===K.w+B&&w.height()===K.h+D?0:e||0,g[0].style.width=g[0].style.height="9999px",o={width:K.w+B+z,height:K.h+D+_,top:l,left:s},0===e&&w.css(o),w.dequeue().animate(o,{duration:e,complete:function(){i(this),q=!1,g[0].style.width=K.w+B+z+"px",g[0].style.height=K.h+D+_+"px",K.reposition&&setTimeout(function(){k.bind("resize."+Y,G.position)},1),t&&t()},step:function(){i(this)}})},G.resize=function(e){j&&(e=e||{},e.width&&(K.w=r(e.width,"x")-B-z),e.innerWidth&&(K.w=r(e.innerWidth,"x")),E.css({width:K.w}),e.height&&(K.h=r(e.height,"y")-D-_),e.innerHeight&&(K.h=r(e.innerHeight,"y")),e.innerHeight||e.height||(E.css({height:"auto"}),K.h=E.height()),E.css({height:K.h}),G.position("none"===K.transition?0:K.speed))},G.prep=function(t){function i(){return K.w=K.w||E.width(),K.w=K.mw&&K.mw<K.w?K.mw:K.w,K.w}function r(){return K.h=K.h||E.height(),K.h=K.mh&&K.mh<K.h?K.mh:K.h,K.h}if(j){var l,s="none"===K.transition?0:K.speed;E.empty().remove(),E=o(dt,"LoadedContent").append(t),E.hide().appendTo(I.show()).css({width:i(),overflow:K.scrolling?"auto":"hidden"}).css({height:r()}).prependTo(v),I.hide(),e(O).css({"float":"none"}),l=function(){function t(){ht&&w[0].style.removeAttribute("filter")}var i,r,l=T.length,a="frameBorder",c="allowTransparency";j&&(r=function(){clearTimeout($),L.hide(),d(it,K.onComplete)},ht&&O&&E.fadeIn(100),W.html(K.title).add(E).show(),l>1?("string"==typeof K.current&&H.html(K.current.replace("{current}",A+1).replace("{total}",l)).show(),S[K.loop||l-1>A?"show":"hide"]().html(K.next),F[K.loop||A?"show":"hide"]().html(K.previous),K.slideshow&&M.show(),K.preloading&&e.each([n(-1),n(1)],function(){var t,i,o=T[this],n=e.data(o,V);n&&n.href?(t=n.href,e.isFunction(t)&&(t=t.call(o))):t=e(o).attr("href"),t&&(h(t)||n.photo)&&(i=new Image,i.src=t)})):P.hide(),K.iframe?(i=o("iframe")[0],a in i&&(i[a]=0),c in i&&(i[c]="true"),K.scrolling||(i.scrolling="no"),e(i).attr({src:K.href,name:(new Date).getTime(),"class":Y+"Iframe",allowFullScreen:!0,webkitAllowFullScreen:!0,mozallowfullscreen:!0}).one("load",r).appendTo(E),at.one(rt,function(){i.src="//about:blank"}),K.fastIframe&&e(i).trigger("load")):r(),"fade"===K.transition?w.fadeTo(s,1,t):t())},"fade"===K.transition?w.fadeTo(s,0,function(){G.position(0,l)}):G.position(s,l)}},G.load=function(t){var n,s,c,u=G.prep;q=!0,O=!1,N=T[A],t||a(),Q&&w.add(m).removeClass(Q),K.className&&w.add(m).addClass(K.className),Q=K.className,d(rt),d(tt,K.onLoad),K.h=K.height?r(K.height,"y")-D-_:K.innerHeight&&r(K.innerHeight,"y"),K.w=K.width?r(K.width,"x")-B-z:K.innerWidth&&r(K.innerWidth,"x"),K.mw=K.w,K.mh=K.h,K.maxWidth&&(K.mw=r(K.maxWidth,"x")-B-z,K.mw=K.w&&K.w<K.mw?K.w:K.mw),K.maxHeight&&(K.mh=r(K.maxHeight,"y")-D-_,K.mh=K.h&&K.h<K.mh?K.h:K.mh),n=K.href,$=setTimeout(function(){L.show()},100),K.inline?(c=o(dt).hide().insertBefore(e(n)[0]),at.one(rt,function(){c.replaceWith(E.children())}),u(e(n))):K.iframe?u(" "):K.html?u(K.html):h(n)?(n=l(n),e(O=new Image).addClass(Y+"Photo").bind("error",function(){K.title=!1,u(o(dt,"Error").html(K.imgError))}).one("load",function(){var e;K.retinaImage&&i.devicePixelRatio>1&&(O.height=O.height/i.devicePixelRatio,O.width=O.width/i.devicePixelRatio),K.scalePhotos&&(s=function(){O.height-=O.height*e,O.width-=O.width*e},K.mw&&O.width>K.mw&&(e=(O.width-K.mw)/O.width,s()),K.mh&&O.height>K.mh&&(e=(O.height-K.mh)/O.height,s())),K.h&&(O.style.marginTop=Math.max(K.mh-O.height,0)/2+"px"),T[1]&&(K.loop||T[A+1])&&(O.style.cursor="pointer",O.onclick=function(){G.next()}),ht&&(O.style.msInterpolationMode="bicubic"),setTimeout(function(){u(O)},1)}),setTimeout(function(){O.src=n},1)):n&&I.load(n,K.data,function(t,i){u("error"===i?o(dt,"Error").html(K.xhrError):e(this).contents())})},G.next=function(){!q&&T[1]&&(K.loop||T[A+1])&&(A=n(1),G.load())},G.prev=function(){!q&&T[1]&&(K.loop||A)&&(A=n(-1),G.load())},G.close=function(){j&&!U&&(U=!0,j=!1,d(ot,K.onCleanup),k.unbind("."+Y+" ."+st),m.fadeTo(200,0),w.stop().fadeTo(300,0,function(){w.add(m).css({opacity:1,cursor:"auto"}).hide(),d(rt),E.empty().remove(),setTimeout(function(){U=!1,d(nt,K.onClosed)},1)}))},G.remove=function(){e([]).add(w).add(m).remove(),w=null,e("."+Z).removeData(V).removeClass(Z),e(t).unbind("click."+Y)},G.element=function(){return e(N)},G.settings=J)})(jQuery,document,window);
\ No newline at end of file
+(function(t,e,i){function n(i,n,o){var r=e.createElement(i);return n&&(r.id=Z+n),o&&(r.style.cssText=o),t(r)}function o(){return i.innerHeight?i.innerHeight:t(i).height()}function r(e,i){i!==Object(i)&&(i={}),this.cache={},this.el=e,this.value=function(e){var n;return void 0===this.cache[e]&&(n=t(this.el).attr("data-cbox-"+e),void 0!==n?this.cache[e]=n:void 0!==i[e]?this.cache[e]=i[e]:void 0!==X[e]&&(this.cache[e]=X[e])),this.cache[e]},this.get=function(e){var i=this.value(e);return t.isFunction(i)?i.call(this.el,this):i}}function h(t){var e=W.length,i=(z+t)%e;return 0>i?e+i:i}function a(t,e){return Math.round((/%/.test(t)?("x"===e?E.width():o())/100:1)*parseInt(t,10))}function s(t,e){return t.get("photo")||t.get("photoRegex").test(e)}function l(t,e){return t.get("retinaUrl")&&i.devicePixelRatio>1?e.replace(t.get("photoRegex"),t.get("retinaSuffix")):e}function d(t){"contains"in y[0]&&!y[0].contains(t.target)&&t.target!==v[0]&&(t.stopPropagation(),y.focus())}function c(t){c.str!==t&&(y.add(v).removeClass(c.str).addClass(t),c.str=t)}function g(e){z=0,e&&e!==!1&&"nofollow"!==e?(W=t("."+te).filter(function(){var i=t.data(this,Y),n=new r(this,i);return n.get("rel")===e}),z=W.index(_.el),-1===z&&(W=W.add(_.el),z=W.length-1)):W=t(_.el)}function u(i){t(e).trigger(i),ae.triggerHandler(i)}function f(i){var o;if(!G){if(o=t(i).data(Y),_=new r(i,o),g(_.get("rel")),!$){$=q=!0,c(_.get("className")),y.css({visibility:"hidden",display:"block",opacity:""}),L=n(se,"LoadedContent","width:0; height:0; overflow:hidden; visibility:hidden"),b.css({width:"",height:""}).append(L),D=T.height()+k.height()+b.outerHeight(!0)-b.height(),j=C.width()+H.width()+b.outerWidth(!0)-b.width(),A=L.outerHeight(!0),N=L.outerWidth(!0);var h=a(_.get("initialWidth"),"x"),s=a(_.get("initialHeight"),"y"),l=_.get("maxWidth"),f=_.get("maxHeight");_.w=(l!==!1?Math.min(h,a(l,"x")):h)-N-j,_.h=(f!==!1?Math.min(s,a(f,"y")):s)-A-D,L.css({width:"",height:_.h}),J.position(),u(ee),_.get("onOpen"),O.add(F).hide(),y.focus(),_.get("trapFocus")&&e.addEventListener&&(e.addEventListener("focus",d,!0),ae.one(re,function(){e.removeEventListener("focus",d,!0)})),_.get("returnFocus")&&ae.one(re,function(){t(_.el).focus()})}var p=parseFloat(_.get("opacity"));v.css({opacity:p===p?p:"",cursor:_.get("overlayClose")?"pointer":"",visibility:"visible"}).show(),_.get("closeButton")?B.html(_.get("close")).appendTo(b):B.appendTo("<div/>"),w()}}function p(){y||(V=!1,E=t(i),y=n(se).attr({id:Y,"class":t.support.opacity===!1?Z+"IE":"",role:"dialog",tabindex:"-1"}).hide(),v=n(se,"Overlay").hide(),S=t([n(se,"LoadingOverlay")[0],n(se,"LoadingGraphic")[0]]),x=n(se,"Wrapper"),b=n(se,"Content").append(F=n(se,"Title"),I=n(se,"Current"),P=t('<button type="button"/>').attr({id:Z+"Previous"}),K=t('<button type="button"/>').attr({id:Z+"Next"}),R=n("button","Slideshow"),S),B=t('<button type="button"/>').attr({id:Z+"Close"}),x.append(n(se).append(n(se,"TopLeft"),T=n(se,"TopCenter"),n(se,"TopRight")),n(se,!1,"clear:left").append(C=n(se,"MiddleLeft"),b,H=n(se,"MiddleRight")),n(se,!1,"clear:left").append(n(se,"BottomLeft"),k=n(se,"BottomCenter"),n(se,"BottomRight"))).find("div div").css({"float":"left"}),M=n(se,!1,"position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;"),O=K.add(P).add(I).add(R)),e.body&&!y.parent().length&&t(e.body).append(v,y.append(x,M))}function m(){function i(t){t.which>1||t.shiftKey||t.altKey||t.metaKey||t.ctrlKey||(t.preventDefault(),f(this))}return y?(V||(V=!0,K.click(function(){J.next()}),P.click(function(){J.prev()}),B.click(function(){J.close()}),v.click(function(){_.get("overlayClose")&&J.close()}),t(e).bind("keydown."+Z,function(t){var e=t.keyCode;$&&_.get("escKey")&&27===e&&(t.preventDefault(),J.close()),$&&_.get("arrowKey")&&W[1]&&!t.altKey&&(37===e?(t.preventDefault(),P.click()):39===e&&(t.preventDefault(),K.click()))}),t.isFunction(t.fn.on)?t(e).on("click."+Z,"."+te,i):t("."+te).live("click."+Z,i)),!0):!1}function w(){var e,o,r,h=J.prep,d=++le;if(q=!0,U=!1,u(he),u(ie),_.get("onLoad"),_.h=_.get("height")?a(_.get("height"),"y")-A-D:_.get("innerHeight")&&a(_.get("innerHeight"),"y"),_.w=_.get("width")?a(_.get("width"),"x")-N-j:_.get("innerWidth")&&a(_.get("innerWidth"),"x"),_.mw=_.w,_.mh=_.h,_.get("maxWidth")&&(_.mw=a(_.get("maxWidth"),"x")-N-j,_.mw=_.w&&_.w<_.mw?_.w:_.mw),_.get("maxHeight")&&(_.mh=a(_.get("maxHeight"),"y")-A-D,_.mh=_.h&&_.h<_.mh?_.h:_.mh),e=_.get("href"),Q=setTimeout(function(){S.show()},100),_.get("inline")){var c=t(e);r=t("<div>").hide().insertBefore(c),ae.one(he,function(){r.replaceWith(c)}),h(c)}else _.get("iframe")?h(" "):_.get("html")?h(_.get("html")):s(_,e)?(e=l(_,e),U=new Image,t(U).addClass(Z+"Photo").bind("error",function(){h(n(se,"Error").html(_.get("imgError")))}).one("load",function(){d===le&&setTimeout(function(){var e;t.each(["alt","longdesc","aria-describedby"],function(e,i){var n=t(_.el).attr(i)||t(_.el).attr("data-"+i);n&&U.setAttribute(i,n)}),_.get("retinaImage")&&i.devicePixelRatio>1&&(U.height=U.height/i.devicePixelRatio,U.width=U.width/i.devicePixelRatio),_.get("scalePhotos")&&(o=function(){U.height-=U.height*e,U.width-=U.width*e},_.mw&&U.width>_.mw&&(e=(U.width-_.mw)/U.width,o()),_.mh&&U.height>_.mh&&(e=(U.height-_.mh)/U.height,o())),_.h&&(U.style.marginTop=Math.max(_.mh-U.height,0)/2+"px"),W[1]&&(_.get("loop")||W[z+1])&&(U.style.cursor="pointer",U.onclick=function(){J.next()}),U.style.width=U.width+"px",U.style.height=U.height+"px",h(U)},1)}),U.src=e):e&&M.load(e,_.get("data"),function(e,i){d===le&&h("error"===i?n(se,"Error").html(_.get("xhrError")):t(this).contents())})}var v,y,x,b,T,C,H,k,W,E,L,M,S,F,I,R,K,P,B,O,_,D,j,A,N,z,U,$,q,G,Q,J,V,X={html:!1,photo:!1,iframe:!1,inline:!1,transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,opacity:.9,preloading:!0,className:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0,fastIframe:!0,open:!1,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",returnFocus:!0,trapFocus:!0,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,rel:function(){return this.rel},href:function(){return t(this).attr("href")},title:function(){return this.title}},Y="colorbox",Z="cbox",te=Z+"Element",ee=Z+"_open",ie=Z+"_load",ne=Z+"_complete",oe=Z+"_cleanup",re=Z+"_closed",he=Z+"_purge",ae=t("<a/>"),se="div",le=0,de={},ce=function(){function t(){clearTimeout(h)}function e(){(_.get("loop")||W[z+1])&&(t(),h=setTimeout(J.next,_.get("slideshowSpeed")))}function i(){R.html(_.get("slideshowStop")).unbind(s).one(s,n),ae.bind(ne,e).bind(ie,t),y.removeClass(a+"off").addClass(a+"on")}function n(){t(),ae.unbind(ne,e).unbind(ie,t),R.html(_.get("slideshowStart")).unbind(s).one(s,function(){J.next(),i()}),y.removeClass(a+"on").addClass(a+"off")}function o(){r=!1,R.hide(),t(),ae.unbind(ne,e).unbind(ie,t),y.removeClass(a+"off "+a+"on")}var r,h,a=Z+"Slideshow_",s="click."+Z;return function(){r?_.get("slideshow")||(ae.unbind(oe,o),o()):_.get("slideshow")&&W[1]&&(r=!0,ae.one(oe,o),_.get("slideshowAuto")?i():n(),R.show())}}();t[Y]||(t(p),J=t.fn[Y]=t[Y]=function(e,i){var n,o=this;if(e=e||{},t.isFunction(o))o=t("<a/>"),e.open=!0;else if(!o[0])return o;return o[0]?(p(),m()&&(i&&(e.onComplete=i),o.each(function(){var i=t.data(this,Y)||{};t.data(this,Y,t.extend(i,e))}).addClass(te),n=new r(o[0],e),n.get("open")&&f(o[0])),o):o},J.position=function(e,i){function n(){T[0].style.width=k[0].style.width=b[0].style.width=parseInt(y[0].style.width,10)-j+"px",b[0].style.height=C[0].style.height=H[0].style.height=parseInt(y[0].style.height,10)-D+"px"}var r,h,s,l=0,d=0,c=y.offset();if(E.unbind("resize."+Z),y.css({top:-9e4,left:-9e4}),h=E.scrollTop(),s=E.scrollLeft(),_.get("fixed")?(c.top-=h,c.left-=s,y.css({position:"fixed"})):(l=h,d=s,y.css({position:"absolute"})),d+=_.get("right")!==!1?Math.max(E.width()-_.w-N-j-a(_.get("right"),"x"),0):_.get("left")!==!1?a(_.get("left"),"x"):Math.round(Math.max(E.width()-_.w-N-j,0)/2),l+=_.get("bottom")!==!1?Math.max(o()-_.h-A-D-a(_.get("bottom"),"y"),0):_.get("top")!==!1?a(_.get("top"),"y"):Math.round(Math.max(o()-_.h-A-D,0)/2),y.css({top:c.top,left:c.left,visibility:"visible"}),x[0].style.width=x[0].style.height="9999px",r={width:_.w+N+j,height:_.h+A+D,top:l,left:d},e){var g=0;t.each(r,function(t){return r[t]!==de[t]?(g=e,void 0):void 0}),e=g}de=r,e||y.css(r),y.dequeue().animate(r,{duration:e||0,complete:function(){n(),q=!1,x[0].style.width=_.w+N+j+"px",x[0].style.height=_.h+A+D+"px",_.get("reposition")&&setTimeout(function(){E.bind("resize."+Z,J.position)},1),t.isFunction(i)&&i()},step:n})},J.resize=function(t){var e;$&&(t=t||{},t.width&&(_.w=a(t.width,"x")-N-j),t.innerWidth&&(_.w=a(t.innerWidth,"x")),L.css({width:_.w}),t.height&&(_.h=a(t.height,"y")-A-D),t.innerHeight&&(_.h=a(t.innerHeight,"y")),t.innerHeight||t.height||(e=L.scrollTop(),L.css({height:"auto"}),_.h=L.height()),L.css({height:_.h}),e&&L.scrollTop(e),J.position("none"===_.get("transition")?0:_.get("speed")))},J.prep=function(i){function o(){return _.w=_.w||L.width(),_.w=_.mw&&_.mw<_.w?_.mw:_.w,_.w}function a(){return _.h=_.h||L.height(),_.h=_.mh&&_.mh<_.h?_.mh:_.h,_.h}if($){var d,g="none"===_.get("transition")?0:_.get("speed");L.remove(),L=n(se,"LoadedContent").append(i),L.hide().appendTo(M.show()).css({width:o(),overflow:_.get("scrolling")?"auto":"hidden"}).css({height:a()}).prependTo(b),M.hide(),t(U).css({"float":"none"}),c(_.get("className")),d=function(){function i(){t.support.opacity===!1&&y[0].style.removeAttribute("filter")}var n,o,a=W.length;$&&(o=function(){clearTimeout(Q),S.hide(),u(ne),_.get("onComplete")},F.html(_.get("title")).show(),L.show(),a>1?("string"==typeof _.get("current")&&I.html(_.get("current").replace("{current}",z+1).replace("{total}",a)).show(),K[_.get("loop")||a-1>z?"show":"hide"]().html(_.get("next")),P[_.get("loop")||z?"show":"hide"]().html(_.get("previous")),ce(),_.get("preloading")&&t.each([h(-1),h(1)],function(){var i,n=W[this],o=new r(n,t.data(n,Y)),h=o.get("href");h&&s(o,h)&&(h=l(o,h),i=e.createElement("img"),i.src=h)})):O.hide(),_.get("iframe")?(n=e.createElement("iframe"),"frameBorder"in n&&(n.frameBorder=0),"allowTransparency"in n&&(n.allowTransparency="true"),_.get("scrolling")||(n.scrolling="no"),t(n).attr({src:_.get("href"),name:(new Date).getTime(),"class":Z+"Iframe",allowFullScreen:!0}).one("load",o).appendTo(L),ae.one(he,function(){n.src="//about:blank"}),_.get("fastIframe")&&t(n).trigger("load")):o(),"fade"===_.get("transition")?y.fadeTo(g,1,i):i())},"fade"===_.get("transition")?y.fadeTo(g,0,function(){J.position(0,d)}):J.position(g,d)}},J.next=function(){!q&&W[1]&&(_.get("loop")||W[z+1])&&(z=h(1),f(W[z]))},J.prev=function(){!q&&W[1]&&(_.get("loop")||z)&&(z=h(-1),f(W[z]))},J.close=function(){$&&!G&&(G=!0,$=!1,u(oe),_.get("onCleanup"),E.unbind("."+Z),v.fadeTo(_.get("fadeOut")||0,0),y.stop().fadeTo(_.get("fadeOut")||0,0,function(){y.hide(),v.hide(),u(he),L.remove(),setTimeout(function(){G=!1,u(re),_.get("onClosed")},1)}))},J.remove=function(){y&&(y.stop(),t[Y].close(),y.stop(!1,!0).remove(),v.remove(),G=!1,y=null,t("."+te).removeData(Y).removeClass(te),t(e).unbind("click."+Z).unbind("keydown."+Z))},J.element=function(){return t(_.el)},J.settings=X)})(jQuery,document,window);
\ No newline at end of file
diff --git a/sources/themes/default/js/plugins/piecon.js b/sources/themes/default/js/plugins/piecon.js
new file mode 100644
index 0000000..f606706
--- /dev/null
+++ b/sources/themes/default/js/plugins/piecon.js
@@ -0,0 +1,189 @@
+//
+// piecon.js
+//
+// https://github.com/lipka/piecon
+//
+// Copyright (c) 2015 Lukas Lipka <lukaslipka@gmail.com>. All rights reserved.
+//
+
+(function(){
+    var Piecon = {};
+
+    var currentFavicon = null;
+    var originalFavicon = null;
+    var originalTitle = null;
+    var canvas = null;
+    var options = {};
+    var defaults = {
+        color: '#ff0084',
+        background: '#bbb',
+        shadow: '#fff',
+        fallback: false
+    };
+
+    var isRetina = window.devicePixelRatio > 1;
+
+    var ua = (function () {
+        var agent = navigator.userAgent.toLowerCase();
+        return function (browser) {
+            return agent.indexOf(browser) !== -1;
+        };
+    }());
+
+    var browser = {
+        ie: ua('msie'),
+        chrome: ua('chrome'),
+        webkit: ua('chrome') || ua('safari'),
+        safari: ua('safari') && !ua('chrome'),
+        mozilla: ua('mozilla') && !ua('chrome') && !ua('safari')
+    };
+
+    var getFaviconTag = function() {
+        var links = document.getElementsByTagName('link');
+
+        for (var i = 0, l = links.length; i < l; i++) {
+            if (links[i].getAttribute('rel') === 'icon' || links[i].getAttribute('rel') === 'shortcut icon') {
+                return links[i];
+            }
+        }
+
+        return false;
+    };
+
+    var removeFaviconTag = function() {
+        var links = Array.prototype.slice.call(document.getElementsByTagName('link'), 0);
+        var head = document.getElementsByTagName('head')[0];
+
+        for (var i = 0, l = links.length; i < l; i++) {
+            if (links[i].getAttribute('rel') === 'icon' || links[i].getAttribute('rel') === 'shortcut icon') {
+                head.removeChild(links[i]);
+            }
+        }
+    };
+
+    var setFaviconTag = function(url) {
+        removeFaviconTag();
+
+        var link = document.createElement('link');
+        link.type = 'image/x-icon';
+        link.rel = 'icon';
+        link.href = url;
+
+        document.getElementsByTagName('head')[0].appendChild(link);
+    };
+
+    var getCanvas = function () {
+        if (!canvas) {
+            canvas = document.createElement("canvas");
+            if (isRetina) {
+                canvas.width = 32;
+                canvas.height = 32;
+            } else {
+                canvas.width = 16;
+                canvas.height = 16;
+            }
+        }
+
+        return canvas;
+    };
+
+    var drawFavicon = function(percentage) {
+        var canvas = getCanvas();
+        var context = canvas.getContext("2d");
+
+        percentage = percentage || 0;
+
+        if (context) {
+            context.clearRect(0, 0, canvas.width, canvas.height);
+
+            // Draw shadow
+            context.beginPath();
+            context.moveTo(canvas.width / 2, canvas.height / 2);
+            context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2), 0, Math.PI * 2, false);
+            context.fillStyle = options.shadow;
+            context.fill();
+
+            // Draw background
+            context.beginPath();
+            context.moveTo(canvas.width / 2, canvas.height / 2);
+            context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, 0, Math.PI * 2, false);
+            context.fillStyle = options.background;
+            context.fill();
+
+            // Draw pie
+            if (percentage > 0) {
+                context.beginPath();
+                context.moveTo(canvas.width / 2, canvas.height / 2);
+                context.arc(canvas.width / 2, canvas.height / 2, Math.min(canvas.width / 2, canvas.height / 2) - 2, (-0.5) * Math.PI, (-0.5 + 2 * percentage / 100) * Math.PI, false);
+                context.lineTo(canvas.width / 2, canvas.height / 2);
+                context.fillStyle = options.color;
+                context.fill();
+            }
+
+            setFaviconTag(canvas.toDataURL());
+        }
+    };
+
+    var updateTitle = function(percentage) {
+        if (percentage > 0) {
+            document.title = '(' + percentage + '%) ' + originalTitle;
+        } else {
+            document.title = originalTitle;
+        }
+    };
+
+    Piecon.setOptions = function(custom) {
+        options = {};
+
+        for (var key in defaults){
+            options[key] = custom.hasOwnProperty(key) ? custom[key] : defaults[key];
+        }
+
+        return this;
+    };
+
+    Piecon.setProgress = function(percentage) {
+        if (!originalTitle) {
+            originalTitle = document.title;
+        }
+
+        if (!originalFavicon || !currentFavicon) {
+            var tag = getFaviconTag();
+            originalFavicon = currentFavicon = tag ? tag.getAttribute('href') : '/favicon.ico';
+        }
+
+        if (!isNaN(parseFloat(percentage)) && isFinite(percentage)) {
+            if (!getCanvas().getContext || browser.ie || browser.safari || options.fallback === true) {
+                // Fallback to updating the browser title if unsupported
+                return updateTitle(percentage);
+            } else if (options.fallback === 'force') {
+                updateTitle(percentage);
+            }
+
+            return drawFavicon(percentage);
+        }
+
+        return false;
+    };
+
+    Piecon.reset = function() {
+        if (originalTitle) {
+            document.title = originalTitle;
+        }
+
+        if (originalFavicon) {
+            currentFavicon = originalFavicon;
+            setFaviconTag(currentFavicon);
+        }
+    };
+
+    Piecon.setOptions(defaults);
+
+    if(typeof define === 'function' && define.amd) {
+        define(Piecon);
+    } else if (typeof module !== 'undefined') {
+        module.exports = Piecon;
+    } else {
+        window.Piecon = Piecon;
+    }
+})();
diff --git a/sources/themes/default/js/plugins/selectize.clear.css b/sources/themes/default/js/plugins/selectize.clear.css
index 0d8947e..9a60ad9 100644
--- a/sources/themes/default/js/plugins/selectize.clear.css
+++ b/sources/themes/default/js/plugins/selectize.clear.css
@@ -1,5 +1,5 @@
 /**
- * selectize.default.css (v0.9.1) - Default Theme
+ * selectize.default.css (v0.11.2) - Default Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -189,6 +189,7 @@
   border: 1px solid #aaaaaa;
 }
 .selectize-input > input {
+  display: inline-block !important;
   padding: 0 !important;
   min-height: 0 !important;
   max-height: none !important;
diff --git a/sources/themes/default/js/plugins/selectize.dark.css b/sources/themes/default/js/plugins/selectize.dark.css
index 3f4842d..8112543 100644
--- a/sources/themes/default/js/plugins/selectize.dark.css
+++ b/sources/themes/default/js/plugins/selectize.dark.css
@@ -1,5 +1,5 @@
 /**
- * selectize.dark.css (v0.9.1) - Dark Theme
+ * selectize.dark.css (v0.11.2) - Dark Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -190,6 +190,7 @@
   border: 1px solid #aaaaaa;
 }
 .selectize-input > input {
+  display: inline-block !important;
   padding: 0 !important;
   min-height: 0 !important;
   max-height: none !important;
diff --git a/sources/themes/default/js/plugins/selectize.min.js b/sources/themes/default/js/plugins/selectize.min.js
index ae86838..9429192 100644
--- a/sources/themes/default/js/plugins/selectize.min.js
+++ b/sources/themes/default/js/plugins/selectize.min.js
@@ -1,3 +1,3 @@
-/*! selectize.js - v0.9.1 | https://github.com/brianreavis/selectize.js | Apache License (v2) */
-!function(a,b){"function"==typeof define&&define.amd?define("sifter",b):"object"==typeof exports?module.exports=b():a.Sifter=b()}(this,function(){var a=function(a,b){this.items=a,this.settings=b||{diacritics:!0}};a.prototype.tokenize=function(a){if(a=d(String(a||"").toLowerCase()),!a||!a.length)return[];var b,c,f,h,i=[],j=a.split(/ +/);for(b=0,c=j.length;c>b;b++){if(f=e(j[b]),this.settings.diacritics)for(h in g)g.hasOwnProperty(h)&&(f=f.replace(new RegExp(h,"g"),g[h]));i.push({string:j[b],regex:new RegExp(f,"i")})}return i},a.prototype.iterator=function(a,b){var c;c=f(a)?Array.prototype.forEach||function(a){for(var b=0,c=this.length;c>b;b++)a(this[b],b,this)}:function(a){for(var b in this)this.hasOwnProperty(b)&&a(this[b],b,this)},c.apply(a,[b])},a.prototype.getScoreFunction=function(a,b){var c,d,e,f;c=this,a=c.prepareSearch(a,b),e=a.tokens,d=a.options.fields,f=e.length;var g=function(a,b){var c,d;return a?(a=String(a||""),d=a.search(b.regex),-1===d?0:(c=b.string.length/a.length,0===d&&(c+=.5),c)):0},h=function(){var a=d.length;return a?1===a?function(a,b){return g(b[d[0]],a)}:function(b,c){for(var e=0,f=0;a>e;e++)f+=g(c[d[e]],b);return f/a}:function(){return 0}}();return f?1===f?function(a){return h(e[0],a)}:"and"===a.options.conjunction?function(a){for(var b,c=0,d=0;f>c;c++){if(b=h(e[c],a),0>=b)return 0;d+=b}return d/f}:function(a){for(var b=0,c=0;f>b;b++)c+=h(e[b],a);return c/f}:function(){return 0}},a.prototype.getSortFunction=function(a,c){var d,e,f,g,h,i,j,k,l,m,n;if(f=this,a=f.prepareSearch(a,c),n=!a.query&&c.sort_empty||c.sort,l=function(a,b){return"$score"===a?b.score:f.items[b.id][a]},h=[],n)for(d=0,e=n.length;e>d;d++)(a.query||"$score"!==n[d].field)&&h.push(n[d]);if(a.query){for(m=!0,d=0,e=h.length;e>d;d++)if("$score"===h[d].field){m=!1;break}m&&h.unshift({field:"$score",direction:"desc"})}else for(d=0,e=h.length;e>d;d++)if("$score"===h[d].field){h.splice(d,1);break}for(k=[],d=0,e=h.length;e>d;d++)k.push("desc"===h[d].direction?-1:1);return i=h.length,i?1===i?(g=h[0].field,j=k[0],function(a,c){return j*b(l(g,a),l(g,c))}):function(a,c){var d,e,f;for(d=0;i>d;d++)if(f=h[d].field,e=k[d]*b(l(f,a),l(f,c)))return e;return 0}:null},a.prototype.prepareSearch=function(a,b){if("object"==typeof a)return a;b=c({},b);var d=b.fields,e=b.sort,g=b.sort_empty;return d&&!f(d)&&(b.fields=[d]),e&&!f(e)&&(b.sort=[e]),g&&!f(g)&&(b.sort_empty=[g]),{options:b,query:String(a||"").toLowerCase(),tokens:this.tokenize(a),total:0,items:[]}},a.prototype.search=function(a,b){var c,d,e,f,g=this;return d=this.prepareSearch(a,b),b=d.options,a=d.query,f=b.score||g.getScoreFunction(d),a.length?g.iterator(g.items,function(a,e){c=f(a),(b.filter===!1||c>0)&&d.items.push({score:c,id:e})}):g.iterator(g.items,function(a,b){d.items.push({score:1,id:b})}),e=g.getSortFunction(d,b),e&&d.items.sort(e),d.total=d.items.length,"number"==typeof b.limit&&(d.items=d.items.slice(0,b.limit)),d};var b=function(a,b){return"number"==typeof a&&"number"==typeof b?a>b?1:b>a?-1:0:(a=String(a||"").toLowerCase(),b=String(b||"").toLowerCase(),a>b?1:b>a?-1:0)},c=function(a){var b,c,d,e;for(b=1,c=arguments.length;c>b;b++)if(e=arguments[b])for(d in e)e.hasOwnProperty(d)&&(a[d]=e[d]);return a},d=function(a){return(a+"").replace(/^\s+|\s+$|/g,"")},e=function(a){return(a+"").replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")},f=Array.isArray||$&&$.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)},g={a:"[aÀÁÂÃÄÅàáâãäå]",c:"[cÇçćĆčČ]",d:"[dđĐďĎ]",e:"[eÈÉÊËèéêëěĚ]",i:"[iÌÍÎÏìíîï]",n:"[nÑñňŇ]",o:"[oÒÓÔÕÕÖØòóôõöø]",r:"[rřŘ]",s:"[sŠš]",t:"[tťŤ]",u:"[uÙÚÛÜùúûüůŮ]",y:"[yŸÿýÝ]",z:"[zŽž]"};return a}),function(a,b){"function"==typeof define&&define.amd?define("microplugin",b):"object"==typeof exports?module.exports=b():a.MicroPlugin=b()}(this,function(){var a={};a.mixin=function(a){a.plugins={},a.prototype.initializePlugins=function(a){var c,d,e,f=this,g=[];if(f.plugins={names:[],settings:{},requested:{},loaded:{}},b.isArray(a))for(c=0,d=a.length;d>c;c++)"string"==typeof a[c]?g.push(a[c]):(f.plugins.settings[a[c].name]=a[c].options,g.push(a[c].name));else if(a)for(e in a)a.hasOwnProperty(e)&&(f.plugins.settings[e]=a[e],g.push(e));for(;g.length;)f.require(g.shift())},a.prototype.loadPlugin=function(b){var c=this,d=c.plugins,e=a.plugins[b];if(!a.plugins.hasOwnProperty(b))throw new Error('Unable to find "'+b+'" plugin');d.requested[b]=!0,d.loaded[b]=e.fn.apply(c,[c.plugins.settings[b]||{}]),d.names.push(b)},a.prototype.require=function(a){var b=this,c=b.plugins;if(!b.plugins.loaded.hasOwnProperty(a)){if(c.requested[a])throw new Error('Plugin has circular dependency ("'+a+'")');b.loadPlugin(a)}return c.loaded[a]},a.define=function(b,c){a.plugins[b]={name:b,fn:c}}};var b={isArray:Array.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)}};return a}),function(a,b){"function"==typeof define&&define.amd?define("selectize",["jquery","sifter","microplugin"],b):"object"==typeof exports?module.exports=b(require("jquery"),require("sifter"),require("microplugin")):a.Selectize=b(a.jQuery,a.Sifter,a.MicroPlugin)}(this,function(a,b,c){"use strict";var d=function(a,b){if("string"!=typeof b||b.length){var c="string"==typeof b?new RegExp(b,"i"):b,d=function(a){var b=0;if(3===a.nodeType){var e=a.data.search(c);if(e>=0&&a.data.length>0){var f=a.data.match(c),g=document.createElement("span");g.className="highlight";var h=a.splitText(e),i=(h.splitText(f[0].length),h.cloneNode(!0));g.appendChild(i),h.parentNode.replaceChild(g,h),b=1}}else if(1===a.nodeType&&a.childNodes&&!/(script|style)/i.test(a.tagName))for(var j=0;j<a.childNodes.length;++j)j+=d(a.childNodes[j]);return b};return a.each(function(){d(this)})}},e=function(){};e.prototype={on:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},off:function(a,b){var c=arguments.length;return 0===c?delete this._events:1===c?delete this._events[a]:(this._events=this._events||{},void(a in this._events!=!1&&this._events[a].splice(this._events[a].indexOf(b),1)))},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;b<this._events[a].length;b++)this._events[a][b].apply(this,Array.prototype.slice.call(arguments,1))}},e.mixin=function(a){for(var b=["on","off","trigger"],c=0;c<b.length;c++)a.prototype[b[c]]=e.prototype[b[c]]};var f=/Mac/.test(navigator.userAgent),g=65,h=13,i=27,j=37,k=38,l=80,m=39,n=40,o=78,p=8,q=46,r=16,s=f?91:17,t=f?18:17,u=9,v=1,w=2,x=function(a){return"undefined"!=typeof a},y=function(a){return"undefined"==typeof a||null===a?"":"boolean"==typeof a?a?"1":"0":a+""},z=function(a){return(a+"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")},A=function(a){return(a+"").replace(/\$/g,"$$$$")},B={};B.before=function(a,b,c){var d=a[b];a[b]=function(){return c.apply(a,arguments),d.apply(a,arguments)}},B.after=function(a,b,c){var d=a[b];a[b]=function(){var b=d.apply(a,arguments);return c.apply(a,arguments),b}};var C=function(b,c){if(!a.isArray(c))return c;var d,e,f={};for(d=0,e=c.length;e>d;d++)c[d].hasOwnProperty(b)&&(f[c[d][b]]=c[d]);return f},D=function(a){var b=!1;return function(){b||(b=!0,a.apply(this,arguments))}},E=function(a,b){var c;return function(){var d=this,e=arguments;window.clearTimeout(c),c=window.setTimeout(function(){a.apply(d,e)},b)}},F=function(a,b,c){var d,e=a.trigger,f={};a.trigger=function(){var c=arguments[0];return-1===b.indexOf(c)?e.apply(a,arguments):void(f[c]=arguments)},c.apply(a,[]),a.trigger=e;for(d in f)f.hasOwnProperty(d)&&e.apply(a,f[d])},G=function(a,b,c,d){a.on(b,c,function(b){for(var c=b.target;c&&c.parentNode!==a[0];)c=c.parentNode;return b.currentTarget=c,d.apply(this,[b])})},H=function(a){var b={};if("selectionStart"in a)b.start=a.selectionStart,b.length=a.selectionEnd-b.start;else if(document.selection){a.focus();var c=document.selection.createRange(),d=document.selection.createRange().text.length;c.moveStart("character",-a.value.length),b.start=c.text.length-d,b.length=d}return b},I=function(a,b,c){var d,e,f={};if(c)for(d=0,e=c.length;e>d;d++)f[c[d]]=a.css(c[d]);else f=a.css();b.css(f)},J=function(b,c){if(!b)return 0;var d=a("<test>").css({position:"absolute",top:-99999,left:-99999,width:"auto",padding:0,whiteSpace:"pre"}).text(b).appendTo("body");I(c,d,["letterSpacing","fontSize","fontFamily","fontWeight","textTransform"]);var e=d.width();return d.remove(),e},K=function(a){var b=null,c=function(c,d){var e,f,g,h,i,j,k,l;c=c||window.event||{},d=d||{},c.metaKey||c.altKey||(d.force||a.data("grow")!==!1)&&(e=a.val(),c.type&&"keydown"===c.type.toLowerCase()&&(f=c.keyCode,g=f>=97&&122>=f||f>=65&&90>=f||f>=48&&57>=f||32===f,f===q||f===p?(l=H(a[0]),l.length?e=e.substring(0,l.start)+e.substring(l.start+l.length):f===p&&l.start?e=e.substring(0,l.start-1)+e.substring(l.start+1):f===q&&"undefined"!=typeof l.start&&(e=e.substring(0,l.start)+e.substring(l.start+1))):g&&(j=c.shiftKey,k=String.fromCharCode(c.keyCode),k=j?k.toUpperCase():k.toLowerCase(),e+=k)),h=a.attr("placeholder"),!e&&h&&(e=h),i=J(e,a)+4,i!==b&&(b=i,a.width(i),a.triggerHandler("resize")))};a.on("keydown keyup update blur",c),c()},L=function(c,d){var e,f,g=this;f=c[0],f.selectize=g,e=window.getComputedStyle?window.getComputedStyle(f,null).getPropertyValue("direction"):f.currentStyle&&f.currentStyle.direction,e=e||c.parents("[dir]:first").attr("dir")||"",a.extend(g,{settings:d,$input:c,tagType:"select"===f.tagName.toLowerCase()?v:w,rtl:/rtl/i.test(e),eventNS:".selectize"+ ++L.count,highlightedValue:null,isOpen:!1,isDisabled:!1,isRequired:c.is("[required]"),isInvalid:!1,isLocked:!1,isFocused:!1,isInputHidden:!1,isSetup:!1,isShiftDown:!1,isCmdDown:!1,isCtrlDown:!1,ignoreFocus:!1,ignoreHover:!1,hasOptions:!1,currentResults:null,lastValue:"",caretPos:0,loading:0,loadedSearches:{},$activeOption:null,$activeItems:[],optgroups:{},options:{},userOptions:{},items:[],renderCache:{},onSearchChange:null===d.loadThrottle?g.onSearchChange:E(g.onSearchChange,d.loadThrottle)}),g.sifter=new b(this.options,{diacritics:d.diacritics}),a.extend(g.options,C(d.valueField,d.options)),delete g.settings.options,a.extend(g.optgroups,C(d.optgroupValueField,d.optgroups)),delete g.settings.optgroups,g.settings.mode=g.settings.mode||(1===g.settings.maxItems?"single":"multi"),"boolean"!=typeof g.settings.hideSelected&&(g.settings.hideSelected="multi"===g.settings.mode),g.initializePlugins(g.settings.plugins),g.setupCallbacks(),g.setupTemplates(),g.setup()};return e.mixin(L),c.mixin(L),a.extend(L.prototype,{setup:function(){var b,c,d,e,g,h,i,j,k,l,m=this,n=m.settings,o=m.eventNS,p=a(window),q=a(document);i=m.settings.mode,j=m.$input.attr("tabindex")||"",k=m.$input.attr("class")||"",b=a("<div>").addClass(n.wrapperClass).addClass(k).addClass(i),c=a("<div>").addClass(n.inputClass).addClass("items").appendTo(b),d=a('<input type="text" autocomplete="off" />').appendTo(c).attr("tabindex",j),h=a(n.dropdownParent||b),e=a("<div>").addClass(n.dropdownClass).addClass(k).addClass(i).hide().appendTo(h),g=a("<div>").addClass(n.dropdownContentClass).appendTo(e),b.css({width:m.$input[0].style.width}),m.plugins.names.length&&(l="plugin-"+m.plugins.names.join(" plugin-"),b.addClass(l),e.addClass(l)),(null===n.maxItems||n.maxItems>1)&&m.tagType===v&&m.$input.attr("multiple","multiple"),m.settings.placeholder&&d.attr("placeholder",n.placeholder),m.$input.attr("autocorrect")&&d.attr("autocorrect",m.$input.attr("autocorrect")),m.$input.attr("autocapitalize")&&d.attr("autocapitalize",m.$input.attr("autocapitalize")),m.$wrapper=b,m.$control=c,m.$control_input=d,m.$dropdown=e,m.$dropdown_content=g,e.on("mouseenter","[data-selectable]",function(){return m.onOptionHover.apply(m,arguments)}),e.on("mousedown","[data-selectable]",function(){return m.onOptionSelect.apply(m,arguments)}),G(c,"mousedown","*:not(input)",function(){return m.onItemSelect.apply(m,arguments)}),K(d),c.on({mousedown:function(){return m.onMouseDown.apply(m,arguments)},click:function(){return m.onClick.apply(m,arguments)}}),d.on({mousedown:function(a){a.stopPropagation()},keydown:function(){return m.onKeyDown.apply(m,arguments)},keyup:function(){return m.onKeyUp.apply(m,arguments)},keypress:function(){return m.onKeyPress.apply(m,arguments)},resize:function(){m.positionDropdown.apply(m,[])},blur:function(){return m.onBlur.apply(m,arguments)},focus:function(){return m.onFocus.apply(m,arguments)},paste:function(){return m.onPaste.apply(m,arguments)}}),q.on("keydown"+o,function(a){m.isCmdDown=a[f?"metaKey":"ctrlKey"],m.isCtrlDown=a[f?"altKey":"ctrlKey"],m.isShiftDown=a.shiftKey}),q.on("keyup"+o,function(a){a.keyCode===t&&(m.isCtrlDown=!1),a.keyCode===r&&(m.isShiftDown=!1),a.keyCode===s&&(m.isCmdDown=!1)}),q.on("mousedown"+o,function(a){if(m.isFocused){if(a.target===m.$dropdown[0]||a.target.parentNode===m.$dropdown[0])return!1;m.$control.has(a.target).length||a.target===m.$control[0]||m.blur()}}),p.on(["scroll"+o,"resize"+o].join(" "),function(){m.isOpen&&m.positionDropdown.apply(m,arguments)}),p.on("mousemove"+o,function(){m.ignoreHover=!1}),this.revertSettings={$children:m.$input.children().detach(),tabindex:m.$input.attr("tabindex")},m.$input.attr("tabindex",-1).hide().after(m.$wrapper),a.isArray(n.items)&&(m.setValue(n.items),delete n.items),m.$input[0].validity&&m.$input.on("invalid"+o,function(a){a.preventDefault(),m.isInvalid=!0,m.refreshState()}),m.updateOriginalInput(),m.refreshItems(),m.refreshState(),m.updatePlaceholder(),m.isSetup=!0,m.$input.is(":disabled")&&m.disable(),m.on("change",this.onChange),m.trigger("initialize"),n.preload===!0&&m.onSearchChange("")},setupTemplates:function(){var b=this,c=b.settings.labelField,d=b.settings.optgroupLabelField,e={optgroup:function(a){return'<div class="optgroup">'+a.html+"</div>"},optgroup_header:function(a,b){return'<div class="optgroup-header">'+b(a[d])+"</div>"},option:function(a,b){return'<div class="option">'+b(a[c])+"</div>"},item:function(a,b){return'<div class="item">'+b(a[c])+"</div>"},option_create:function(a,b){return'<div class="create">Add <strong>'+b(a.input)+"</strong>&hellip;</div>"}};b.settings.render=a.extend({},e,b.settings.render)},setupCallbacks:function(){var a,b,c={initialize:"onInitialize",change:"onChange",item_add:"onItemAdd",item_remove:"onItemRemove",clear:"onClear",option_add:"onOptionAdd",option_remove:"onOptionRemove",option_clear:"onOptionClear",dropdown_open:"onDropdownOpen",dropdown_close:"onDropdownClose",type:"onType"};for(a in c)c.hasOwnProperty(a)&&(b=this.settings[c[a]],b&&this.on(a,b))},onClick:function(a){var b=this;b.isFocused||(b.focus(),a.preventDefault())},onMouseDown:function(b){{var c=this,d=b.isDefaultPrevented();a(b.target)}if(c.isFocused){if(b.target!==c.$control_input[0])return"single"===c.settings.mode?c.isOpen?c.close():c.open():d||c.setActiveItem(null),!1}else d||window.setTimeout(function(){c.focus()},0)},onChange:function(){this.$input.trigger("change")},onPaste:function(a){var b=this;(b.isFull()||b.isInputHidden||b.isLocked)&&a.preventDefault()},onKeyPress:function(a){if(this.isLocked)return a&&a.preventDefault();var b=String.fromCharCode(a.keyCode||a.which);return this.settings.create&&b===this.settings.delimiter?(this.createItem(),a.preventDefault(),!1):void 0},onKeyDown:function(a){var b=(a.target===this.$control_input[0],this);if(b.isLocked)return void(a.keyCode!==u&&a.preventDefault());switch(a.keyCode){case g:if(b.isCmdDown)return void b.selectAll();break;case i:return void b.close();case o:if(!a.ctrlKey||a.altKey)break;case n:if(!b.isOpen&&b.hasOptions)b.open();else if(b.$activeOption){b.ignoreHover=!0;var c=b.getAdjacentOption(b.$activeOption,1);c.length&&b.setActiveOption(c,!0,!0)}return void a.preventDefault();case l:if(!a.ctrlKey||a.altKey)break;case k:if(b.$activeOption){b.ignoreHover=!0;var d=b.getAdjacentOption(b.$activeOption,-1);d.length&&b.setActiveOption(d,!0,!0)}return void a.preventDefault();case h:return b.isOpen&&b.$activeOption&&b.onOptionSelect({currentTarget:b.$activeOption}),void a.preventDefault();case j:return void b.advanceSelection(-1,a);case m:return void b.advanceSelection(1,a);case u:return b.settings.selectOnTab&&b.isOpen&&b.$activeOption&&b.onOptionSelect({currentTarget:b.$activeOption}),void(b.settings.create&&b.createItem()&&a.preventDefault());case p:case q:return void b.deleteSelection(a)}return!b.isFull()&&!b.isInputHidden||(f?a.metaKey:a.ctrlKey)?void 0:void a.preventDefault()},onKeyUp:function(a){var b=this;if(b.isLocked)return a&&a.preventDefault();var c=b.$control_input.val()||"";b.lastValue!==c&&(b.lastValue=c,b.onSearchChange(c),b.refreshOptions(),b.trigger("type",c))},onSearchChange:function(a){var b=this,c=b.settings.load;c&&(b.loadedSearches.hasOwnProperty(a)||(b.loadedSearches[a]=!0,b.load(function(d){c.apply(b,[a,d])})))},onFocus:function(a){var b=this;return b.isFocused=!0,b.isDisabled?(b.blur(),a&&a.preventDefault(),!1):void(b.ignoreFocus||("focus"===b.settings.preload&&b.onSearchChange(""),b.$activeItems.length||(b.showInput(),b.setActiveItem(null),b.refreshOptions(!!b.settings.openOnFocus)),b.refreshState()))},onBlur:function(){var a=this;a.isFocused=!1,a.ignoreFocus||(a.settings.create&&a.settings.createOnBlur&&a.createItem(!1),a.close(),a.setTextboxValue(""),a.setActiveItem(null),a.setActiveOption(null),a.setCaret(a.items.length),a.refreshState())},onOptionHover:function(a){this.ignoreHover||this.setActiveOption(a.currentTarget,!1)},onOptionSelect:function(b){var c,d,e=this;b.preventDefault&&(b.preventDefault(),b.stopPropagation()),d=a(b.currentTarget),d.hasClass("create")?e.createItem():(c=d.attr("data-value"),c&&(e.lastQuery=null,e.setTextboxValue(""),e.addItem(c),!e.settings.hideSelected&&b.type&&/mouse/.test(b.type)&&e.setActiveOption(e.getOption(c))))},onItemSelect:function(a){var b=this;b.isLocked||"multi"===b.settings.mode&&(a.preventDefault(),b.setActiveItem(a.currentTarget,a))},load:function(a){var b=this,c=b.$wrapper.addClass("loading");b.loading++,a.apply(b,[function(a){b.loading=Math.max(b.loading-1,0),a&&a.length&&(b.addOption(a),b.refreshOptions(b.isFocused&&!b.isInputHidden)),b.loading||c.removeClass("loading"),b.trigger("load",a)}])},setTextboxValue:function(a){var b=this.$control_input,c=b.val()!==a;c&&(b.val(a).triggerHandler("update"),this.lastValue=a)},getValue:function(){return this.tagType===v&&this.$input.attr("multiple")?this.items:this.items.join(this.settings.delimiter)},setValue:function(a){F(this,["change"],function(){this.clear(),this.addItems(a)})},setActiveItem:function(b,c){var d,e,f,g,h,i,j,k,l=this;if("single"!==l.settings.mode){if(b=a(b),!b.length)return a(l.$activeItems).removeClass("active"),l.$activeItems=[],void(l.isFocused&&l.showInput());if(d=c&&c.type.toLowerCase(),"mousedown"===d&&l.isShiftDown&&l.$activeItems.length){for(k=l.$control.children(".active:last"),g=Array.prototype.indexOf.apply(l.$control[0].childNodes,[k[0]]),h=Array.prototype.indexOf.apply(l.$control[0].childNodes,[b[0]]),g>h&&(j=g,g=h,h=j),e=g;h>=e;e++)i=l.$control[0].childNodes[e],-1===l.$activeItems.indexOf(i)&&(a(i).addClass("active"),l.$activeItems.push(i));c.preventDefault()}else"mousedown"===d&&l.isCtrlDown||"keydown"===d&&this.isShiftDown?b.hasClass("active")?(f=l.$activeItems.indexOf(b[0]),l.$activeItems.splice(f,1),b.removeClass("active")):l.$activeItems.push(b.addClass("active")[0]):(a(l.$activeItems).removeClass("active"),l.$activeItems=[b.addClass("active")[0]]);l.hideInput(),this.isFocused||l.focus()}},setActiveOption:function(b,c,d){var e,f,g,h,i,j=this;j.$activeOption&&j.$activeOption.removeClass("active"),j.$activeOption=null,b=a(b),b.length&&(j.$activeOption=b.addClass("active"),(c||!x(c))&&(e=j.$dropdown_content.height(),f=j.$activeOption.outerHeight(!0),c=j.$dropdown_content.scrollTop()||0,g=j.$activeOption.offset().top-j.$dropdown_content.offset().top+c,h=g,i=g-e+f,g+f>e+c?j.$dropdown_content.stop().animate({scrollTop:i},d?j.settings.scrollDuration:0):c>g&&j.$dropdown_content.stop().animate({scrollTop:h},d?j.settings.scrollDuration:0)))},selectAll:function(){var a=this;"single"!==a.settings.mode&&(a.$activeItems=Array.prototype.slice.apply(a.$control.children(":not(input)").addClass("active")),a.$activeItems.length&&(a.hideInput(),a.close()),a.focus())},hideInput:function(){var a=this;a.setTextboxValue(""),a.$control_input.css({opacity:0,position:"absolute",left:a.rtl?1e4:-1e4}),a.isInputHidden=!0},showInput:function(){this.$control_input.css({opacity:1,position:"relative",left:0}),this.isInputHidden=!1},focus:function(){var a=this;a.isDisabled||(a.ignoreFocus=!0,a.$control_input[0].focus(),window.setTimeout(function(){a.ignoreFocus=!1,a.onFocus()},0))},blur:function(){this.$control_input.trigger("blur")},getScoreFunction:function(a){return this.sifter.getScoreFunction(a,this.getSearchOptions())},getSearchOptions:function(){var a=this.settings,b=a.sortField;return"string"==typeof b&&(b={field:b}),{fields:a.searchField,conjunction:a.searchConjunction,sort:b}},search:function(b){var c,d,e,f=this,g=f.settings,h=this.getSearchOptions();if(g.score&&(e=f.settings.score.apply(this,[b]),"function"!=typeof e))throw new Error('Selectize "score" setting must be a function that returns a function');if(b!==f.lastQuery?(f.lastQuery=b,d=f.sifter.search(b,a.extend(h,{score:e})),f.currentResults=d):d=a.extend(!0,{},f.currentResults),g.hideSelected)for(c=d.items.length-1;c>=0;c--)-1!==f.items.indexOf(y(d.items[c].id))&&d.items.splice(c,1);return d},refreshOptions:function(b){var c,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s;"undefined"==typeof b&&(b=!0);var t=this,u=t.$control_input.val(),v=t.search(u),w=t.$dropdown_content,x=t.$activeOption&&y(t.$activeOption.attr("data-value"));if(g=v.items.length,"number"==typeof t.settings.maxOptions&&(g=Math.min(g,t.settings.maxOptions)),h={},t.settings.optgroupOrder)for(i=t.settings.optgroupOrder,c=0;c<i.length;c++)h[i[c]]=[];else i=[];for(c=0;g>c;c++)for(j=t.options[v.items[c].id],k=t.render("option",j),l=j[t.settings.optgroupField]||"",m=a.isArray(l)?l:[l],e=0,f=m&&m.length;f>e;e++)l=m[e],t.optgroups.hasOwnProperty(l)||(l=""),h.hasOwnProperty(l)||(h[l]=[],i.push(l)),h[l].push(k);for(n=[],c=0,g=i.length;g>c;c++)l=i[c],t.optgroups.hasOwnProperty(l)&&h[l].length?(o=t.render("optgroup_header",t.optgroups[l])||"",o+=h[l].join(""),n.push(t.render("optgroup",a.extend({},t.optgroups[l],{html:o})))):n.push(h[l].join(""));if(w.html(n.join("")),t.settings.highlight&&v.query.length&&v.tokens.length)for(c=0,g=v.tokens.length;g>c;c++)d(w,v.tokens[c].regex);if(!t.settings.hideSelected)for(c=0,g=t.items.length;g>c;c++)t.getOption(t.items[c]).addClass("selected");p=t.settings.create&&v.query.length,p&&(w.prepend(t.render("option_create",{input:u})),s=a(w[0].childNodes[0])),t.hasOptions=v.items.length>0||p,t.hasOptions?(v.items.length>0?(r=x&&t.getOption(x),r&&r.length?q=r:"single"===t.settings.mode&&t.items.length&&(q=t.getOption(t.items[0])),q&&q.length||(q=s&&!t.settings.addPrecedence?t.getAdjacentOption(s,1):w.find("[data-selectable]:first"))):q=s,t.setActiveOption(q),b&&!t.isOpen&&t.open()):(t.setActiveOption(null),b&&t.isOpen&&t.close())},addOption:function(b){var c,d,e,f=this;if(a.isArray(b))for(c=0,d=b.length;d>c;c++)f.addOption(b[c]);else e=y(b[f.settings.valueField]),e&&!f.options.hasOwnProperty(e)&&(f.userOptions[e]=!0,f.options[e]=b,f.lastQuery=null,f.trigger("option_add",e,b))},addOptionGroup:function(a,b){this.optgroups[a]=b,this.trigger("optgroup_add",a,b)},updateOption:function(b,c){var d,e,f,g,h,i,j=this;if(b=y(b),f=y(c[j.settings.valueField]),j.options.hasOwnProperty(b)){if(!f)throw new Error("Value must be set in option data");f!==b&&(delete j.options[b],g=j.items.indexOf(b),-1!==g&&j.items.splice(g,1,f)),j.options[f]=c,h=j.renderCache.item,i=j.renderCache.option,h&&(delete h[b],delete h[f]),i&&(delete i[b],delete i[f]),-1!==j.items.indexOf(f)&&(d=j.getItem(b),e=a(j.render("item",c)),d.hasClass("active")&&e.addClass("active"),d.replaceWith(e)),j.isOpen&&j.refreshOptions(!1)}},removeOption:function(a){var b=this;a=y(a);var c=b.renderCache.item,d=b.renderCache.option;c&&delete c[a],d&&delete d[a],delete b.userOptions[a],delete b.options[a],b.lastQuery=null,b.trigger("option_remove",a),b.removeItem(a)},clearOptions:function(){var a=this;a.loadedSearches={},a.userOptions={},a.renderCache={},a.options=a.sifter.items={},a.lastQuery=null,a.trigger("option_clear"),a.clear()},getOption:function(a){return this.getElementWithValue(a,this.$dropdown_content.find("[data-selectable]"))},getAdjacentOption:function(b,c){var d=this.$dropdown.find("[data-selectable]"),e=d.index(b)+c;return e>=0&&e<d.length?d.eq(e):a()},getElementWithValue:function(b,c){if(b=y(b))for(var d=0,e=c.length;e>d;d++)if(c[d].getAttribute("data-value")===b)return a(c[d]);return a()},getItem:function(a){return this.getElementWithValue(a,this.$control.children())},addItems:function(b){for(var c=a.isArray(b)?b:[b],d=0,e=c.length;e>d;d++)this.isPending=e-1>d,this.addItem(c[d])},addItem:function(b){F(this,["change"],function(){var c,d,e,f,g=this,h=g.settings.mode;return b=y(b),-1!==g.items.indexOf(b)?void("single"===h&&g.close()):void(g.options.hasOwnProperty(b)&&("single"===h&&g.clear(),"multi"===h&&g.isFull()||(c=a(g.render("item",g.options[b])),g.items.splice(g.caretPos,0,b),g.insertAtCaret(c),g.refreshState(),g.isSetup&&(e=g.$dropdown_content.find("[data-selectable]"),this.isPending||(d=g.getOption(b),f=g.getAdjacentOption(d,1).attr("data-value"),g.refreshOptions(g.isFocused&&"single"!==h),f&&g.setActiveOption(g.getOption(f))),!e.length||null!==g.settings.maxItems&&g.items.length>=g.settings.maxItems?g.close():g.positionDropdown(),g.updatePlaceholder(),g.trigger("item_add",b,c),g.updateOriginalInput()))))})},removeItem:function(a){var b,c,d,e=this;b="object"==typeof a?a:e.getItem(a),a=y(b.attr("data-value")),c=e.items.indexOf(a),-1!==c&&(b.remove(),b.hasClass("active")&&(d=e.$activeItems.indexOf(b[0]),e.$activeItems.splice(d,1)),e.items.splice(c,1),e.lastQuery=null,!e.settings.persist&&e.userOptions.hasOwnProperty(a)&&e.removeOption(a),c<e.caretPos&&e.setCaret(e.caretPos-1),e.refreshState(),e.updatePlaceholder(),e.updateOriginalInput(),e.positionDropdown(),e.trigger("item_remove",a))},createItem:function(b){var c=this,d=a.trim(c.$control_input.val()||""),e=c.caretPos;if(!d.length)return!1;c.lock(),"undefined"==typeof b&&(b=!0);var f="function"==typeof c.settings.create?this.settings.create:function(a){var b={};return b[c.settings.labelField]=a,b[c.settings.valueField]=a,b},g=D(function(a){if(c.unlock(),a&&"object"==typeof a){var d=y(a[c.settings.valueField]);d&&(c.setTextboxValue(""),c.addOption(a),c.setCaret(e),c.addItem(d),c.refreshOptions(b&&"single"!==c.settings.mode))}}),h=f.apply(this,[d,g]);return"undefined"!=typeof h&&g(h),!0},refreshItems:function(){if(this.lastQuery=null,this.isSetup)for(var a=0;a<this.items.length;a++)this.addItem(this.items);this.refreshState(),this.updateOriginalInput()},refreshState:function(){var a=this,b=a.isRequired&&!a.items.length;b||(a.isInvalid=!1),a.$control_input.prop("required",b),a.refreshClasses()},refreshClasses:function(){var b=this,c=b.isFull(),d=b.isLocked;b.$wrapper.toggleClass("rtl",b.rtl),b.$control.toggleClass("focus",b.isFocused).toggleClass("disabled",b.isDisabled).toggleClass("required",b.isRequired).toggleClass("invalid",b.isInvalid).toggleClass("locked",d).toggleClass("full",c).toggleClass("not-full",!c).toggleClass("input-active",b.isFocused&&!b.isInputHidden).toggleClass("dropdown-active",b.isOpen).toggleClass("has-options",!a.isEmptyObject(b.options)).toggleClass("has-items",b.items.length>0),b.$control_input.data("grow",!c&&!d)},isFull:function(){return null!==this.settings.maxItems&&this.items.length>=this.settings.maxItems},updateOriginalInput:function(){var a,b,c,d=this;if("select"===d.$input[0].tagName.toLowerCase()){for(c=[],a=0,b=d.items.length;b>a;a++)c.push('<option value="'+z(d.items[a])+'" selected="selected"></option>');c.length||this.$input.attr("multiple")||c.push('<option value="" selected="selected"></option>'),d.$input.html(c.join(""))}else d.$input.val(d.getValue());d.isSetup&&d.trigger("change",d.$input.val())},updatePlaceholder:function(){if(this.settings.placeholder){var a=this.$control_input;this.items.length?a.removeAttr("placeholder"):a.attr("placeholder",this.settings.placeholder),a.triggerHandler("update",{force:!0})}},open:function(){var a=this;a.isLocked||a.isOpen||"multi"===a.settings.mode&&a.isFull()||(a.focus(),a.isOpen=!0,a.refreshState(),a.$dropdown.css({visibility:"hidden",display:"block"}),a.positionDropdown(),a.$dropdown.css({visibility:"visible"}),a.trigger("dropdown_open",a.$dropdown))},close:function(){var a=this,b=a.isOpen;"single"===a.settings.mode&&a.items.length&&a.hideInput(),a.isOpen=!1,a.$dropdown.hide(),a.setActiveOption(null),a.refreshState(),b&&a.trigger("dropdown_close",a.$dropdown)},positionDropdown:function(){var a=this.$control,b="body"===this.settings.dropdownParent?a.offset():a.position();b.top+=a.outerHeight(!0),this.$dropdown.css({width:a.outerWidth(),top:b.top,left:b.left})},clear:function(){var a=this;a.items.length&&(a.$control.children(":not(input)").remove(),a.items=[],a.setCaret(0),a.updatePlaceholder(),a.updateOriginalInput(),a.refreshState(),a.showInput(),a.trigger("clear"))},insertAtCaret:function(b){var c=Math.min(this.caretPos,this.items.length);0===c?this.$control.prepend(b):a(this.$control[0].childNodes[c]).before(b),this.setCaret(c+1)},deleteSelection:function(b){var c,d,e,f,g,h,i,j,k,l=this;if(e=b&&b.keyCode===p?-1:1,f=H(l.$control_input[0]),l.$activeOption&&!l.settings.hideSelected&&(i=l.getAdjacentOption(l.$activeOption,-1).attr("data-value")),g=[],l.$activeItems.length){for(k=l.$control.children(".active:"+(e>0?"last":"first")),h=l.$control.children(":not(input)").index(k),e>0&&h++,c=0,d=l.$activeItems.length;d>c;c++)g.push(a(l.$activeItems[c]).attr("data-value"));b&&(b.preventDefault(),b.stopPropagation())}else(l.isFocused||"single"===l.settings.mode)&&l.items.length&&(0>e&&0===f.start&&0===f.length?g.push(l.items[l.caretPos-1]):e>0&&f.start===l.$control_input.val().length&&g.push(l.items[l.caretPos]));if(!g.length||"function"==typeof l.settings.onDelete&&l.settings.onDelete.apply(l,[g])===!1)return!1;for("undefined"!=typeof h&&l.setCaret(h);g.length;)l.removeItem(g.pop());return l.showInput(),l.positionDropdown(),l.refreshOptions(!0),i&&(j=l.getOption(i),j.length&&l.setActiveOption(j)),!0},advanceSelection:function(a,b){var c,d,e,f,g,h,i=this;0!==a&&(i.rtl&&(a*=-1),c=a>0?"last":"first",d=H(i.$control_input[0]),i.isFocused&&!i.isInputHidden?(f=i.$control_input.val().length,g=0>a?0===d.start&&0===d.length:d.start===f,g&&!f&&i.advanceCaret(a,b)):(h=i.$control.children(".active:"+c),h.length&&(e=i.$control.children(":not(input)").index(h),i.setActiveItem(null),i.setCaret(a>0?e+1:e))))},advanceCaret:function(a,b){var c,d,e=this;0!==a&&(c=a>0?"next":"prev",e.isShiftDown?(d=e.$control_input[c](),d.length&&(e.hideInput(),e.setActiveItem(d),b&&b.preventDefault())):e.setCaret(e.caretPos+a))},setCaret:function(b){var c=this;b="single"===c.settings.mode?c.items.length:Math.max(0,Math.min(c.items.length,b));var d,e,f,g;for(f=c.$control.children(":not(input)"),d=0,e=f.length;e>d;d++)g=a(f[d]).detach(),b>d?c.$control_input.before(g):c.$control.append(g);c.caretPos=b},lock:function(){this.close(),this.isLocked=!0,this.refreshState()},unlock:function(){this.isLocked=!1,this.refreshState()},disable:function(){var a=this;a.$input.prop("disabled",!0),a.isDisabled=!0,a.lock()},enable:function(){var a=this;a.$input.prop("disabled",!1),a.isDisabled=!1,a.unlock()},destroy:function(){var b=this,c=b.eventNS,d=b.revertSettings;b.trigger("destroy"),b.off(),b.$wrapper.remove(),b.$dropdown.remove(),b.$input.html("").append(d.$children).removeAttr("tabindex").attr({tabindex:d.tabindex}).show(),a(window).off(c),a(document).off(c),a(document.body).off(c),delete b.$input[0].selectize},render:function(a,b){var c,d,e="",f=!1,g=this,h=/^[\t ]*<([a-z][a-z0-9\-_]*(?:\:[a-z][a-z0-9\-_]*)?)/i;return("option"===a||"item"===a)&&(c=y(b[g.settings.valueField]),f=!!c),f&&(x(g.renderCache[a])||(g.renderCache[a]={}),g.renderCache[a].hasOwnProperty(c))?g.renderCache[a][c]:(e=g.settings.render[a].apply(this,[b,z]),("option"===a||"option_create"===a)&&(e=e.replace(h,"<$1 data-selectable")),"optgroup"===a&&(d=b[g.settings.optgroupValueField]||"",e=e.replace(h,'<$1 data-group="'+A(z(d))+'"')),("option"===a||"item"===a)&&(e=e.replace(h,'<$1 data-value="'+A(z(c||""))+'"')),f&&(g.renderCache[a][c]=e),e)
-}}),L.count=0,L.defaults={plugins:[],delimiter:",",persist:!0,diacritics:!0,create:!1,createOnBlur:!1,highlight:!0,openOnFocus:!0,maxOptions:1e3,maxItems:null,hideSelected:null,addPrecedence:!1,selectOnTab:!1,preload:!1,scrollDuration:60,loadThrottle:300,dataAttr:"data-data",optgroupField:"optgroup",valueField:"value",labelField:"text",optgroupLabelField:"label",optgroupValueField:"value",optgroupOrder:null,sortField:"$order",searchField:["text"],searchConjunction:"and",mode:null,wrapperClass:"selectize-control",inputClass:"selectize-input",dropdownClass:"selectize-dropdown",dropdownContentClass:"selectize-dropdown-content",dropdownParent:null,render:{}},a.fn.selectize=function(b){var c=a.fn.selectize.defaults,d=a.extend({},c,b),e=d.dataAttr,f=d.labelField,g=d.valueField,h=d.optgroupField,i=d.optgroupLabelField,j=d.optgroupValueField,k=function(b,c){var e,h,i,j,k=a.trim(b.val()||"");if(k.length){for(i=k.split(d.delimiter),e=0,h=i.length;h>e;e++)j={},j[f]=i[e],j[g]=i[e],c.options[i[e]]=j;c.items=i}},l=function(b,c){var d,k,l,m,n=0,o=c.options,p=function(a){var b=e&&a.attr(e);return"string"==typeof b&&b.length?JSON.parse(b):null},q=function(b,d){var e,i;if(b=a(b),e=b.attr("value")||"",e.length){if(o.hasOwnProperty(e))return void(d&&(o[e].optgroup?a.isArray(o[e].optgroup)?o[e].optgroup.push(d):o[e].optgroup=[o[e].optgroup,d]:o[e].optgroup=d));i=p(b)||{},i[f]=i[f]||b.text(),i[g]=i[g]||e,i[h]=i[h]||d,i.$order=++n,o[e]=i,b.is(":selected")&&c.items.push(e)}},r=function(b){var d,e,f,g,h;for(b=a(b),f=b.attr("label"),f&&(g=p(b)||{},g[i]=f,g[j]=f,c.optgroups[f]=g),h=a("option",b),d=0,e=h.length;e>d;d++)q(h[d],f)};for(c.maxItems=b.attr("multiple")?null:1,m=b.children(),d=0,k=m.length;k>d;d++)l=m[d].tagName.toLowerCase(),"optgroup"===l?r(m[d]):"option"===l&&q(m[d])};return this.each(function(){if(!this.selectize){var d,e=a(this),f=this.tagName.toLowerCase(),g={placeholder:e.children('option[value=""]').text()||e.attr("placeholder"),options:{},optgroups:{},items:[]};"select"===f?l(e,g):k(e,g),d=new L(e,a.extend(!0,{},c,g,b)),e.data("selectize",d),e.addClass("selectized")}})},a.fn.selectize.defaults=L.defaults,L.define("drag_drop",function(){if(!a.fn.sortable)throw new Error('The "drag_drop" plugin requires jQuery UI "sortable".');if("multi"===this.settings.mode){var b=this;b.lock=function(){var a=b.lock;return function(){var c=b.$control.data("sortable");return c&&c.disable(),a.apply(b,arguments)}}(),b.unlock=function(){var a=b.unlock;return function(){var c=b.$control.data("sortable");return c&&c.enable(),a.apply(b,arguments)}}(),b.setup=function(){var c=b.setup;return function(){c.apply(this,arguments);var d=b.$control.sortable({items:"[data-value]",forcePlaceholderSize:!0,disabled:b.isLocked,start:function(a,b){b.placeholder.css("width",b.helper.css("width")),d.css({overflow:"visible"})},stop:function(){d.css({overflow:"hidden"});var c=b.$activeItems?b.$activeItems.slice():null,e=[];d.children("[data-value]").each(function(){e.push(a(this).attr("data-value"))}),b.setValue(e),b.setActiveItem(c)}})}}()}}),L.define("dropdown_header",function(b){var c=this;b=a.extend({title:"Untitled",headerClass:"selectize-dropdown-header",titleRowClass:"selectize-dropdown-header-title",labelClass:"selectize-dropdown-header-label",closeClass:"selectize-dropdown-header-close",html:function(a){return'<div class="'+a.headerClass+'"><div class="'+a.titleRowClass+'"><span class="'+a.labelClass+'">'+a.title+'</span><a href="javascript:void(0)" class="'+a.closeClass+'">&times;</a></div></div>'}},b),c.setup=function(){var d=c.setup;return function(){d.apply(c,arguments),c.$dropdown_header=a(b.html(b)),c.$dropdown.prepend(c.$dropdown_header)}}()}),L.define("optgroup_columns",function(b){var c=this;b=a.extend({equalizeWidth:!0,equalizeHeight:!0},b),this.getAdjacentOption=function(b,c){var d=b.closest("[data-group]").find("[data-selectable]"),e=d.index(b)+c;return e>=0&&e<d.length?d.eq(e):a()},this.onKeyDown=function(){var a=c.onKeyDown;return function(b){var d,e,f,g;return!this.isOpen||b.keyCode!==j&&b.keyCode!==m?a.apply(this,arguments):(c.ignoreHover=!0,g=this.$activeOption.closest("[data-group]"),d=g.find("[data-selectable]").index(this.$activeOption),g=b.keyCode===j?g.prev("[data-group]"):g.next("[data-group]"),f=g.find("[data-selectable]"),e=f.eq(Math.min(f.length-1,d)),void(e.length&&this.setActiveOption(e)))}}();var d=function(){var d,e,f,g,h,i,j;if(j=a("[data-group]",c.$dropdown_content),e=j.length,e&&c.$dropdown_content.width()){if(b.equalizeHeight){for(f=0,d=0;e>d;d++)f=Math.max(f,j.eq(d).height());j.css({height:f})}b.equalizeWidth&&(i=c.$dropdown_content.innerWidth(),g=Math.round(i/e),j.css({width:g}),e>1&&(h=i-g*(e-1),j.eq(e-1).css({width:h})))}};(b.equalizeHeight||b.equalizeWidth)&&(B.after(this,"positionDropdown",d),B.after(this,"refreshOptions",d))}),L.define("remove_button",function(b){if("single"!==this.settings.mode){b=a.extend({label:"&times;",title:"Remove",className:"remove",append:!0},b);var c=this,d='<a href="javascript:void(0)" class="'+b.className+'" tabindex="-1" title="'+z(b.title)+'">'+b.label+"</a>",e=function(a,b){var c=a.search(/(<\/[^>]+>\s*)$/);return a.substring(0,c)+b+a.substring(c)};this.setup=function(){var f=c.setup;return function(){if(b.append){var g=c.settings.render.item;c.settings.render.item=function(){return e(g.apply(this,arguments),d)}}f.apply(this,arguments),this.$control.on("click","."+b.className,function(b){if(b.preventDefault(),!c.isLocked){var d=a(b.currentTarget).parent();c.setActiveItem(d),c.deleteSelection()&&c.setCaret(c.items.length)}})}}()}}),L.define("restore_on_backspace",function(a){var b=this;a.text=a.text||function(a){return a[this.settings.labelField]},this.onKeyDown=function(){var c=b.onKeyDown;return function(b){var d,e;return b.keyCode===p&&""===this.$control_input.val()&&!this.$activeItems.length&&(d=this.caretPos-1,d>=0&&d<this.items.length)?(e=this.options[this.items[d]],this.deleteSelection(b)&&(this.setTextboxValue(a.text.apply(this,[e])),this.refreshOptions(!0)),void b.preventDefault()):c.apply(this,arguments)}}()}),L});
\ No newline at end of file
+/*! selectize.js - v0.11.2 | https://github.com/brianreavis/selectize.js | Apache License (v2) */
+!function(a,b){"function"==typeof define&&define.amd?define("sifter",b):"object"==typeof exports?module.exports=b():a.Sifter=b()}(this,function(){var a=function(a,b){this.items=a,this.settings=b||{diacritics:!0}};a.prototype.tokenize=function(a){if(a=d(String(a||"").toLowerCase()),!a||!a.length)return[];var b,c,f,h,i=[],j=a.split(/ +/);for(b=0,c=j.length;c>b;b++){if(f=e(j[b]),this.settings.diacritics)for(h in g)g.hasOwnProperty(h)&&(f=f.replace(new RegExp(h,"g"),g[h]));i.push({string:j[b],regex:new RegExp(f,"i")})}return i},a.prototype.iterator=function(a,b){var c;c=f(a)?Array.prototype.forEach||function(a){for(var b=0,c=this.length;c>b;b++)a(this[b],b,this)}:function(a){for(var b in this)this.hasOwnProperty(b)&&a(this[b],b,this)},c.apply(a,[b])},a.prototype.getScoreFunction=function(a,b){var c,d,e,f;c=this,a=c.prepareSearch(a,b),e=a.tokens,d=a.options.fields,f=e.length;var g=function(a,b){var c,d;return a?(a=String(a||""),d=a.search(b.regex),-1===d?0:(c=b.string.length/a.length,0===d&&(c+=.5),c)):0},h=function(){var a=d.length;return a?1===a?function(a,b){return g(b[d[0]],a)}:function(b,c){for(var e=0,f=0;a>e;e++)f+=g(c[d[e]],b);return f/a}:function(){return 0}}();return f?1===f?function(a){return h(e[0],a)}:"and"===a.options.conjunction?function(a){for(var b,c=0,d=0;f>c;c++){if(b=h(e[c],a),0>=b)return 0;d+=b}return d/f}:function(a){for(var b=0,c=0;f>b;b++)c+=h(e[b],a);return c/f}:function(){return 0}},a.prototype.getSortFunction=function(a,c){var d,e,f,g,h,i,j,k,l,m,n;if(f=this,a=f.prepareSearch(a,c),n=!a.query&&c.sort_empty||c.sort,l=function(a,b){return"$score"===a?b.score:f.items[b.id][a]},h=[],n)for(d=0,e=n.length;e>d;d++)(a.query||"$score"!==n[d].field)&&h.push(n[d]);if(a.query){for(m=!0,d=0,e=h.length;e>d;d++)if("$score"===h[d].field){m=!1;break}m&&h.unshift({field:"$score",direction:"desc"})}else for(d=0,e=h.length;e>d;d++)if("$score"===h[d].field){h.splice(d,1);break}for(k=[],d=0,e=h.length;e>d;d++)k.push("desc"===h[d].direction?-1:1);return i=h.length,i?1===i?(g=h[0].field,j=k[0],function(a,c){return j*b(l(g,a),l(g,c))}):function(a,c){var d,e,f;for(d=0;i>d;d++)if(f=h[d].field,e=k[d]*b(l(f,a),l(f,c)))return e;return 0}:null},a.prototype.prepareSearch=function(a,b){if("object"==typeof a)return a;b=c({},b);var d=b.fields,e=b.sort,g=b.sort_empty;return d&&!f(d)&&(b.fields=[d]),e&&!f(e)&&(b.sort=[e]),g&&!f(g)&&(b.sort_empty=[g]),{options:b,query:String(a||"").toLowerCase(),tokens:this.tokenize(a),total:0,items:[]}},a.prototype.search=function(a,b){var c,d,e,f,g=this;return d=this.prepareSearch(a,b),b=d.options,a=d.query,f=b.score||g.getScoreFunction(d),a.length?g.iterator(g.items,function(a,e){c=f(a),(b.filter===!1||c>0)&&d.items.push({score:c,id:e})}):g.iterator(g.items,function(a,b){d.items.push({score:1,id:b})}),e=g.getSortFunction(d,b),e&&d.items.sort(e),d.total=d.items.length,"number"==typeof b.limit&&(d.items=d.items.slice(0,b.limit)),d};var b=function(a,b){return"number"==typeof a&&"number"==typeof b?a>b?1:b>a?-1:0:(a=String(a||"").toLowerCase(),b=String(b||"").toLowerCase(),a>b?1:b>a?-1:0)},c=function(a){var b,c,d,e;for(b=1,c=arguments.length;c>b;b++)if(e=arguments[b])for(d in e)e.hasOwnProperty(d)&&(a[d]=e[d]);return a},d=function(a){return(a+"").replace(/^\s+|\s+$|/g,"")},e=function(a){return(a+"").replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")},f=Array.isArray||$&&$.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)},g={a:"[aÀÁÂÃÄÅàáâãäåĀā]",c:"[cÇçćĆčČ]",d:"[dđĐďĎ]",e:"[eÈÉÊËèéêëěĚĒē]",i:"[iÌÍÎÏìíîïĪī]",n:"[nÑñňŇ]",o:"[oÒÓÔÕÕÖØòóôõöøŌō]",r:"[rřŘ]",s:"[sŠš]",t:"[tťŤ]",u:"[uÙÚÛÜùúûüůŮŪū]",y:"[yŸÿýÝ]",z:"[zŽž]"};return a}),function(a,b){"function"==typeof define&&define.amd?define("microplugin",b):"object"==typeof exports?module.exports=b():a.MicroPlugin=b()}(this,function(){var a={};a.mixin=function(a){a.plugins={},a.prototype.initializePlugins=function(a){var c,d,e,f=this,g=[];if(f.plugins={names:[],settings:{},requested:{},loaded:{}},b.isArray(a))for(c=0,d=a.length;d>c;c++)"string"==typeof a[c]?g.push(a[c]):(f.plugins.settings[a[c].name]=a[c].options,g.push(a[c].name));else if(a)for(e in a)a.hasOwnProperty(e)&&(f.plugins.settings[e]=a[e],g.push(e));for(;g.length;)f.require(g.shift())},a.prototype.loadPlugin=function(b){var c=this,d=c.plugins,e=a.plugins[b];if(!a.plugins.hasOwnProperty(b))throw new Error('Unable to find "'+b+'" plugin');d.requested[b]=!0,d.loaded[b]=e.fn.apply(c,[c.plugins.settings[b]||{}]),d.names.push(b)},a.prototype.require=function(a){var b=this,c=b.plugins;if(!b.plugins.loaded.hasOwnProperty(a)){if(c.requested[a])throw new Error('Plugin has circular dependency ("'+a+'")');b.loadPlugin(a)}return c.loaded[a]},a.define=function(b,c){a.plugins[b]={name:b,fn:c}}};var b={isArray:Array.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)}};return a}),function(a,b){"function"==typeof define&&define.amd?define("selectize",["jquery","sifter","microplugin"],b):"object"==typeof exports?module.exports=b(require("jquery"),require("sifter"),require("microplugin")):a.Selectize=b(a.jQuery,a.Sifter,a.MicroPlugin)}(this,function(a,b,c){"use strict";var d=function(a,b){if("string"!=typeof b||b.length){var c="string"==typeof b?new RegExp(b,"i"):b,d=function(a){var b=0;if(3===a.nodeType){var e=a.data.search(c);if(e>=0&&a.data.length>0){var f=a.data.match(c),g=document.createElement("span");g.className="highlight";var h=a.splitText(e),i=(h.splitText(f[0].length),h.cloneNode(!0));g.appendChild(i),h.parentNode.replaceChild(g,h),b=1}}else if(1===a.nodeType&&a.childNodes&&!/(script|style)/i.test(a.tagName))for(var j=0;j<a.childNodes.length;++j)j+=d(a.childNodes[j]);return b};return a.each(function(){d(this)})}},e=function(){};e.prototype={on:function(a,b){this._events=this._events||{},this._events[a]=this._events[a]||[],this._events[a].push(b)},off:function(a,b){var c=arguments.length;return 0===c?delete this._events:1===c?delete this._events[a]:(this._events=this._events||{},void(a in this._events!=!1&&this._events[a].splice(this._events[a].indexOf(b),1)))},trigger:function(a){if(this._events=this._events||{},a in this._events!=!1)for(var b=0;b<this._events[a].length;b++)this._events[a][b].apply(this,Array.prototype.slice.call(arguments,1))}},e.mixin=function(a){for(var b=["on","off","trigger"],c=0;c<b.length;c++)a.prototype[b[c]]=e.prototype[b[c]]};var f=/Mac/.test(navigator.userAgent),g=65,h=13,i=27,j=37,k=38,l=80,m=39,n=40,o=78,p=8,q=46,r=16,s=f?91:17,t=f?18:17,u=9,v=1,w=2,x=function(a){return"undefined"!=typeof a},y=function(a){return"undefined"==typeof a||null===a?null:"boolean"==typeof a?a?"1":"0":a+""},z=function(a){return(a+"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")},A=function(a){return(a+"").replace(/\$/g,"$$$$")},B={};B.before=function(a,b,c){var d=a[b];a[b]=function(){return c.apply(a,arguments),d.apply(a,arguments)}},B.after=function(a,b,c){var d=a[b];a[b]=function(){var b=d.apply(a,arguments);return c.apply(a,arguments),b}};var C=function(b,c){if(!a.isArray(c))return c;var d,e,f={};for(d=0,e=c.length;e>d;d++)c[d].hasOwnProperty(b)&&(f[c[d][b]]=c[d]);return f},D=function(a){var b=!1;return function(){b||(b=!0,a.apply(this,arguments))}},E=function(a,b){var c;return function(){var d=this,e=arguments;window.clearTimeout(c),c=window.setTimeout(function(){a.apply(d,e)},b)}},F=function(a,b,c){var d,e=a.trigger,f={};a.trigger=function(){var c=arguments[0];return-1===b.indexOf(c)?e.apply(a,arguments):void(f[c]=arguments)},c.apply(a,[]),a.trigger=e;for(d in f)f.hasOwnProperty(d)&&e.apply(a,f[d])},G=function(a,b,c,d){a.on(b,c,function(b){for(var c=b.target;c&&c.parentNode!==a[0];)c=c.parentNode;return b.currentTarget=c,d.apply(this,[b])})},H=function(a){var b={};if("selectionStart"in a)b.start=a.selectionStart,b.length=a.selectionEnd-b.start;else if(document.selection){a.focus();var c=document.selection.createRange(),d=document.selection.createRange().text.length;c.moveStart("character",-a.value.length),b.start=c.text.length-d,b.length=d}return b},I=function(a,b,c){var d,e,f={};if(c)for(d=0,e=c.length;e>d;d++)f[c[d]]=a.css(c[d]);else f=a.css();b.css(f)},J=function(b,c){if(!b)return 0;var d=a("<test>").css({position:"absolute",top:-99999,left:-99999,width:"auto",padding:0,whiteSpace:"pre"}).text(b).appendTo("body");I(c,d,["letterSpacing","fontSize","fontFamily","fontWeight","textTransform"]);var e=d.width();return d.remove(),e},K=function(a){var b=null,c=function(c,d){var e,f,g,h,i,j,k,l;c=c||window.event||{},d=d||{},c.metaKey||c.altKey||(d.force||a.data("grow")!==!1)&&(e=a.val(),c.type&&"keydown"===c.type.toLowerCase()&&(f=c.keyCode,g=f>=97&&122>=f||f>=65&&90>=f||f>=48&&57>=f||32===f,f===q||f===p?(l=H(a[0]),l.length?e=e.substring(0,l.start)+e.substring(l.start+l.length):f===p&&l.start?e=e.substring(0,l.start-1)+e.substring(l.start+1):f===q&&"undefined"!=typeof l.start&&(e=e.substring(0,l.start)+e.substring(l.start+1))):g&&(j=c.shiftKey,k=String.fromCharCode(c.keyCode),k=j?k.toUpperCase():k.toLowerCase(),e+=k)),h=a.attr("placeholder"),!e&&h&&(e=h),i=J(e,a)+4,i!==b&&(b=i,a.width(i),a.triggerHandler("resize")))};a.on("keydown keyup update blur",c),c()},L=function(c,d){var e,f,g=this;f=c[0],f.selectize=g;var h=window.getComputedStyle&&window.getComputedStyle(f,null);e=h?h.getPropertyValue("direction"):f.currentStyle&&f.currentStyle.direction,e=e||c.parents("[dir]:first").attr("dir")||"",a.extend(g,{settings:d,$input:c,tagType:"select"===f.tagName.toLowerCase()?v:w,rtl:/rtl/i.test(e),eventNS:".selectize"+ ++L.count,highlightedValue:null,isOpen:!1,isDisabled:!1,isRequired:c.is("[required]"),isInvalid:!1,isLocked:!1,isFocused:!1,isInputHidden:!1,isSetup:!1,isShiftDown:!1,isCmdDown:!1,isCtrlDown:!1,ignoreFocus:!1,ignoreBlur:!1,ignoreHover:!1,hasOptions:!1,currentResults:null,lastValue:"",caretPos:0,loading:0,loadedSearches:{},$activeOption:null,$activeItems:[],optgroups:{},options:{},userOptions:{},items:[],renderCache:{},onSearchChange:null===d.loadThrottle?g.onSearchChange:E(g.onSearchChange,d.loadThrottle)}),g.sifter=new b(this.options,{diacritics:d.diacritics}),a.extend(g.options,C(d.valueField,d.options)),delete g.settings.options,a.extend(g.optgroups,C(d.optgroupValueField,d.optgroups)),delete g.settings.optgroups,g.settings.mode=g.settings.mode||(1===g.settings.maxItems?"single":"multi"),"boolean"!=typeof g.settings.hideSelected&&(g.settings.hideSelected="multi"===g.settings.mode),g.initializePlugins(g.settings.plugins),g.setupCallbacks(),g.setupTemplates(),g.setup()};return e.mixin(L),c.mixin(L),a.extend(L.prototype,{setup:function(){var b,c,d,e,g,h,i,j,k,l,m=this,n=m.settings,o=m.eventNS,p=a(window),q=a(document),u=m.$input;i=m.settings.mode,j=u.attr("tabindex")||"",k=u.attr("class")||"",b=a("<div>").addClass(n.wrapperClass).addClass(k).addClass(i),c=a("<div>").addClass(n.inputClass).addClass("items").appendTo(b),d=a('<input type="text" autocomplete="off" />').appendTo(c).attr("tabindex",j),h=a(n.dropdownParent||b),e=a("<div>").addClass(n.dropdownClass).addClass(i).hide().appendTo(h),g=a("<div>").addClass(n.dropdownContentClass).appendTo(e),m.settings.copyClassesToDropdown&&e.addClass(k),b.css({width:u[0].style.width}),m.plugins.names.length&&(l="plugin-"+m.plugins.names.join(" plugin-"),b.addClass(l),e.addClass(l)),(null===n.maxItems||n.maxItems>1)&&m.tagType===v&&u.attr("multiple","multiple"),m.settings.placeholder&&d.attr("placeholder",n.placeholder),u.attr("autocorrect")&&d.attr("autocorrect",u.attr("autocorrect")),u.attr("autocapitalize")&&d.attr("autocapitalize",u.attr("autocapitalize")),m.$wrapper=b,m.$control=c,m.$control_input=d,m.$dropdown=e,m.$dropdown_content=g,e.on("mouseenter","[data-selectable]",function(){return m.onOptionHover.apply(m,arguments)}),e.on("mousedown","[data-selectable]",function(){return m.onOptionSelect.apply(m,arguments)}),G(c,"mousedown","*:not(input)",function(){return m.onItemSelect.apply(m,arguments)}),K(d),c.on({mousedown:function(){return m.onMouseDown.apply(m,arguments)},click:function(){return m.onClick.apply(m,arguments)}}),d.on({mousedown:function(a){a.stopPropagation()},keydown:function(){return m.onKeyDown.apply(m,arguments)},keyup:function(){return m.onKeyUp.apply(m,arguments)},keypress:function(){return m.onKeyPress.apply(m,arguments)},resize:function(){m.positionDropdown.apply(m,[])},blur:function(){return m.onBlur.apply(m,arguments)},focus:function(){return m.ignoreBlur=!1,m.onFocus.apply(m,arguments)},paste:function(){return m.onPaste.apply(m,arguments)}}),q.on("keydown"+o,function(a){m.isCmdDown=a[f?"metaKey":"ctrlKey"],m.isCtrlDown=a[f?"altKey":"ctrlKey"],m.isShiftDown=a.shiftKey}),q.on("keyup"+o,function(a){a.keyCode===t&&(m.isCtrlDown=!1),a.keyCode===r&&(m.isShiftDown=!1),a.keyCode===s&&(m.isCmdDown=!1)}),q.on("mousedown"+o,function(a){if(m.isFocused){if(a.target===m.$dropdown[0]||a.target.parentNode===m.$dropdown[0])return!1;m.$control.has(a.target).length||a.target===m.$control[0]||m.blur()}}),p.on(["scroll"+o,"resize"+o].join(" "),function(){m.isOpen&&m.positionDropdown.apply(m,arguments)}),p.on("mousemove"+o,function(){m.ignoreHover=!1}),this.revertSettings={$children:u.children().detach(),tabindex:u.attr("tabindex")},u.attr("tabindex",-1).hide().after(m.$wrapper),a.isArray(n.items)&&(m.setValue(n.items),delete n.items),u[0].validity&&u.on("invalid"+o,function(a){a.preventDefault(),m.isInvalid=!0,m.refreshState()}),m.updateOriginalInput(),m.refreshItems(),m.refreshState(),m.updatePlaceholder(),m.isSetup=!0,u.is(":disabled")&&m.disable(),m.on("change",this.onChange),u.data("selectize",m),u.addClass("selectized"),m.trigger("initialize"),n.preload===!0&&m.onSearchChange("")},setupTemplates:function(){var b=this,c=b.settings.labelField,d=b.settings.optgroupLabelField,e={optgroup:function(a){return'<div class="optgroup">'+a.html+"</div>"},optgroup_header:function(a,b){return'<div class="optgroup-header">'+b(a[d])+"</div>"},option:function(a,b){return'<div class="option">'+b(a[c])+"</div>"},item:function(a,b){return'<div class="item">'+b(a[c])+"</div>"},option_create:function(a,b){return'<div class="create">Add <strong>'+b(a.input)+"</strong>&hellip;</div>"}};b.settings.render=a.extend({},e,b.settings.render)},setupCallbacks:function(){var a,b,c={initialize:"onInitialize",change:"onChange",item_add:"onItemAdd",item_remove:"onItemRemove",clear:"onClear",option_add:"onOptionAdd",option_remove:"onOptionRemove",option_clear:"onOptionClear",dropdown_open:"onDropdownOpen",dropdown_close:"onDropdownClose",type:"onType",load:"onLoad"};for(a in c)c.hasOwnProperty(a)&&(b=this.settings[c[a]],b&&this.on(a,b))},onClick:function(a){var b=this;b.isFocused||(b.focus(),a.preventDefault())},onMouseDown:function(b){{var c=this,d=b.isDefaultPrevented();a(b.target)}if(c.isFocused){if(b.target!==c.$control_input[0])return"single"===c.settings.mode?c.isOpen?c.close():c.open():d||c.setActiveItem(null),!1}else d||window.setTimeout(function(){c.focus()},0)},onChange:function(){this.$input.trigger("change")},onPaste:function(a){var b=this;(b.isFull()||b.isInputHidden||b.isLocked)&&a.preventDefault()},onKeyPress:function(a){if(this.isLocked)return a&&a.preventDefault();var b=String.fromCharCode(a.keyCode||a.which);return this.settings.create&&b===this.settings.delimiter?(this.createItem(),a.preventDefault(),!1):void 0},onKeyDown:function(a){var b=(a.target===this.$control_input[0],this);if(b.isLocked)return void(a.keyCode!==u&&a.preventDefault());switch(a.keyCode){case g:if(b.isCmdDown)return void b.selectAll();break;case i:return void b.close();case o:if(!a.ctrlKey||a.altKey)break;case n:if(!b.isOpen&&b.hasOptions)b.open();else if(b.$activeOption){b.ignoreHover=!0;var c=b.getAdjacentOption(b.$activeOption,1);c.length&&b.setActiveOption(c,!0,!0)}return void a.preventDefault();case l:if(!a.ctrlKey||a.altKey)break;case k:if(b.$activeOption){b.ignoreHover=!0;var d=b.getAdjacentOption(b.$activeOption,-1);d.length&&b.setActiveOption(d,!0,!0)}return void a.preventDefault();case h:return b.isOpen&&b.$activeOption&&b.onOptionSelect({currentTarget:b.$activeOption}),void a.preventDefault();case j:return void b.advanceSelection(-1,a);case m:return void b.advanceSelection(1,a);case u:return b.settings.selectOnTab&&b.isOpen&&b.$activeOption&&(b.onOptionSelect({currentTarget:b.$activeOption}),a.preventDefault()),void(b.settings.create&&b.createItem()&&a.preventDefault());case p:case q:return void b.deleteSelection(a)}return!b.isFull()&&!b.isInputHidden||(f?a.metaKey:a.ctrlKey)?void 0:void a.preventDefault()},onKeyUp:function(a){var b=this;if(b.isLocked)return a&&a.preventDefault();var c=b.$control_input.val()||"";b.lastValue!==c&&(b.lastValue=c,b.onSearchChange(c),b.refreshOptions(),b.trigger("type",c))},onSearchChange:function(a){var b=this,c=b.settings.load;c&&(b.loadedSearches.hasOwnProperty(a)||(b.loadedSearches[a]=!0,b.load(function(d){c.apply(b,[a,d])})))},onFocus:function(a){var b=this;return b.isFocused=!0,b.isDisabled?(b.blur(),a&&a.preventDefault(),!1):void(b.ignoreFocus||("focus"===b.settings.preload&&b.onSearchChange(""),b.$activeItems.length||(b.showInput(),b.setActiveItem(null),b.refreshOptions(!!b.settings.openOnFocus)),b.refreshState()))},onBlur:function(a){var b=this;if(b.isFocused=!1,!b.ignoreFocus){if(!b.ignoreBlur&&document.activeElement===b.$dropdown_content[0])return b.ignoreBlur=!0,void b.onFocus(a);b.settings.create&&b.settings.createOnBlur&&b.createItem(!1),b.close(),b.setTextboxValue(""),b.setActiveItem(null),b.setActiveOption(null),b.setCaret(b.items.length),b.refreshState()}},onOptionHover:function(a){this.ignoreHover||this.setActiveOption(a.currentTarget,!1)},onOptionSelect:function(b){var c,d,e=this;b.preventDefault&&(b.preventDefault(),b.stopPropagation()),d=a(b.currentTarget),d.hasClass("create")?e.createItem():(c=d.attr("data-value"),"undefined"!=typeof c&&(e.lastQuery=null,e.setTextboxValue(""),e.addItem(c),!e.settings.hideSelected&&b.type&&/mouse/.test(b.type)&&e.setActiveOption(e.getOption(c))))},onItemSelect:function(a){var b=this;b.isLocked||"multi"===b.settings.mode&&(a.preventDefault(),b.setActiveItem(a.currentTarget,a))},load:function(a){var b=this,c=b.$wrapper.addClass("loading");b.loading++,a.apply(b,[function(a){b.loading=Math.max(b.loading-1,0),a&&a.length&&(b.addOption(a),b.refreshOptions(b.isFocused&&!b.isInputHidden)),b.loading||c.removeClass("loading"),b.trigger("load",a)}])},setTextboxValue:function(a){var b=this.$control_input,c=b.val()!==a;c&&(b.val(a).triggerHandler("update"),this.lastValue=a)},getValue:function(){return this.tagType===v&&this.$input.attr("multiple")?this.items:this.items.join(this.settings.delimiter)},setValue:function(a){F(this,["change"],function(){this.clear(),this.addItems(a)})},setActiveItem:function(b,c){var d,e,f,g,h,i,j,k,l=this;if("single"!==l.settings.mode){if(b=a(b),!b.length)return a(l.$activeItems).removeClass("active"),l.$activeItems=[],void(l.isFocused&&l.showInput());if(d=c&&c.type.toLowerCase(),"mousedown"===d&&l.isShiftDown&&l.$activeItems.length){for(k=l.$control.children(".active:last"),g=Array.prototype.indexOf.apply(l.$control[0].childNodes,[k[0]]),h=Array.prototype.indexOf.apply(l.$control[0].childNodes,[b[0]]),g>h&&(j=g,g=h,h=j),e=g;h>=e;e++)i=l.$control[0].childNodes[e],-1===l.$activeItems.indexOf(i)&&(a(i).addClass("active"),l.$activeItems.push(i));c.preventDefault()}else"mousedown"===d&&l.isCtrlDown||"keydown"===d&&this.isShiftDown?b.hasClass("active")?(f=l.$activeItems.indexOf(b[0]),l.$activeItems.splice(f,1),b.removeClass("active")):l.$activeItems.push(b.addClass("active")[0]):(a(l.$activeItems).removeClass("active"),l.$activeItems=[b.addClass("active")[0]]);l.hideInput(),this.isFocused||l.focus()}},setActiveOption:function(b,c,d){var e,f,g,h,i,j=this;j.$activeOption&&j.$activeOption.removeClass("active"),j.$activeOption=null,b=a(b),b.length&&(j.$activeOption=b.addClass("active"),(c||!x(c))&&(e=j.$dropdown_content.height(),f=j.$activeOption.outerHeight(!0),c=j.$dropdown_content.scrollTop()||0,g=j.$activeOption.offset().top-j.$dropdown_content.offset().top+c,h=g,i=g-e+f,g+f>e+c?j.$dropdown_content.stop().animate({scrollTop:i},d?j.settings.scrollDuration:0):c>g&&j.$dropdown_content.stop().animate({scrollTop:h},d?j.settings.scrollDuration:0)))},selectAll:function(){var a=this;"single"!==a.settings.mode&&(a.$activeItems=Array.prototype.slice.apply(a.$control.children(":not(input)").addClass("active")),a.$activeItems.length&&(a.hideInput(),a.close()),a.focus())},hideInput:function(){var a=this;a.setTextboxValue(""),a.$control_input.css({opacity:0,position:"absolute",left:a.rtl?1e4:-1e4}),a.isInputHidden=!0},showInput:function(){this.$control_input.css({opacity:1,position:"relative",left:0}),this.isInputHidden=!1},focus:function(){var a=this;a.isDisabled||(a.ignoreFocus=!0,a.$control_input[0].focus(),window.setTimeout(function(){a.ignoreFocus=!1,a.onFocus()},0))},blur:function(){this.$control_input.trigger("blur")},getScoreFunction:function(a){return this.sifter.getScoreFunction(a,this.getSearchOptions())},getSearchOptions:function(){var a=this.settings,b=a.sortField;return"string"==typeof b&&(b={field:b}),{fields:a.searchField,conjunction:a.searchConjunction,sort:b}},search:function(b){var c,d,e,f=this,g=f.settings,h=this.getSearchOptions();if(g.score&&(e=f.settings.score.apply(this,[b]),"function"!=typeof e))throw new Error('Selectize "score" setting must be a function that returns a function');if(b!==f.lastQuery?(f.lastQuery=b,d=f.sifter.search(b,a.extend(h,{score:e})),f.currentResults=d):d=a.extend(!0,{},f.currentResults),g.hideSelected)for(c=d.items.length-1;c>=0;c--)-1!==f.items.indexOf(y(d.items[c].id))&&d.items.splice(c,1);return d},refreshOptions:function(b){var c,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s;"undefined"==typeof b&&(b=!0);var t=this,u=a.trim(t.$control_input.val()),v=t.search(u),w=t.$dropdown_content,x=t.$activeOption&&y(t.$activeOption.attr("data-value"));if(g=v.items.length,"number"==typeof t.settings.maxOptions&&(g=Math.min(g,t.settings.maxOptions)),h={},t.settings.optgroupOrder)for(i=t.settings.optgroupOrder,c=0;c<i.length;c++)h[i[c]]=[];else i=[];for(c=0;g>c;c++)for(j=t.options[v.items[c].id],k=t.render("option",j),l=j[t.settings.optgroupField]||"",m=a.isArray(l)?l:[l],e=0,f=m&&m.length;f>e;e++)l=m[e],t.optgroups.hasOwnProperty(l)||(l=""),h.hasOwnProperty(l)||(h[l]=[],i.push(l)),h[l].push(k);for(n=[],c=0,g=i.length;g>c;c++)l=i[c],t.optgroups.hasOwnProperty(l)&&h[l].length?(o=t.render("optgroup_header",t.optgroups[l])||"",o+=h[l].join(""),n.push(t.render("optgroup",a.extend({},t.optgroups[l],{html:o})))):n.push(h[l].join(""));if(w.html(n.join("")),t.settings.highlight&&v.query.length&&v.tokens.length)for(c=0,g=v.tokens.length;g>c;c++)d(w,v.tokens[c].regex);if(!t.settings.hideSelected)for(c=0,g=t.items.length;g>c;c++)t.getOption(t.items[c]).addClass("selected");p=t.canCreate(u),p&&(w.prepend(t.render("option_create",{input:u})),s=a(w[0].childNodes[0])),t.hasOptions=v.items.length>0||p,t.hasOptions?(v.items.length>0?(r=x&&t.getOption(x),r&&r.length?q=r:"single"===t.settings.mode&&t.items.length&&(q=t.getOption(t.items[0])),q&&q.length||(q=s&&!t.settings.addPrecedence?t.getAdjacentOption(s,1):w.find("[data-selectable]:first"))):q=s,t.setActiveOption(q),b&&!t.isOpen&&t.open()):(t.setActiveOption(null),b&&t.isOpen&&t.close())},addOption:function(b){var c,d,e,f=this;if(a.isArray(b))for(c=0,d=b.length;d>c;c++)f.addOption(b[c]);else e=y(b[f.settings.valueField]),"string"!=typeof e||f.options.hasOwnProperty(e)||(f.userOptions[e]=!0,f.options[e]=b,f.lastQuery=null,f.trigger("option_add",e,b))},addOptionGroup:function(a,b){this.optgroups[a]=b,this.trigger("optgroup_add",a,b)},updateOption:function(b,c){var d,e,f,g,h,i,j=this;if(b=y(b),f=y(c[j.settings.valueField]),null!==b&&j.options.hasOwnProperty(b)){if("string"!=typeof f)throw new Error("Value must be set in option data");f!==b&&(delete j.options[b],g=j.items.indexOf(b),-1!==g&&j.items.splice(g,1,f)),j.options[f]=c,h=j.renderCache.item,i=j.renderCache.option,h&&(delete h[b],delete h[f]),i&&(delete i[b],delete i[f]),-1!==j.items.indexOf(f)&&(d=j.getItem(b),e=a(j.render("item",c)),d.hasClass("active")&&e.addClass("active"),d.replaceWith(e)),j.lastQuery=null,j.isOpen&&j.refreshOptions(!1)}},removeOption:function(a){var b=this;a=y(a);var c=b.renderCache.item,d=b.renderCache.option;c&&delete c[a],d&&delete d[a],delete b.userOptions[a],delete b.options[a],b.lastQuery=null,b.trigger("option_remove",a),b.removeItem(a)},clearOptions:function(){var a=this;a.loadedSearches={},a.userOptions={},a.renderCache={},a.options=a.sifter.items={},a.lastQuery=null,a.trigger("option_clear"),a.clear()},getOption:function(a){return this.getElementWithValue(a,this.$dropdown_content.find("[data-selectable]"))},getAdjacentOption:function(b,c){var d=this.$dropdown.find("[data-selectable]"),e=d.index(b)+c;return e>=0&&e<d.length?d.eq(e):a()},getElementWithValue:function(b,c){if(b=y(b),"undefined"!=typeof b&&null!==b)for(var d=0,e=c.length;e>d;d++)if(c[d].getAttribute("data-value")===b)return a(c[d]);return a()},getItem:function(a){return this.getElementWithValue(a,this.$control.children())},addItems:function(b){for(var c=a.isArray(b)?b:[b],d=0,e=c.length;e>d;d++)this.isPending=e-1>d,this.addItem(c[d])},addItem:function(b){F(this,["change"],function(){var c,d,e,f,g,h=this,i=h.settings.mode;return b=y(b),-1!==h.items.indexOf(b)?void("single"===i&&h.close()):void(h.options.hasOwnProperty(b)&&("single"===i&&h.clear(),"multi"===i&&h.isFull()||(c=a(h.render("item",h.options[b])),g=h.isFull(),h.items.splice(h.caretPos,0,b),h.insertAtCaret(c),(!h.isPending||!g&&h.isFull())&&h.refreshState(),h.isSetup&&(e=h.$dropdown_content.find("[data-selectable]"),h.isPending||(d=h.getOption(b),f=h.getAdjacentOption(d,1).attr("data-value"),h.refreshOptions(h.isFocused&&"single"!==i),f&&h.setActiveOption(h.getOption(f))),!e.length||h.isFull()?h.close():h.positionDropdown(),h.updatePlaceholder(),h.trigger("item_add",b,c),h.updateOriginalInput()))))})},removeItem:function(a){var b,c,d,e=this;b="object"==typeof a?a:e.getItem(a),a=y(b.attr("data-value")),c=e.items.indexOf(a),-1!==c&&(b.remove(),b.hasClass("active")&&(d=e.$activeItems.indexOf(b[0]),e.$activeItems.splice(d,1)),e.items.splice(c,1),e.lastQuery=null,!e.settings.persist&&e.userOptions.hasOwnProperty(a)&&e.removeOption(a),c<e.caretPos&&e.setCaret(e.caretPos-1),e.refreshState(),e.updatePlaceholder(),e.updateOriginalInput(),e.positionDropdown(),e.trigger("item_remove",a))},createItem:function(b){var c=this,d=a.trim(c.$control_input.val()||""),e=c.caretPos;if(!c.canCreate(d))return!1;c.lock(),"undefined"==typeof b&&(b=!0);var f="function"==typeof c.settings.create?this.settings.create:function(a){var b={};return b[c.settings.labelField]=a,b[c.settings.valueField]=a,b},g=D(function(a){if(c.unlock(),a&&"object"==typeof a){var d=y(a[c.settings.valueField]);"string"==typeof d&&(c.setTextboxValue(""),c.addOption(a),c.setCaret(e),c.addItem(d),c.refreshOptions(b&&"single"!==c.settings.mode))}}),h=f.apply(this,[d,g]);return"undefined"!=typeof h&&g(h),!0},refreshItems:function(){if(this.lastQuery=null,this.isSetup)for(var a=0;a<this.items.length;a++)this.addItem(this.items);this.refreshState(),this.updateOriginalInput()},refreshState:function(){var a,b=this;b.isRequired&&(b.items.length&&(b.isInvalid=!1),b.$control_input.prop("required",a)),b.refreshClasses()},refreshClasses:function(){var b=this,c=b.isFull(),d=b.isLocked;b.$wrapper.toggleClass("rtl",b.rtl),b.$control.toggleClass("focus",b.isFocused).toggleClass("disabled",b.isDisabled).toggleClass("required",b.isRequired).toggleClass("invalid",b.isInvalid).toggleClass("locked",d).toggleClass("full",c).toggleClass("not-full",!c).toggleClass("input-active",b.isFocused&&!b.isInputHidden).toggleClass("dropdown-active",b.isOpen).toggleClass("has-options",!a.isEmptyObject(b.options)).toggleClass("has-items",b.items.length>0),b.$control_input.data("grow",!c&&!d)},isFull:function(){return null!==this.settings.maxItems&&this.items.length>=this.settings.maxItems},updateOriginalInput:function(){var a,b,c,d=this;if(d.tagType===v){for(c=[],a=0,b=d.items.length;b>a;a++)c.push('<option value="'+z(d.items[a])+'" selected="selected"></option>');c.length||this.$input.attr("multiple")||c.push('<option value="" selected="selected"></option>'),d.$input.html(c.join(""))}else d.$input.val(d.getValue()),d.$input.attr("value",d.$input.val());d.isSetup&&d.trigger("change",d.$input.val())},updatePlaceholder:function(){if(this.settings.placeholder){var a=this.$control_input;this.items.length?a.removeAttr("placeholder"):a.attr("placeholder",this.settings.placeholder),a.triggerHandler("update",{force:!0})}},open:function(){var a=this;a.isLocked||a.isOpen||"multi"===a.settings.mode&&a.isFull()||(a.focus(),a.isOpen=!0,a.refreshState(),a.$dropdown.css({visibility:"hidden",display:"block"}),a.positionDropdown(),a.$dropdown.css({visibility:"visible"}),a.trigger("dropdown_open",a.$dropdown))},close:function(){var a=this,b=a.isOpen;"single"===a.settings.mode&&a.items.length&&a.hideInput(),a.isOpen=!1,a.$dropdown.hide(),a.setActiveOption(null),a.refreshState(),b&&a.trigger("dropdown_close",a.$dropdown)},positionDropdown:function(){var a=this.$control,b="body"===this.settings.dropdownParent?a.offset():a.position();b.top+=a.outerHeight(!0),this.$dropdown.css({width:a.outerWidth(),top:b.top,left:b.left})},clear:function(){var a=this;a.items.length&&(a.$control.children(":not(input)").remove(),a.items=[],a.lastQuery=null,a.setCaret(0),a.setActiveItem(null),a.updatePlaceholder(),a.updateOriginalInput(),a.refreshState(),a.showInput(),a.trigger("clear"))},insertAtCaret:function(b){var c=Math.min(this.caretPos,this.items.length);0===c?this.$control.prepend(b):a(this.$control[0].childNodes[c]).before(b),this.setCaret(c+1)},deleteSelection:function(b){var c,d,e,f,g,h,i,j,k,l=this;if(e=b&&b.keyCode===p?-1:1,f=H(l.$control_input[0]),l.$activeOption&&!l.settings.hideSelected&&(i=l.getAdjacentOption(l.$activeOption,-1).attr("data-value")),g=[],l.$activeItems.length){for(k=l.$control.children(".active:"+(e>0?"last":"first")),h=l.$control.children(":not(input)").index(k),e>0&&h++,c=0,d=l.$activeItems.length;d>c;c++)g.push(a(l.$activeItems[c]).attr("data-value"));b&&(b.preventDefault(),b.stopPropagation())}else(l.isFocused||"single"===l.settings.mode)&&l.items.length&&(0>e&&0===f.start&&0===f.length?g.push(l.items[l.caretPos-1]):e>0&&f.start===l.$control_input.val().length&&g.push(l.items[l.caretPos]));if(!g.length||"function"==typeof l.settings.onDelete&&l.settings.onDelete.apply(l,[g])===!1)return!1;for("undefined"!=typeof h&&l.setCaret(h);g.length;)l.removeItem(g.pop());return l.showInput(),l.positionDropdown(),l.refreshOptions(!0),i&&(j=l.getOption(i),j.length&&l.setActiveOption(j)),!0},advanceSelection:function(a,b){var c,d,e,f,g,h,i=this;0!==a&&(i.rtl&&(a*=-1),c=a>0?"last":"first",d=H(i.$control_input[0]),i.isFocused&&!i.isInputHidden?(f=i.$control_input.val().length,g=0>a?0===d.start&&0===d.length:d.start===f,g&&!f&&i.advanceCaret(a,b)):(h=i.$control.children(".active:"+c),h.length&&(e=i.$control.children(":not(input)").index(h),i.setActiveItem(null),i.setCaret(a>0?e+1:e))))},advanceCaret:function(a,b){var c,d,e=this;0!==a&&(c=a>0?"next":"prev",e.isShiftDown?(d=e.$control_input[c](),d.length&&(e.hideInput(),e.setActiveItem(d),b&&b.preventDefault())):e.setCaret(e.caretPos+a))},setCaret:function(b){var c=this;if(b="single"===c.settings.mode?c.items.length:Math.max(0,Math.min(c.items.length,b)),!c.isPending){var d,e,f,g;for(f=c.$control.children(":not(input)"),d=0,e=f.length;e>d;d++)g=a(f[d]).detach(),b>d?c.$control_input.before(g):c.$control.append(g)}c.caretPos=b},lock:function(){this.close(),this.isLocked=!0,this.refreshState()},unlock:function(){this.isLocked=!1,this.refreshState()},disable:function(){var a=this;a.$input.prop("disabled",!0),a.isDisabled=!0,a.lock()},enable:function(){var a=this;a.$input.prop("disabled",!1),a.isDisabled=!1,a.unlock()},destroy:function(){var b=this,c=b.eventNS,d=b.revertSettings;b.trigger("destroy"),b.off(),b.$wrapper.remove(),b.$dropdown.remove(),b.$input.html("").append(d.$children).removeAttr("tabindex").removeClass("selectized").attr({tabindex:d.tabindex}).show(),b.$control_input.removeData("grow"),b.$input.removeData("selectize"),a(window).off(c),a(document).off(c),a(document.body).off(c),delete b.$input[0].selectize
+},render:function(a,b){var c,d,e="",f=!1,g=this,h=/^[\t ]*<([a-z][a-z0-9\-_]*(?:\:[a-z][a-z0-9\-_]*)?)/i;return("option"===a||"item"===a)&&(c=y(b[g.settings.valueField]),f=!!c),f&&(x(g.renderCache[a])||(g.renderCache[a]={}),g.renderCache[a].hasOwnProperty(c))?g.renderCache[a][c]:(e=g.settings.render[a].apply(this,[b,z]),("option"===a||"option_create"===a)&&(e=e.replace(h,"<$1 data-selectable")),"optgroup"===a&&(d=b[g.settings.optgroupValueField]||"",e=e.replace(h,'<$1 data-group="'+A(z(d))+'"')),("option"===a||"item"===a)&&(e=e.replace(h,'<$1 data-value="'+A(z(c||""))+'"')),f&&(g.renderCache[a][c]=e),e)},clearCache:function(a){var b=this;"undefined"==typeof a?b.renderCache={}:delete b.renderCache[a]},canCreate:function(a){var b=this;if(!b.settings.create)return!1;var c=b.settings.createFilter;return!(!a.length||"function"==typeof c&&!c.apply(b,[a])||"string"==typeof c&&!new RegExp(c).test(a)||c instanceof RegExp&&!c.test(a))}}),L.count=0,L.defaults={plugins:[],delimiter:",",persist:!0,diacritics:!0,create:!1,createOnBlur:!1,createFilter:null,highlight:!0,openOnFocus:!0,maxOptions:1e3,maxItems:null,hideSelected:null,addPrecedence:!1,selectOnTab:!1,preload:!1,allowEmptyOption:!1,scrollDuration:60,loadThrottle:300,dataAttr:"data-data",optgroupField:"optgroup",valueField:"value",labelField:"text",optgroupLabelField:"label",optgroupValueField:"value",optgroupOrder:null,sortField:"$order",searchField:["text"],searchConjunction:"and",mode:null,wrapperClass:"selectize-control",inputClass:"selectize-input",dropdownClass:"selectize-dropdown",dropdownContentClass:"selectize-dropdown-content",dropdownParent:null,copyClassesToDropdown:!0,render:{}},a.fn.selectize=function(b){var c=a.fn.selectize.defaults,d=a.extend({},c,b),e=d.dataAttr,f=d.labelField,g=d.valueField,h=d.optgroupField,i=d.optgroupLabelField,j=d.optgroupValueField,k=function(b,c){var e,h,i,j,k=a.trim(b.val()||"");if(d.allowEmptyOption||k.length){for(i=k.split(d.delimiter),e=0,h=i.length;h>e;e++)j={},j[f]=i[e],j[g]=i[e],c.options[i[e]]=j;c.items=i}},l=function(b,c){var k,l,m,n,o=0,p=c.options,q=function(a){var b=e&&a.attr(e);return"string"==typeof b&&b.length?JSON.parse(b):null},r=function(b,e){var i,j;if(b=a(b),i=b.attr("value")||"",i.length||d.allowEmptyOption){if(p.hasOwnProperty(i))return void(e&&(p[i].optgroup?a.isArray(p[i].optgroup)?p[i].optgroup.push(e):p[i].optgroup=[p[i].optgroup,e]:p[i].optgroup=e));j=q(b)||{},j[f]=j[f]||b.text(),j[g]=j[g]||i,j[h]=j[h]||e,j.$order=++o,p[i]=j,b.is(":selected")&&c.items.push(i)}},s=function(b){var d,e,f,g,h;for(b=a(b),f=b.attr("label"),f&&(g=q(b)||{},g[i]=f,g[j]=f,c.optgroups[f]=g),h=a("option",b),d=0,e=h.length;e>d;d++)r(h[d],f)};for(c.maxItems=b.attr("multiple")?null:1,n=b.children(),k=0,l=n.length;l>k;k++)m=n[k].tagName.toLowerCase(),"optgroup"===m?s(n[k]):"option"===m&&r(n[k])};return this.each(function(){if(!this.selectize){var e,f=a(this),g=this.tagName.toLowerCase(),h=f.attr("placeholder")||f.attr("data-placeholder");h||d.allowEmptyOption||(h=f.children('option[value=""]').text());var i={placeholder:h,options:{},optgroups:{},items:[]};"select"===g?l(f,i):k(f,i),e=new L(f,a.extend(!0,{},c,i,b))}})},a.fn.selectize.defaults=L.defaults,L.define("drag_drop",function(){if(!a.fn.sortable)throw new Error('The "drag_drop" plugin requires jQuery UI "sortable".');if("multi"===this.settings.mode){var b=this;b.lock=function(){var a=b.lock;return function(){var c=b.$control.data("sortable");return c&&c.disable(),a.apply(b,arguments)}}(),b.unlock=function(){var a=b.unlock;return function(){var c=b.$control.data("sortable");return c&&c.enable(),a.apply(b,arguments)}}(),b.setup=function(){var c=b.setup;return function(){c.apply(this,arguments);var d=b.$control.sortable({items:"[data-value]",forcePlaceholderSize:!0,disabled:b.isLocked,start:function(a,b){b.placeholder.css("width",b.helper.css("width")),d.css({overflow:"visible"})},stop:function(){d.css({overflow:"hidden"});var c=b.$activeItems?b.$activeItems.slice():null,e=[];d.children("[data-value]").each(function(){e.push(a(this).attr("data-value"))}),b.setValue(e),b.setActiveItem(c)}})}}()}}),L.define("dropdown_header",function(b){var c=this;b=a.extend({title:"Untitled",headerClass:"selectize-dropdown-header",titleRowClass:"selectize-dropdown-header-title",labelClass:"selectize-dropdown-header-label",closeClass:"selectize-dropdown-header-close",html:function(a){return'<div class="'+a.headerClass+'"><div class="'+a.titleRowClass+'"><span class="'+a.labelClass+'">'+a.title+'</span><a href="javascript:void(0)" class="'+a.closeClass+'">&times;</a></div></div>'}},b),c.setup=function(){var d=c.setup;return function(){d.apply(c,arguments),c.$dropdown_header=a(b.html(b)),c.$dropdown.prepend(c.$dropdown_header)}}()}),L.define("optgroup_columns",function(b){var c=this;b=a.extend({equalizeWidth:!0,equalizeHeight:!0},b),this.getAdjacentOption=function(b,c){var d=b.closest("[data-group]").find("[data-selectable]"),e=d.index(b)+c;return e>=0&&e<d.length?d.eq(e):a()},this.onKeyDown=function(){var a=c.onKeyDown;return function(b){var d,e,f,g;return!this.isOpen||b.keyCode!==j&&b.keyCode!==m?a.apply(this,arguments):(c.ignoreHover=!0,g=this.$activeOption.closest("[data-group]"),d=g.find("[data-selectable]").index(this.$activeOption),g=b.keyCode===j?g.prev("[data-group]"):g.next("[data-group]"),f=g.find("[data-selectable]"),e=f.eq(Math.min(f.length-1,d)),void(e.length&&this.setActiveOption(e)))}}();var d=function(){var a,b=d.width,c=document;return"undefined"==typeof b&&(a=c.createElement("div"),a.innerHTML='<div style="width:50px;height:50px;position:absolute;left:-50px;top:-50px;overflow:auto;"><div style="width:1px;height:100px;"></div></div>',a=a.firstChild,c.body.appendChild(a),b=d.width=a.offsetWidth-a.clientWidth,c.body.removeChild(a)),b},e=function(){var e,f,g,h,i,j,k;if(k=a("[data-group]",c.$dropdown_content),f=k.length,f&&c.$dropdown_content.width()){if(b.equalizeHeight){for(g=0,e=0;f>e;e++)g=Math.max(g,k.eq(e).height());k.css({height:g})}b.equalizeWidth&&(j=c.$dropdown_content.innerWidth()-d(),h=Math.round(j/f),k.css({width:h}),f>1&&(i=j-h*(f-1),k.eq(f-1).css({width:i})))}};(b.equalizeHeight||b.equalizeWidth)&&(B.after(this,"positionDropdown",e),B.after(this,"refreshOptions",e))}),L.define("remove_button",function(b){if("single"!==this.settings.mode){b=a.extend({label:"&times;",title:"Remove",className:"remove",append:!0},b);var c=this,d='<a href="javascript:void(0)" class="'+b.className+'" tabindex="-1" title="'+z(b.title)+'">'+b.label+"</a>",e=function(a,b){var c=a.search(/(<\/[^>]+>\s*)$/);return a.substring(0,c)+b+a.substring(c)};this.setup=function(){var f=c.setup;return function(){if(b.append){var g=c.settings.render.item;c.settings.render.item=function(){return e(g.apply(this,arguments),d)}}f.apply(this,arguments),this.$control.on("click","."+b.className,function(b){if(b.preventDefault(),!c.isLocked){var d=a(b.currentTarget).parent();c.setActiveItem(d),c.deleteSelection()&&c.setCaret(c.items.length)}})}}()}}),L.define("restore_on_backspace",function(a){var b=this;a.text=a.text||function(a){return a[this.settings.labelField]},this.onKeyDown=function(){var c=b.onKeyDown;return function(b){var d,e;return b.keyCode===p&&""===this.$control_input.val()&&!this.$activeItems.length&&(d=this.caretPos-1,d>=0&&d<this.items.length)?(e=this.options[this.items[d]],this.deleteSelection(b)&&(this.setTextboxValue(a.text.apply(this,[e])),this.refreshOptions(!0)),void b.preventDefault()):c.apply(this,arguments)}}()}),L});
\ No newline at end of file
diff --git a/sources/themes/default/js/switchbox.js b/sources/themes/default/js/switchbox.js
index b20f82d..6b1e8f2 100644
--- a/sources/themes/default/js/switchbox.js
+++ b/sources/themes/default/js/switchbox.js
@@ -17,7 +17,7 @@
 			sbFunc(SwitchBox[i], SwitchBox[i+1]);
 	}
 
-	SwitchBox = {
+	window.SwitchBox = {
 		push: sbFunc
 	}
 })();
\ No newline at end of file
diff --git a/sources/themes/default/template/index.tpl b/sources/themes/default/template/index.tpl
index e8009b9..81802b1 100644
--- a/sources/themes/default/template/index.tpl
+++ b/sources/themes/default/template/index.tpl
@@ -26,7 +26,7 @@
 			{/if}
 			{/foreach}
 		</div>
-		{footer_script}(SwitchBox=window.SwitchBox||[]).push("#sortOrderLink", "#sortOrderBox");{/footer_script}
+		{footer_script}(window.SwitchBox=window.SwitchBox||[]).push("#sortOrderLink", "#sortOrderBox");{/footer_script}
 		{/strip}</li>
 {/if}
 {if !empty($image_derivatives)}
@@ -43,7 +43,7 @@
 			{/if}
 			{/foreach}
 		</div>
-		{footer_script}(SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");{/footer_script}
+		{footer_script}(window.SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");{/footer_script}
 		{/strip}</li>
 {/if}
 
@@ -109,7 +109,7 @@
 		<span{if !$view.SELECTED} style="visibility:hidden"{/if}>&#x2714; </span><a href="{$view.VALUE}">{$view.CONTENT}</a>
 		{/foreach}
 	</div>
-	{footer_script}(SwitchBox=window.SwitchBox||[]).push("#calendarViewSwitchLink", "#calendarViewSwitchBox");{/footer_script}
+	{footer_script}(window.SwitchBox=window.SwitchBox||[]).push("#calendarViewSwitchLink", "#calendarViewSwitchBox");{/footer_script}
 </div>
 {/if}
 
diff --git a/sources/themes/default/template/mail/index.php b/sources/themes/default/template/mail/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/default/template/mail/index.php
+++ b/sources/themes/default/template/mail/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/default/template/mail/text/html/cat_group_info.tpl b/sources/themes/default/template/mail/text/html/cat_group_info.tpl
index e8d7d7c..6a136c6 100644
--- a/sources/themes/default/template/mail/text/html/cat_group_info.tpl
+++ b/sources/themes/default/template/mail/text/html/cat_group_info.tpl
@@ -1,6 +1,6 @@
 <div id="cat_group_info">
 <h2>{'Informations'|@translate}</h2>
-<p>{$IMG_URL}</p>
+<p><a href="{$IMG.link}" class="thumblnk"><img src="{$IMG.src}"></a></p>
 <p>{'Hello,'|@translate}</p>
 <p>{'Discover album:'|@translate} <a href="{$LINK}">{$CAT_NAME}</a></p>
 <p>{$CPL_CONTENT}</p>
diff --git a/sources/themes/default/template/mail/text/html/global-mail-css.tpl b/sources/themes/default/template/mail/text/html/global-mail-css.tpl
index 59a1bde..23a3be3 100644
--- a/sources/themes/default/template/mail/text/html/global-mail-css.tpl
+++ b/sources/themes/default/template/mail/text/html/global-mail-css.tpl
@@ -1,4 +1,3 @@
-{strip}
 /* page */
 body {
   font-family:"Verdana", "Helvetica", "Optima", sans-serif;
@@ -102,4 +101,3 @@ hr {
   border-style:solid;
   margin:1em;
 }
-{/strip}
\ No newline at end of file
diff --git a/sources/themes/default/template/mail/text/html/index.php b/sources/themes/default/template/mail/text/html/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/default/template/mail/text/html/index.php
+++ b/sources/themes/default/template/mail/text/html/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/default/template/mail/text/html/mail-css-clear.tpl b/sources/themes/default/template/mail/text/html/mail-css-clear.tpl
index 98b0337..c2e908e 100644
--- a/sources/themes/default/template/mail/text/html/mail-css-clear.tpl
+++ b/sources/themes/default/template/mail/text/html/mail-css-clear.tpl
@@ -1,4 +1,3 @@
-{strip}
 /* page */
 body {
   color:#111;
@@ -70,4 +69,3 @@ blockquote {
   background:#eee;
   border-right:1px solid #fff;
 }
-{/strip}
\ No newline at end of file
diff --git a/sources/themes/default/template/mail/text/html/mail-css-dark.tpl b/sources/themes/default/template/mail/text/html/mail-css-dark.tpl
index 390a7df..f4e8a3f 100644
--- a/sources/themes/default/template/mail/text/html/mail-css-dark.tpl
+++ b/sources/themes/default/template/mail/text/html/mail-css-dark.tpl
@@ -1,4 +1,3 @@
-{strip}
 /* page */
 body {
   color:#fff;
@@ -84,4 +83,3 @@ blockquote {
 hr {
   border-color:#555;
 }
-{/strip}
\ No newline at end of file
diff --git a/sources/themes/default/template/mail/text/index.php b/sources/themes/default/template/mail/text/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/default/template/mail/text/index.php
+++ b/sources/themes/default/template/mail/text/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/default/template/mail/text/plain/index.php b/sources/themes/default/template/mail/text/plain/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/default/template/mail/text/plain/index.php
+++ b/sources/themes/default/template/mail/text/plain/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/default/template/navigation_bar.tpl b/sources/themes/default/template/navigation_bar.tpl
index 82c66bd..0e1e0fe 100644
--- a/sources/themes/default/template/navigation_bar.tpl
+++ b/sources/themes/default/template/navigation_bar.tpl
@@ -1,10 +1,10 @@
 <div class="navigationBar">
   {if isset($navbar.URL_FIRST)}
-  <a href="{$navbar.URL_FIRST}" rel="first">{'First'|@translate}</a> |
-  <a href="{$navbar.URL_PREV}" rel="prev">{'Previous'|@translate}</a> |
+  <span class="navFirstLast"><a href="{$navbar.URL_FIRST}" rel="first">{'First'|@translate}</a> |</span>
+  <span class="navPrevNext"><a href="{$navbar.URL_PREV}" rel="prev">{'Previous'|@translate}</a> |</span>
   {else}
-  {'First'|@translate} |
-  {'Previous'|@translate} |
+  <span class="navFirstLast">{'First'|@translate} |</span>
+  <span class="navPrevNext">{'Previous'|@translate} |</span>
   {/if}
 
   {assign var='prev_page' value=0}
@@ -19,10 +19,10 @@
   {/foreach}
 
   {if isset($navbar.URL_NEXT)}
-  | <a href="{$navbar.URL_NEXT}" rel="next">{'Next'|@translate}</a>
-  | <a href="{$navbar.URL_LAST}" rel="last">{'Last'|@translate}</a>
+  <span class="navPrevNext">| <a href="{$navbar.URL_NEXT}" rel="next">{'Next'|@translate}</a></span>
+  <span class="navFirstLast">| <a href="{$navbar.URL_LAST}" rel="last">{'Last'|@translate}</a></span>
   {else}
-  | {'Next'|@translate}
-  | {'Last'|@translate}
+  <span class="navPrevNext">| {'Next'|@translate}</span>
+  <span class="navFirstLast">| {'Last'|@translate}</span>
   {/if}
 </div>
diff --git a/sources/themes/default/template/picture.tpl b/sources/themes/default/template/picture.tpl
index 9a71ca8..bfc0c24 100644
--- a/sources/themes/default/template/picture.tpl
+++ b/sources/themes/default/template/picture.tpl
@@ -34,7 +34,7 @@ function changeImgSrc(url,typeSave,typeMap)
 	jQuery('#derivativeChecked'+typeMap).css('visibility','visible');
 	document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
 }
-(SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");
+(window.SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");
 {/literal}{/footer_script}
 {strip}<a id="derivativeSwitchLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
   <span class="pwg-icon pwg-icon-sizes"></span><span class="pwg-button-text">{'Photo sizes'|@translate}</span>
@@ -65,9 +65,28 @@ function changeImgSrc(url,typeSave,typeMap)
 	</a>
 {/if}{/strip}
 {strip}{if isset($current.U_DOWNLOAD)}
-	<a href="{$current.U_DOWNLOAD}" title="{'Download this file'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+	<a id="downloadSwitchLink" href="{$current.U_DOWNLOAD}" title="{'Download this file'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 		<span class="pwg-icon pwg-icon-save"></span><span class="pwg-button-text">{'Download'|@translate}</span>
 	</a>
+
+{if !empty($current.formats)}
+{footer_script require='jquery'}{literal}
+jQuery().ready(function() {
+  jQuery("#downloadSwitchLink").removeAttr("href");
+
+  (window.SwitchBox=window.SwitchBox||[]).push("#downloadSwitchLink", "#downloadSwitchBox");
+});
+{/literal}{/footer_script}
+
+<div id="downloadSwitchBox" class="switchBox">
+  <div class="switchBoxTitle">{'Download'|translate} - {'Formats'|translate}</div>
+  <ul>
+  {foreach from=$current.formats item=format}
+    <li><a href="{$format.download_url}" rel="nofollow">{$format.label}<span class="downloadformatDetails"> ({$format.filesize})</span></a></li>
+  {/foreach}
+  </ul>
+</div>
+{/if} {* has formats *}
 {/if}{/strip}
 {if isset($PLUGIN_PICTURE_BUTTONS)}{foreach from=$PLUGIN_PICTURE_BUTTONS item=button}{$button}{/foreach}{/if}
 {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
@@ -293,7 +312,7 @@ function setPrivacyLevel(id, level){
 	}
 	);
 }
-(SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox");
+(window.SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox");
 {/strip}{/footer_script}
 			<div id="privacyLevelBox" class="switchBox" style="display:none">
 				{foreach from=$available_permission_levels item=label key=level}
diff --git a/sources/themes/default/template/search.tpl b/sources/themes/default/template/search.tpl
index 1a12e98..4129746 100644
--- a/sources/themes/default/template/search.tpl
+++ b/sources/themes/default/template/search.tpl
@@ -47,6 +47,9 @@ jQuery(document).ready(function() {
     <label><input type="checkbox" name="fields[]" value="name" checked="checked"> {'Photo title'|translate}</label>
     <label><input type="checkbox" name="fields[]" value="comment" checked="checked"> {'Photo description'|translate}</label>
     <label><input type="checkbox" name="fields[]" value="file" checked="checked"> {'File name'|translate}</label>
+{if isset($TAGS)}
+    <label><input type="checkbox" name="search_in_tags" value="tags"> {'Tags'|translate}</label>
+{/if}
   </p>
 
 </fieldset>
diff --git a/sources/themes/default/template/slideshow.tpl b/sources/themes/default/template/slideshow.tpl
index 8a2304b..03f3655 100644
--- a/sources/themes/default/template/slideshow.tpl
+++ b/sources/themes/default/template/slideshow.tpl
@@ -21,4 +21,4 @@
 	  {/if}
 	</div>
 	</div>
-<div>
+</div>
diff --git a/sources/themes/default/theme.css b/sources/themes/default/theme.css
index 3a68f15..5a438be 100644
--- a/sources/themes/default/theme.css
+++ b/sources/themes/default/theme.css
@@ -363,6 +363,12 @@ TD.calDayCellFull, TD.calDayCellEmpty {
   margin-bottom:5px;
 }
 
+#downloadSwitchBox ul {
+  margin:0;
+  padding:0;
+  list-style-type:none;
+}
+
 #theImage {
 	text-align: center;
 }
diff --git a/sources/themes/default/watermarks/copyright.png b/sources/themes/default/watermarks/copyright.png
index 0784d48..f8c2e40 100644
Binary files a/sources/themes/default/watermarks/copyright.png and b/sources/themes/default/watermarks/copyright.png differ
diff --git a/sources/themes/elegant/admin/admin.inc.php b/sources/themes/elegant/admin/admin.inc.php
index bbb03c1..7f68dc0 100644
--- a/sources/themes/elegant/admin/admin.inc.php
+++ b/sources/themes/elegant/admin/admin.inc.php
@@ -14,8 +14,7 @@ if(isset($_POST['submit_elegant']))
   $config_send['p_pict_descr']=(isset($_POST['p_pict_descr']) and !empty($_POST['p_pict_descr'])) ? $_POST['p_pict_descr'] : 'on';
   $config_send['p_pict_comment']=(isset($_POST['p_pict_comment']) and !empty($_POST['p_pict_comment'])) ? $_POST['p_pict_comment'] : 'off';
   
-  $conf['elegant'] = serialize($config_send);
-  conf_update_param('elegant', pwg_db_real_escape_string($conf['elegant']));
+  conf_update_param('elegant', $config_send, true);
 
   array_push($page['infos'], l10n('Information data registered in database'));
 }
@@ -23,7 +22,7 @@ if(isset($_POST['submit_elegant']))
 $template->set_filenames(array(
     'theme_admin_content' => dirname(__FILE__) . '/admin.tpl'));
 
-$template->assign('options', unserialize($conf['elegant']));
+$template->assign('options', safe_unserialize($conf['elegant']));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'theme_admin_content');
   
diff --git a/sources/themes/elegant/admin/index.php b/sources/themes/elegant/admin/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/elegant/admin/index.php
+++ b/sources/themes/elegant/admin/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/admin/upgrade.inc.php b/sources/themes/elegant/admin/upgrade.inc.php
index 6cda131..b07fb47 100644
--- a/sources/themes/elegant/admin/upgrade.inc.php
+++ b/sources/themes/elegant/admin/upgrade.inc.php
@@ -7,25 +7,22 @@ global $prefixeTable, $conf;
 if (!isset($conf['elegant']))
 {
   $config = array(
-    'p_main_menu'            => 'on',//on - off - disabled
-    'p_pict_descr'            => 'on',//on - off - disabled
-    'p_pict_comment'            => 'off',//on - off - disabled
+    'p_main_menu' => 'on', //on - off - disabled
+    'p_pict_descr' => 'on', //on - off - disabled
+    'p_pict_comment' => 'off', //on - off - disabled
   );
-  $query = "
-INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-VALUES ('elegant' , '".pwg_db_real_escape_string(serialize($config))."' , 'p_main_menu#');";
-  pwg_query($query);
-  load_conf_from_db();
+  
+  conf_update_param('elegant', $config, true);
 }
-elseif (count(unserialize( $conf['elegant'] ))!=3)
+elseif (count(safe_unserialize( $conf['elegant'] ))!=3)
 {
-  $conff=unserialize($conf['elegant']);
+  $conff = safe_unserialize($conf['elegant']);
   $config = array(
-    'p_main_menu'            => (isset($conff['p_main_menu'])) ? $conff['p_main_menu'] :'on',
-    'p_pict_descr'            => (isset($conff['p_pict_descr'])) ? $conff['p_pict_descr'] :'on',
-    'p_pict_comment'            => (isset($conff['p_pict_comment'])) ? $conff['p_pict_comment'] :'off',
+    'p_main_menu' => (isset($conff['p_main_menu'])) ? $conff['p_main_menu'] :'on',
+    'p_pict_descr' => (isset($conff['p_pict_descr'])) ? $conff['p_pict_descr'] :'on',
+    'p_pict_comment' => (isset($conff['p_pict_comment'])) ? $conff['p_pict_comment'] :'off',
   );
-  conf_update_param('elegant', pwg_db_real_escape_string(serialize($config)));
-  load_conf_from_db();
+  
+  conf_update_param('elegant', $config, true);
 }
 ?>
\ No newline at end of file
diff --git a/sources/themes/elegant/index.php b/sources/themes/elegant/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/elegant/index.php
+++ b/sources/themes/elegant/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/ar_SA/theme.lang.php b/sources/themes/elegant/language/ar_SA/theme.lang.php
index 7d9d1e0..3579431 100755
--- a/sources/themes/elegant/language/ar_SA/theme.lang.php
+++ b/sources/themes/elegant/language/ar_SA/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/bg_BG/theme.lang.php b/sources/themes/elegant/language/bg_BG/theme.lang.php
index b698af4..6947346 100755
--- a/sources/themes/elegant/language/bg_BG/theme.lang.php
+++ b/sources/themes/elegant/language/bg_BG/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/br_FR/theme.lang.php b/sources/themes/elegant/language/br_FR/theme.lang.php
index 1224acf..8392d30 100755
--- a/sources/themes/elegant/language/br_FR/theme.lang.php
+++ b/sources/themes/elegant/language/br_FR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/ca_ES/theme.lang.php b/sources/themes/elegant/language/ca_ES/theme.lang.php
index 3689300..dfc25c7 100755
--- a/sources/themes/elegant/language/ca_ES/theme.lang.php
+++ b/sources/themes/elegant/language/ca_ES/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/da_DK/theme.lang.php b/sources/themes/elegant/language/da_DK/theme.lang.php
index b225664..bb4587d 100755
--- a/sources/themes/elegant/language/da_DK/theme.lang.php
+++ b/sources/themes/elegant/language/da_DK/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/de_DE/theme.lang.php b/sources/themes/elegant/language/de_DE/theme.lang.php
index 9acb103..cbe0c16 100755
--- a/sources/themes/elegant/language/de_DE/theme.lang.php
+++ b/sources/themes/elegant/language/de_DE/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/el_GR/theme.lang.php b/sources/themes/elegant/language/el_GR/theme.lang.php
index d447268..ae3af96 100755
--- a/sources/themes/elegant/language/el_GR/theme.lang.php
+++ b/sources/themes/elegant/language/el_GR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/en_UK/index.php b/sources/themes/elegant/language/en_UK/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/elegant/language/en_UK/index.php
+++ b/sources/themes/elegant/language/en_UK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/eo_EO/theme.lang.php b/sources/themes/elegant/language/eo_EO/theme.lang.php
index 8d0b4c4..cc22a70 100755
--- a/sources/themes/elegant/language/eo_EO/theme.lang.php
+++ b/sources/themes/elegant/language/eo_EO/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/es_ES/theme.lang.php b/sources/themes/elegant/language/es_ES/theme.lang.php
index 3c593a3..c325f25 100755
--- a/sources/themes/elegant/language/es_ES/theme.lang.php
+++ b/sources/themes/elegant/language/es_ES/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/et_EE/theme.lang.php b/sources/themes/elegant/language/et_EE/theme.lang.php
index 53f3d69..8864dfe 100755
--- a/sources/themes/elegant/language/et_EE/theme.lang.php
+++ b/sources/themes/elegant/language/et_EE/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/fa_IR/theme.lang.php b/sources/themes/elegant/language/fa_IR/theme.lang.php
index 6fd310c..ab5d684 100755
--- a/sources/themes/elegant/language/fa_IR/theme.lang.php
+++ b/sources/themes/elegant/language/fa_IR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/fi_FI/theme.lang.php b/sources/themes/elegant/language/fi_FI/theme.lang.php
index dbe296a..6caff32 100755
--- a/sources/themes/elegant/language/fi_FI/theme.lang.php
+++ b/sources/themes/elegant/language/fi_FI/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/fr_CA/index.php b/sources/themes/elegant/language/fr_CA/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/elegant/language/fr_CA/index.php
+++ b/sources/themes/elegant/language/fr_CA/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/fr_FR/index.php b/sources/themes/elegant/language/fr_FR/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/elegant/language/fr_FR/index.php
+++ b/sources/themes/elegant/language/fr_FR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/gl_ES/theme.lang.php b/sources/themes/elegant/language/gl_ES/theme.lang.php
index 35f26d0..9e7b144 100644
--- a/sources/themes/elegant/language/gl_ES/theme.lang.php
+++ b/sources/themes/elegant/language/gl_ES/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/he_IL/theme.lang.php b/sources/themes/elegant/language/he_IL/theme.lang.php
index bb44bcb..0e12b13 100755
--- a/sources/themes/elegant/language/he_IL/theme.lang.php
+++ b/sources/themes/elegant/language/he_IL/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/hu_HU/theme.lang.php b/sources/themes/elegant/language/hu_HU/theme.lang.php
index 2546f25..8610f1e 100755
--- a/sources/themes/elegant/language/hu_HU/theme.lang.php
+++ b/sources/themes/elegant/language/hu_HU/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/it_IT/theme.lang.php b/sources/themes/elegant/language/it_IT/theme.lang.php
index db7d233..8f752d5 100755
--- a/sources/themes/elegant/language/it_IT/theme.lang.php
+++ b/sources/themes/elegant/language/it_IT/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/ja_JP/theme.lang.php b/sources/themes/elegant/language/ja_JP/theme.lang.php
index c664719..bd881da 100755
--- a/sources/themes/elegant/language/ja_JP/theme.lang.php
+++ b/sources/themes/elegant/language/ja_JP/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/km_KH/theme.lang.php b/sources/themes/elegant/language/km_KH/theme.lang.php
index 6c0cc77..f5ce7ca 100755
--- a/sources/themes/elegant/language/km_KH/theme.lang.php
+++ b/sources/themes/elegant/language/km_KH/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/kn_IN/theme.lang.php b/sources/themes/elegant/language/kn_IN/theme.lang.php
index 8ec8077..bb9a4bf 100755
--- a/sources/themes/elegant/language/kn_IN/theme.lang.php
+++ b/sources/themes/elegant/language/kn_IN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/ko_KR/theme.lang.php b/sources/themes/elegant/language/ko_KR/theme.lang.php
index 143ce22..2dae80e 100755
--- a/sources/themes/elegant/language/ko_KR/theme.lang.php
+++ b/sources/themes/elegant/language/ko_KR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/lt_LT/theme.lang.php b/sources/themes/elegant/language/lt_LT/theme.lang.php
index b3a39bf..9467d7b 100755
--- a/sources/themes/elegant/language/lt_LT/theme.lang.php
+++ b/sources/themes/elegant/language/lt_LT/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/lv_LV/theme.lang.php b/sources/themes/elegant/language/lv_LV/theme.lang.php
index 8b54fe3..6f744e4 100755
--- a/sources/themes/elegant/language/lv_LV/theme.lang.php
+++ b/sources/themes/elegant/language/lv_LV/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/mn_MN/theme.lang.php b/sources/themes/elegant/language/mn_MN/theme.lang.php
index fe6cb33..dc34d09 100755
--- a/sources/themes/elegant/language/mn_MN/theme.lang.php
+++ b/sources/themes/elegant/language/mn_MN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/nb_NO/theme.lang.php b/sources/themes/elegant/language/nb_NO/theme.lang.php
index b2c8f7b..004aadd 100755
--- a/sources/themes/elegant/language/nb_NO/theme.lang.php
+++ b/sources/themes/elegant/language/nb_NO/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/nl_NL/theme.lang.php b/sources/themes/elegant/language/nl_NL/theme.lang.php
index 821ee31..5f0cbc3 100755
--- a/sources/themes/elegant/language/nl_NL/theme.lang.php
+++ b/sources/themes/elegant/language/nl_NL/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/nn_NO/theme.lang.php b/sources/themes/elegant/language/nn_NO/theme.lang.php
index dd7d1db..21590c4 100755
--- a/sources/themes/elegant/language/nn_NO/theme.lang.php
+++ b/sources/themes/elegant/language/nn_NO/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/pl_PL/theme.lang.php b/sources/themes/elegant/language/pl_PL/theme.lang.php
index e742cd4..d827e20 100755
--- a/sources/themes/elegant/language/pl_PL/theme.lang.php
+++ b/sources/themes/elegant/language/pl_PL/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/pt_BR/theme.lang.php b/sources/themes/elegant/language/pt_BR/theme.lang.php
index 915d649..34bd64f 100755
--- a/sources/themes/elegant/language/pt_BR/theme.lang.php
+++ b/sources/themes/elegant/language/pt_BR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/pt_PT/theme.lang.php b/sources/themes/elegant/language/pt_PT/theme.lang.php
index f3db379..cda0f3d 100755
--- a/sources/themes/elegant/language/pt_PT/theme.lang.php
+++ b/sources/themes/elegant/language/pt_PT/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/ro_RO/theme.lang.php b/sources/themes/elegant/language/ro_RO/theme.lang.php
index 8281061..7fdd2ab 100755
--- a/sources/themes/elegant/language/ro_RO/theme.lang.php
+++ b/sources/themes/elegant/language/ro_RO/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/ru_RU/theme.lang.php b/sources/themes/elegant/language/ru_RU/theme.lang.php
index 95b737d..e2a24de 100755
--- a/sources/themes/elegant/language/ru_RU/theme.lang.php
+++ b/sources/themes/elegant/language/ru_RU/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/sk_SK/theme.lang.php b/sources/themes/elegant/language/sk_SK/theme.lang.php
index 2643a2c..68754c6 100755
--- a/sources/themes/elegant/language/sk_SK/theme.lang.php
+++ b/sources/themes/elegant/language/sk_SK/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/sl_SI/theme.lang.php b/sources/themes/elegant/language/sl_SI/theme.lang.php
index 0b95a10..1e58e8a 100755
--- a/sources/themes/elegant/language/sl_SI/theme.lang.php
+++ b/sources/themes/elegant/language/sl_SI/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/sr_RS/theme.lang.php b/sources/themes/elegant/language/sr_RS/theme.lang.php
index 54cd7f5..e5808de 100755
--- a/sources/themes/elegant/language/sr_RS/theme.lang.php
+++ b/sources/themes/elegant/language/sr_RS/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/sv_SE/theme.lang.php b/sources/themes/elegant/language/sv_SE/theme.lang.php
index 3582ea6..5b4e0e8 100755
--- a/sources/themes/elegant/language/sv_SE/theme.lang.php
+++ b/sources/themes/elegant/language/sv_SE/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/ta_IN/theme.lang.php b/sources/themes/elegant/language/ta_IN/theme.lang.php
index f6b9602..9ef1392 100755
--- a/sources/themes/elegant/language/ta_IN/theme.lang.php
+++ b/sources/themes/elegant/language/ta_IN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/th_TH/theme.lang.php b/sources/themes/elegant/language/th_TH/theme.lang.php
index b95eba1..9d639de 100755
--- a/sources/themes/elegant/language/th_TH/theme.lang.php
+++ b/sources/themes/elegant/language/th_TH/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/tr_TR/theme.lang.php b/sources/themes/elegant/language/tr_TR/theme.lang.php
index a2dfbc8..83e677a 100755
--- a/sources/themes/elegant/language/tr_TR/theme.lang.php
+++ b/sources/themes/elegant/language/tr_TR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/uk_UA/theme.lang.php b/sources/themes/elegant/language/uk_UA/theme.lang.php
index 800aee1..5a62ba7 100755
--- a/sources/themes/elegant/language/uk_UA/theme.lang.php
+++ b/sources/themes/elegant/language/uk_UA/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/vi_VN/theme.lang.php b/sources/themes/elegant/language/vi_VN/theme.lang.php
index 230ee3d..b4e01cf 100755
--- a/sources/themes/elegant/language/vi_VN/theme.lang.php
+++ b/sources/themes/elegant/language/vi_VN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/zh_CN/theme.lang.php b/sources/themes/elegant/language/zh_CN/theme.lang.php
index c08ca93..c5c7940 100755
--- a/sources/themes/elegant/language/zh_CN/theme.lang.php
+++ b/sources/themes/elegant/language/zh_CN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/zh_HK/theme.lang.php b/sources/themes/elegant/language/zh_HK/theme.lang.php
index dfc326a..ef3e6d9 100755
--- a/sources/themes/elegant/language/zh_HK/theme.lang.php
+++ b/sources/themes/elegant/language/zh_HK/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/language/zh_TW/theme.lang.php b/sources/themes/elegant/language/zh_TW/theme.lang.php
index bf5fdd1..186177c 100755
--- a/sources/themes/elegant/language/zh_TW/theme.lang.php
+++ b/sources/themes/elegant/language/zh_TW/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/elegant/themeconf.inc.php b/sources/themes/elegant/themeconf.inc.php
index fc6a522..9309a7a 100644
--- a/sources/themes/elegant/themeconf.inc.php
+++ b/sources/themes/elegant/themeconf.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Theme Name: elegant
-Version: 2.7.2
+Version: 2.8.2
 Description: Dark background, grayscale.
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=685
 Author: Piwigo team
diff --git a/sources/themes/index.php b/sources/themes/index.php
index c8de97f..0b96c3e 100644
--- a/sources/themes/index.php
+++ b/sources/themes/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/admin/admin.inc.php b/sources/themes/smartpocket/admin/admin.inc.php
index a5a9300..6b20698 100644
--- a/sources/themes/smartpocket/admin/admin.inc.php
+++ b/sources/themes/smartpocket/admin/admin.inc.php
@@ -13,8 +13,7 @@ if(isset($_POST['submit_smartpocket']))
   $config_send['loop'] = isset($_POST['loop']);
   $config_send['autohide'] = (isset($_POST['autohide']) ? 5000 : 0);
   
-  $conf['smartpocket'] = serialize($config_send);
-  conf_update_param('smartpocket', pwg_db_real_escape_string($conf['smartpocket']));
+  conf_update_param('smartpocket', $config_send, true);
 
   array_push($page['infos'], l10n('Information data registered in database'));
 }
@@ -22,7 +21,7 @@ if(isset($_POST['submit_smartpocket']))
 $template->set_filenames(array(
     'theme_admin_content' => dirname(__FILE__) . '/admin.tpl'));
 
-$template->assign('options', unserialize($conf['smartpocket']));
+$template->assign('options', safe_unserialize($conf['smartpocket']));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'theme_admin_content');
   
diff --git a/sources/themes/smartpocket/admin/index.php b/sources/themes/smartpocket/admin/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/smartpocket/admin/index.php
+++ b/sources/themes/smartpocket/admin/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/admin/maintain.inc.php b/sources/themes/smartpocket/admin/maintain.inc.php
index d3beb48..92fe7b1 100644
--- a/sources/themes/smartpocket/admin/maintain.inc.php
+++ b/sources/themes/smartpocket/admin/maintain.inc.php
@@ -14,27 +14,25 @@ class smartpocket_maintain extends ThemeMaintain
 
     if (empty($conf['smartpocket']))
     {
-      $conf['smartpocket'] = serialize($this->default_conf);
-      $query = "
-  INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-  VALUES ('smartpocket' , '".pwg_db_real_escape_string($conf['smartpocket'])."' , 'loop#autohide');";
-      pwg_query($query);
+      conf_update_param('smartpocket', $this->default_conf, true);
     }
-    elseif (count(unserialize( $conf['smartpocket'] ))!=2)
+    elseif (count(safe_unserialize($conf['smartpocket'])) != 2)
     {
-      $conff=unserialize($conf['smartpocket']);
+      $conff = safe_unserialize($conf['smartpocket']);
+      
       $config = array(
-        'loop'            => (!empty($conff['loop'])) ? $conff['loop'] :true,
-        'autohide'            => (!empty($conff['autohide'])) ? $conff['autohide'] :5000,
+        'loop' => (!empty($conff['loop'])) ? $conff['loop'] :true,
+        'autohide' => (!empty($conff['autohide'])) ? $conff['autohide'] :5000,
       );
-      conf_update_param('smartpocket', pwg_db_real_escape_string(serialize($config)));
-      load_conf_from_db();
+      
+      conf_update_param('smartpocket', $config, true);
     }
     $this->installed = true;
   }
 
   function deactivate()
-  { }
+  {
+  }
 
   function delete()
   {
diff --git a/sources/themes/smartpocket/admin/upgrade.inc.php b/sources/themes/smartpocket/admin/upgrade.inc.php
index 1e1925d..53e4e1a 100644
--- a/sources/themes/smartpocket/admin/upgrade.inc.php
+++ b/sources/themes/smartpocket/admin/upgrade.inc.php
@@ -7,23 +7,19 @@ global $prefixeTable, $conf;
 if (!isset($conf['smartpocket']))
 {
   $config = array(
-    'loop'            => true,//true - false
-    'autohide'            => 5000,//5000 - 0
+    'loop' => true,//true - false
+    'autohide' => 5000,//5000 - 0
   );
-  $query = "
-INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-VALUES ('smartpocket' , '".pwg_db_real_escape_string(serialize($config))."' , 'loop#autohide');";
-  pwg_query($query);
-  load_conf_from_db();
+
+  conf_update_param('smartpocket', $config, true);
 }
-elseif (count(unserialize( $conf['smartpocket'] ))!=2)
+elseif (count(safe_unserialize($conf['smartpocket'])) != 2)
 {
-  $conff=unserialize($conf['smartpocket']);
+  $conff = safe_unserialize($conf['smartpocket']);
   $config = array(
-    'loop'            => (!empty($conff['loop'])) ? $conff['loop'] :true,
-    'autohide'            => (!empty($conff['autohide'])) ? $conff['autohide'] :5000,
+    'loop' => (!empty($conff['loop'])) ? $conff['loop'] :true,
+    'autohide' => (!empty($conff['autohide'])) ? $conff['autohide'] :5000,
   );
-  conf_update_param('smartpocket', pwg_db_real_escape_string(serialize($config)));
-  load_conf_from_db();
+  conf_update_param('smartpocket', $config, true);
 }
 ?>
\ No newline at end of file
diff --git a/sources/themes/smartpocket/language/ar_SA/theme.lang.php b/sources/themes/smartpocket/language/ar_SA/theme.lang.php
index 83ddba8..5783d88 100644
--- a/sources/themes/smartpocket/language/ar_SA/theme.lang.php
+++ b/sources/themes/smartpocket/language/ar_SA/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/bg_BG/theme.lang.php b/sources/themes/smartpocket/language/bg_BG/theme.lang.php
index 170aebd..60ff7bd 100755
--- a/sources/themes/smartpocket/language/bg_BG/theme.lang.php
+++ b/sources/themes/smartpocket/language/bg_BG/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/br_FR/theme.lang.php b/sources/themes/smartpocket/language/br_FR/theme.lang.php
index cc04808..89b5840 100755
--- a/sources/themes/smartpocket/language/br_FR/theme.lang.php
+++ b/sources/themes/smartpocket/language/br_FR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/ca_ES/theme.lang.php b/sources/themes/smartpocket/language/ca_ES/theme.lang.php
index 3e03201..ecbdc25 100755
--- a/sources/themes/smartpocket/language/ca_ES/theme.lang.php
+++ b/sources/themes/smartpocket/language/ca_ES/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/cs_CZ/index.php b/sources/themes/smartpocket/language/cs_CZ/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/smartpocket/language/cs_CZ/index.php
+++ b/sources/themes/smartpocket/language/cs_CZ/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/da_DK/theme.lang.php b/sources/themes/smartpocket/language/da_DK/theme.lang.php
index 82e5ab7..23f50e6 100755
--- a/sources/themes/smartpocket/language/da_DK/theme.lang.php
+++ b/sources/themes/smartpocket/language/da_DK/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/de_DE/theme.lang.php b/sources/themes/smartpocket/language/de_DE/theme.lang.php
index d75e3ff..e7b8179 100755
--- a/sources/themes/smartpocket/language/de_DE/theme.lang.php
+++ b/sources/themes/smartpocket/language/de_DE/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -24,4 +24,4 @@ $lang['Autohide the bar of the slideshow'] = 'Diashow-Menüleiste automatisch au
 $lang['Loop the slideshow'] = 'Diashow in Endlosschleife';
 $lang['More Information'] = 'Mehr Informationen';
 $lang['Slideshow Options'] = 'Diashow-Optionen';
-$lang['Smartpocket, Configuration Page'] = 'Smartpocket, Konfigurationsseite';
\ No newline at end of file
+$lang['Smartpocket, Configuration Page'] = 'Smartpocket-Konfigurationsseite';
\ No newline at end of file
diff --git a/sources/themes/smartpocket/language/el_GR/theme.lang.php b/sources/themes/smartpocket/language/el_GR/theme.lang.php
index b201748..d2fc466 100755
--- a/sources/themes/smartpocket/language/el_GR/theme.lang.php
+++ b/sources/themes/smartpocket/language/el_GR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/en_UK/index.php b/sources/themes/smartpocket/language/en_UK/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/smartpocket/language/en_UK/index.php
+++ b/sources/themes/smartpocket/language/en_UK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/eo_EO/theme.lang.php b/sources/themes/smartpocket/language/eo_EO/theme.lang.php
index c2204af..f967ed8 100755
--- a/sources/themes/smartpocket/language/eo_EO/theme.lang.php
+++ b/sources/themes/smartpocket/language/eo_EO/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/es_ES/theme.lang.php b/sources/themes/smartpocket/language/es_ES/theme.lang.php
index f6f79cb..5afb60f 100755
--- a/sources/themes/smartpocket/language/es_ES/theme.lang.php
+++ b/sources/themes/smartpocket/language/es_ES/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/es_MX/theme.lang.php b/sources/themes/smartpocket/language/es_MX/theme.lang.php
index e192b6f..478e20f 100644
--- a/sources/themes/smartpocket/language/es_MX/theme.lang.php
+++ b/sources/themes/smartpocket/language/es_MX/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/et_EE/theme.lang.php b/sources/themes/smartpocket/language/et_EE/theme.lang.php
index 8643ee3..07e9096 100755
--- a/sources/themes/smartpocket/language/et_EE/theme.lang.php
+++ b/sources/themes/smartpocket/language/et_EE/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/fa_IR/theme.lang.php b/sources/themes/smartpocket/language/fa_IR/theme.lang.php
index afd0f7f..16a064a 100755
--- a/sources/themes/smartpocket/language/fa_IR/theme.lang.php
+++ b/sources/themes/smartpocket/language/fa_IR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/fi_FI/theme.lang.php b/sources/themes/smartpocket/language/fi_FI/theme.lang.php
index 2207bcb..8b26995 100755
--- a/sources/themes/smartpocket/language/fi_FI/theme.lang.php
+++ b/sources/themes/smartpocket/language/fi_FI/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/fr_CA/index.php b/sources/themes/smartpocket/language/fr_CA/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/smartpocket/language/fr_CA/index.php
+++ b/sources/themes/smartpocket/language/fr_CA/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/fr_FR/index.php b/sources/themes/smartpocket/language/fr_FR/index.php
index e336595..6a7aa65 100644
--- a/sources/themes/smartpocket/language/fr_FR/index.php
+++ b/sources/themes/smartpocket/language/fr_FR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/gl_ES/theme.lang.php b/sources/themes/smartpocket/language/gl_ES/theme.lang.php
index b789c91..6bd3bb1 100644
--- a/sources/themes/smartpocket/language/gl_ES/theme.lang.php
+++ b/sources/themes/smartpocket/language/gl_ES/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/he_IL/theme.lang.php b/sources/themes/smartpocket/language/he_IL/theme.lang.php
index 7cebc27..30741d8 100755
--- a/sources/themes/smartpocket/language/he_IL/theme.lang.php
+++ b/sources/themes/smartpocket/language/he_IL/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/hu_HU/theme.lang.php b/sources/themes/smartpocket/language/hu_HU/theme.lang.php
index f3d0b5b..00dc227 100755
--- a/sources/themes/smartpocket/language/hu_HU/theme.lang.php
+++ b/sources/themes/smartpocket/language/hu_HU/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/it_IT/theme.lang.php b/sources/themes/smartpocket/language/it_IT/theme.lang.php
index a369eff..2b26a49 100755
--- a/sources/themes/smartpocket/language/it_IT/theme.lang.php
+++ b/sources/themes/smartpocket/language/it_IT/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/ja_JP/theme.lang.php b/sources/themes/smartpocket/language/ja_JP/theme.lang.php
index 1e571ed..1b725e2 100644
--- a/sources/themes/smartpocket/language/ja_JP/theme.lang.php
+++ b/sources/themes/smartpocket/language/ja_JP/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/km_KH/theme.lang.php b/sources/themes/smartpocket/language/km_KH/theme.lang.php
index 157b310..fe71937 100755
--- a/sources/themes/smartpocket/language/km_KH/theme.lang.php
+++ b/sources/themes/smartpocket/language/km_KH/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/lt_LT/theme.lang.php b/sources/themes/smartpocket/language/lt_LT/theme.lang.php
index 3b3ac11..237cf38 100755
--- a/sources/themes/smartpocket/language/lt_LT/theme.lang.php
+++ b/sources/themes/smartpocket/language/lt_LT/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/lv_LV/theme.lang.php b/sources/themes/smartpocket/language/lv_LV/theme.lang.php
index 76d5838..3cc2e71 100755
--- a/sources/themes/smartpocket/language/lv_LV/theme.lang.php
+++ b/sources/themes/smartpocket/language/lv_LV/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/mn_MN/theme.lang.php b/sources/themes/smartpocket/language/mn_MN/theme.lang.php
index ab18ad3..2e0ce5b 100755
--- a/sources/themes/smartpocket/language/mn_MN/theme.lang.php
+++ b/sources/themes/smartpocket/language/mn_MN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/nb_NO/theme.lang.php b/sources/themes/smartpocket/language/nb_NO/theme.lang.php
index c392e97..b7b57da 100755
--- a/sources/themes/smartpocket/language/nb_NO/theme.lang.php
+++ b/sources/themes/smartpocket/language/nb_NO/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/nl_NL/theme.lang.php b/sources/themes/smartpocket/language/nl_NL/theme.lang.php
index 2e960f8..b8eab4d 100755
--- a/sources/themes/smartpocket/language/nl_NL/theme.lang.php
+++ b/sources/themes/smartpocket/language/nl_NL/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/nn_NO/theme.lang.php b/sources/themes/smartpocket/language/nn_NO/theme.lang.php
index b14cd43..5cab527 100755
--- a/sources/themes/smartpocket/language/nn_NO/theme.lang.php
+++ b/sources/themes/smartpocket/language/nn_NO/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/pl_PL/theme.lang.php b/sources/themes/smartpocket/language/pl_PL/theme.lang.php
index b30025b..4679e2c 100755
--- a/sources/themes/smartpocket/language/pl_PL/theme.lang.php
+++ b/sources/themes/smartpocket/language/pl_PL/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/pt_BR/theme.lang.php b/sources/themes/smartpocket/language/pt_BR/theme.lang.php
index e010e6c..ee394d2 100755
--- a/sources/themes/smartpocket/language/pt_BR/theme.lang.php
+++ b/sources/themes/smartpocket/language/pt_BR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/pt_PT/theme.lang.php b/sources/themes/smartpocket/language/pt_PT/theme.lang.php
index 32ff04e..cce8569 100755
--- a/sources/themes/smartpocket/language/pt_PT/theme.lang.php
+++ b/sources/themes/smartpocket/language/pt_PT/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/ro_RO/theme.lang.php b/sources/themes/smartpocket/language/ro_RO/theme.lang.php
index 8aaed40..20d21c1 100755
--- a/sources/themes/smartpocket/language/ro_RO/theme.lang.php
+++ b/sources/themes/smartpocket/language/ro_RO/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/ru_RU/theme.lang.php b/sources/themes/smartpocket/language/ru_RU/theme.lang.php
index 41c4b84..c786e8a 100755
--- a/sources/themes/smartpocket/language/ru_RU/theme.lang.php
+++ b/sources/themes/smartpocket/language/ru_RU/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/sh_RS/theme.lang.php b/sources/themes/smartpocket/language/sh_RS/theme.lang.php
index 50e8fed..6dff6c0 100755
--- a/sources/themes/smartpocket/language/sh_RS/theme.lang.php
+++ b/sources/themes/smartpocket/language/sh_RS/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/sk_SK/theme.lang.php b/sources/themes/smartpocket/language/sk_SK/theme.lang.php
index 2c6fa59..f799d98 100755
--- a/sources/themes/smartpocket/language/sk_SK/theme.lang.php
+++ b/sources/themes/smartpocket/language/sk_SK/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/sl_SI/theme.lang.php b/sources/themes/smartpocket/language/sl_SI/theme.lang.php
index 23ea35c..847c35f 100755
--- a/sources/themes/smartpocket/language/sl_SI/theme.lang.php
+++ b/sources/themes/smartpocket/language/sl_SI/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/sr_RS/theme.lang.php b/sources/themes/smartpocket/language/sr_RS/theme.lang.php
index 73cd8b0..e1ef12c 100755
--- a/sources/themes/smartpocket/language/sr_RS/theme.lang.php
+++ b/sources/themes/smartpocket/language/sr_RS/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/sv_SE/theme.lang.php b/sources/themes/smartpocket/language/sv_SE/theme.lang.php
index 1f10442..45c1183 100755
--- a/sources/themes/smartpocket/language/sv_SE/theme.lang.php
+++ b/sources/themes/smartpocket/language/sv_SE/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/ta_IN/theme.lang.php b/sources/themes/smartpocket/language/ta_IN/theme.lang.php
index 4dd0452..688db3e 100755
--- a/sources/themes/smartpocket/language/ta_IN/theme.lang.php
+++ b/sources/themes/smartpocket/language/ta_IN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/th_TH/theme.lang.php b/sources/themes/smartpocket/language/th_TH/theme.lang.php
index fc778de..0c663dc 100644
--- a/sources/themes/smartpocket/language/th_TH/theme.lang.php
+++ b/sources/themes/smartpocket/language/th_TH/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/tr_TR/theme.lang.php b/sources/themes/smartpocket/language/tr_TR/theme.lang.php
index 1760975..106bba0 100755
--- a/sources/themes/smartpocket/language/tr_TR/theme.lang.php
+++ b/sources/themes/smartpocket/language/tr_TR/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/uk_UA/theme.lang.php b/sources/themes/smartpocket/language/uk_UA/theme.lang.php
index c1a4ac9..e859505 100755
--- a/sources/themes/smartpocket/language/uk_UA/theme.lang.php
+++ b/sources/themes/smartpocket/language/uk_UA/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/vi_VN/theme.lang.php b/sources/themes/smartpocket/language/vi_VN/theme.lang.php
index c7517ff..0e1ca01 100755
--- a/sources/themes/smartpocket/language/vi_VN/theme.lang.php
+++ b/sources/themes/smartpocket/language/vi_VN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/zh_CN/theme.lang.php b/sources/themes/smartpocket/language/zh_CN/theme.lang.php
index 38e6175..1fd2881 100755
--- a/sources/themes/smartpocket/language/zh_CN/theme.lang.php
+++ b/sources/themes/smartpocket/language/zh_CN/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/zh_HK/theme.lang.php b/sources/themes/smartpocket/language/zh_HK/theme.lang.php
index 954457a..14c599a 100755
--- a/sources/themes/smartpocket/language/zh_HK/theme.lang.php
+++ b/sources/themes/smartpocket/language/zh_HK/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/language/zh_TW/theme.lang.php b/sources/themes/smartpocket/language/zh_TW/theme.lang.php
index f5cad27..5a4b38e 100755
--- a/sources/themes/smartpocket/language/zh_TW/theme.lang.php
+++ b/sources/themes/smartpocket/language/zh_TW/theme.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/themes/smartpocket/template/identification.tpl b/sources/themes/smartpocket/template/identification.tpl
index 33d0115..cf29190 100644
--- a/sources/themes/smartpocket/template/identification.tpl
+++ b/sources/themes/smartpocket/template/identification.tpl
@@ -28,14 +28,14 @@
 
 </form>
 
-	<div data-role="fieldcontain">
-{if isset($U_REGISTER)}
-		<a href="{$U_REGISTER}" data-role="button">{'Register'|@translate}</a>
-{/if}
-{*
+	<div data-role="fieldcontain" style="margin-top:2em">
 {if isset($U_LOST_PASSWORD)}
 		<a href="{$U_LOST_PASSWORD}" data-role="button">{'Forgot your password?'|@translate}</a>
 {/if}
-*}
+
+{if isset($U_REGISTER)}
+		<a href="{$U_REGISTER}" data-role="button">{'Register'|@translate}</a>
+{/if}
+
 	</div>
 </div>
diff --git a/sources/themes/smartpocket/template/password.tpl b/sources/themes/smartpocket/template/password.tpl
new file mode 100644
index 0000000..a45ef81
--- /dev/null
+++ b/sources/themes/smartpocket/template/password.tpl
@@ -0,0 +1,27 @@
+{include file='infos_errors.tpl'}
+<div data-role="content">
+<h3>{'Forgot your password?'|translate}</h3>
+{if $action ne 'none'}
+<form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post">
+  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
+
+  {if $action eq 'lost'}
+  <div data-role="fieldcontain">
+  <label for="username">{'Username or email'|@translate}</label>
+  <input type="text" id="username_or_email" name="username_or_email" size="40" maxlength="40"{if isset($username_or_email)} value="{$username_or_email}"{/if}>
+  <input type="submit" name="submit" value="{'Change my password'|@translate}">
+  </div>
+
+  {elseif $action eq 'reset'}
+  <div data-role="fieldcontain">
+  <label for="password">{'New password'|@translate}</label>
+   <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
+  <label for="passwordConf">{'Confirm Password'|@translate}</label>
+  <input type="password" name="passwordConf" id="passwordConf" value="">
+  <input type="submit" name="submit" value="{'Submit'|@translate}">
+  </div>
+  {/if}
+
+</form>
+{/if} {* $action ne 'none' *}
+</div>
diff --git a/sources/themes/smartpocket/template/search.tpl b/sources/themes/smartpocket/template/search.tpl
index 7c648ab..33c3eab 100644
--- a/sources/themes/smartpocket/template/search.tpl
+++ b/sources/themes/smartpocket/template/search.tpl
@@ -1,3 +1,28 @@
+{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
+{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
+
+{footer_script}
+jQuery(document).ready(function() {
+  jQuery("#authors, #tags, #categories").each(function() {
+    jQuery(this).selectize({
+      plugins: ['remove_button'],
+      maxOptions:jQuery(this).find("option").length
+    });
+  })
+});
+{/footer_script}
+
+{html_style}
+.ui-checkbox, .ui-radio, .ui-btn-text {
+  z-index:0;
+}
+
+.form-actions {
+  margin-top:3em;
+  margin-bottom:3em;
+}
+{/html_style}
+
 {include file='infos_errors.tpl'}
 <div data-role="content">
   <ul data-role="listview" data-inset="true">
@@ -6,56 +31,78 @@
 
 
 <form class="filter" method="post" name="search" action="{$F_SEARCH_ACTION}">
-<fieldset data-role="controlgroup">
-  <legend>{'Filter'|@translate}</legend>
-  <div data-role="fieldcontain">
-    <label for="search_allwords">{'Search for words'|@translate}</label>
-    <input type="text" id="search_allwords" style="width: 300px" name="search_allwords" size="30">
-  </div>
-  
-  <input type="radio" name="mode" id="mode_and" value="AND" checked="checked">
-  <label for="mode_and">{'Search for all terms'|@translate}</label>
-  <input type="radio" name="mode" id="mode_or" value="OR">
-  <label for="mode_or">{'Search for any term'|@translate}</label>
-  <div data-role="fieldcontain">
-    <label for="search_author">{'Search for Author'|@translate}</label>
-    <input type="text" style="width: 300px" name="search_author" id="search_author" size="30">
-  </div>
-</fieldset>
+  <fieldset data-role="controlgroup">
+    <legend>{'Search for words'|@translate}</legend>
 
-{if isset($TAG_SELECTION)}
+    <input type="text" name="search_allwords">
+
+    <input type="radio" name="mode" id="mode_and" value="AND" checked="checked">
+    <label for="mode_and">{'Search for all terms'|@translate}</label>
+
+    <input type="radio" name="mode" id="mode_or" value="OR">
+    <label for="mode_or">{'Search for any term'|@translate}</label>
+  </fieldset>
+
+  <fieldset data-role="controlgroup">
+  <legend>{'Apply on properties'|translate}</legend>
+
+    <input type="checkbox" name="fields[]" value="name" checked="checked" id="field-name">
+    <label for="field-name">{'Photo title'|translate}</label>
+
+    <input type="checkbox" name="fields[]" value="comment" checked="checked" id="field-comment">
+    <label for="field-comment">{'Photo description'|translate}</label>
+
+    <input type="checkbox" name="fields[]" value="file" checked="checked" id="field-file">
+    <label for="field-file">{'File name'|translate}</label>
+
+{if isset($TAGS)}
+    <input type="checkbox" name="search_in_tags" value="tags" id="field-tags">
+    <label for="field-tags">{'Tags'|translate}</label>
+{/if}
+  </fieldset>
+
+{if count($AUTHORS)>=1}
+<fieldset  data-role="controlgroup">
+  <legend>{'Search for Author'|@translate}</legend>
+  <select id="authors" placeholder="{'Type in a search term'|translate}" name="authors[]" multiple>
+{foreach from=$AUTHORS item=author}
+    <option value="{$author.author|strip_tags:false|escape:html}">{$author.author|strip_tags:false} ({$author.counter|translate_dec:'%d photo':'%d photos'})</option>
+{/foreach}
+  </select>
+</fieldset>
+{/if}
+
+{if isset($TAGS)}
 <fieldset data-role="controlgroup">
   <legend>{'Search tags'|@translate}</legend>
-  {$TAG_SELECTION}
-</fieldset>
-
-<fieldset data-role="controlgroup">
+  <select id="tags" placeholder="{'Type in a search term'|translate}" name="tags[]" multiple>
+{foreach from=$TAGS item=tag}
+    <option value="{$tag.id}">{$tag.name} ({$tag.counter|translate_dec:'%d photo':'%d photos'})</option>
+{/foreach}
+  </select>
   <input type="radio" name="tag_mode" id="tag_mode_and" value="AND" checked="checked">
   <label for="tag_mode_and">{'All tags'|@translate}</label>
+
   <input type="radio" name="tag_mode" id="tag_mode_or" value="OR">
   <label for="tag_mode_or">{'Any tag'|@translate}</label>
 </fieldset>
 {/if}
 
-<div data-role="fieldcontain">
+<fieldset data-role="controlgroup">
   <legend>{'Search in albums'|@translate}</legend>
-  <label for="categoryList">{'Albums'|@translate}
-    <select class="categoryList" id="categoryList" name="cat[]" multiple="multiple" data-native-menu="false">
-      {html_options options=$category_options selected=$category_options_selected}
-    </select>
-  </label>
-  <fieldset data-role="controlgroup">
-  <legend>{'Search in sub-albums'|@translate}</legend>
-    <input type="radio" name="subcats-included" value="1" id="subcats-included-yes" checked="checked">
-    <label for="subcats-included-yes">{'Yes'|@translate}</label>
-    <input type="radio" name="subcats-included" id="subcats-included-no" value="0">
-    <label for="subcats-included-no">{'No'|@translate}</label>
-  </fieldset>
-</div>
-<p>
-  <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
-  <input class="submit" type="reset" value="{'Reset'|@translate}">
-</p>
+  <select id="categories" placeholder="{'Type in a search term'|translate}" name="cat[]" multiple>
+    {html_options options=$category_options selected=$category_options_selected}
+  </select>
+
+  <input type="checkbox" name="subcats-included" value="1" checked="checked" id="subcats-included">
+  <label for="subcats-included">{'Search in sub-albums'|@translate}</label>
+</fieldset>
+
+
+  <div class="form-actions">
+    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
+  </div>
+
 </form>
 
 <script type="text/javascript"><!--
diff --git a/sources/themes/smartpocket/themeconf.inc.php b/sources/themes/smartpocket/themeconf.inc.php
index 83ffd50..1c1737e 100644
--- a/sources/themes/smartpocket/themeconf.inc.php
+++ b/sources/themes/smartpocket/themeconf.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Theme Name: Smart Pocket
-Version: 2.7.2
+Version: 2.8.2
 Description: Mobile theme.
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=599
 Author: P@t
@@ -109,7 +109,7 @@ add_event_handler('init', 'mobile_link');
 function mobile_link()
 {
   global $template, $conf;
-  $config = unserialize( $conf['smartpocket'] );
+  $config = safe_unserialize( $conf['smartpocket'] );
   $template->assign( 'smartpocket', $config );
   if ( !empty($conf['mobile_theme']) && (get_device() != 'desktop' || mobile_theme()))
   {
diff --git a/sources/tools/index.php b/sources/tools/index.php
index c8de97f..0b96c3e 100644
--- a/sources/tools/index.php
+++ b/sources/tools/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/tools/metadata.php b/sources/tools/metadata.php
index c0b390f..17d6967 100644
--- a/sources/tools/metadata.php
+++ b/sources/tools/metadata.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/tools/piwigo_upload.pl b/sources/tools/piwigo_upload.pl
new file mode 100644
index 0000000..bc167d7
--- /dev/null
+++ b/sources/tools/piwigo_upload.pl
@@ -0,0 +1,121 @@
+#!/usr/bin/perl
+
+####
+# Usage
+#
+# perl piwigo_upload.pl --url=http://piwigo.org/demo --user=admin --password=secret --file=photo.jpg --album_id=9
+
+use strict;
+use warnings;
+
+use JSON;
+use LWP::UserAgent;
+use Getopt::Long;
+use POSIX qw(ceil floor);
+use Digest::MD5 qw/md5 md5_hex/;
+use File::Slurp;
+use File::Basename;
+
+my %opt = ();
+GetOptions(
+    \%opt,
+    qw/
+          file=s
+          album_id=i
+          category=s
+          url=s
+          username=s
+          password=s
+      /
+);
+
+our %conf = (
+    chunk_size => 500_000,
+);
+
+our $ua = LWP::UserAgent->new;
+$ua->agent('Mozilla/piwigo_upload.pl 1.56');
+$ua->cookie_jar({});
+
+my $result = undef;
+
+my $form = {
+    method => 'pwg.session.login',
+    username => $opt{username},
+    password => $opt{password},
+};
+
+$result = $ua->post(
+    $opt{url}.'/ws.php?format=json',
+    $form
+);
+
+my $response = $ua->post(
+    $opt{url}.'/ws.php?format=json',
+    {
+        method => 'pwg.session.getStatus',
+    }
+);
+
+my $pwg_token = from_json($response->content)->{result}->{pwg_token};
+
+my $content = read_file($opt{file});
+my $content_length = length($content);
+my $nb_chunks = ceil($content_length / $conf{chunk_size});
+
+my $chunk_pos = 0;
+my $chunk_id = 0;
+
+while ($chunk_pos < $content_length) {
+    my $chunk = substr(
+        $content,
+        $chunk_pos,
+        $conf{chunk_size}
+    );
+
+    # write the chunk as a temporary local file
+    my $chunk_path = '/tmp/'.md5_hex($opt{file}).'.chunk';
+
+    open(my $ofh, '>'.$chunk_path) or die "problem for writing temporary local chunk";
+    print {$ofh} $chunk;
+    close($ofh);
+
+    $chunk_pos += $conf{chunk_size};
+
+    my $response = $ua->post(
+        $opt{url}.'/ws.php?format=json',
+        {
+            method => 'pwg.images.upload',
+            chunk => $chunk_id,
+            chunks => $nb_chunks,
+            category => $opt{album_id},
+            pwg_token => $pwg_token,
+            file => [$chunk_path],
+            name => basename($opt{file}),
+        },
+        'Content_Type' => 'form-data',
+    );
+
+    unlink($chunk_path);
+
+    printf(
+        'chunk %03u of %03u for "%s"'."\n",
+        $chunk_id+1,
+        $nb_chunks,
+        $opt{file}
+    );
+
+    if ($response->code != 200) {
+        printf("response code    : %u\n", $response->code);
+        printf("response message : %s\n", $response->message);
+    }
+
+    $chunk_id++;
+}
+
+$result = $ua->get(
+    $opt{url}.'/ws.php?format=json',
+    {
+        method => 'pwg.session.logout'
+    }
+);
diff --git a/sources/tools/pwg_rel_create.sh b/sources/tools/pwg_rel_create.sh
index 57a9f1c..c3cf7d0 100755
--- a/sources/tools/pwg_rel_create.sh
+++ b/sources/tools/pwg_rel_create.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+scriptdir=$(dirname $(readlink -e $0))
+
 # +--------------------------------------------------------------------------+
 # |                            pwg_rel_create.sh                             |
 # +--------------------------------------------------------------------------+
@@ -7,16 +9,17 @@
 # | project       : Piwigo                                                   |
 # +--------------------------------------------------------------------------+
 
-if [ $# -lt 2 ]
+if [ $# -lt 1 ]
 then
   echo
-  echo 'usage : '$(basename $0)' <tag> <version number>'
+  echo 'usage : '$(basename $0)' <version number> [<sha>]'
   echo
   exit 1
 fi
 
-tag=$1
-version=$2
+version=$1
+
+sha=$2
 
 name=piwigo-$version
 
@@ -29,20 +32,93 @@ fi
 mkdir $version
 cd $version
 
-svn export http://piwigo.org/svn/tags/$tag piwigo
+git clone https://github.com/Piwigo/Piwigo.git piwigo
+cd piwigo
 
+if [ $# -eq 2 ]
+then
+  git checkout $2
+fi
 
+# remove Git metadata
+rm -rf /tmp/$version/piwigo/.git
+
+# +--------------------------------------------------------------------------+
+# | plugins                                                                  |
+# +--------------------------------------------------------------------------+
+
+cd plugins
+
+for plugin in TakeATour AdminTools LocalFilesEditor LanguageSwitch
+do
+  cd /tmp/$version/piwigo/plugins
+
+  plugin_dir=$plugin
+  if [ $plugin = "LanguageSwitch" ]
+  then
+    plugin_dir=language_switch
+  fi
+
+  # clone repo
+  git clone https://github.com/Piwigo/${plugin}.git $plugin_dir
+  cd /tmp/$version/piwigo/plugins/$plugin_dir
+
+  # change version
+  perl $scriptdir/replace_version.pl --file=main.inc.php --version=$version
+
+  # register metadata in dedicated file
+  echo https://github.com/Piwigo/${plugin}.git > pem_metadata.txt
+  git log -n 1 --pretty=format:"%H %ad" --date=iso8601 >> pem_metadata.txt
+
+  # remove Git metadata
+  rm -rf .git
+done
+
+# +--------------------------------------------------------------------------+
+# | themes                                                                   |
+# +--------------------------------------------------------------------------+
+
+cd /tmp/$version/piwigo/themes
+for themefile in $(ls */themeconf.inc.php)
+do
+  # change version
+  perl $scriptdir/replace_version.pl --file=$themefile --version=$version
+done
+
+# +--------------------------------------------------------------------------+
+# | languages                                                                |
+# +--------------------------------------------------------------------------+
+
+cd /tmp/$version/piwigo/language
+for languagefile in $(ls */common.lang.php)
+do
+  # change version
+  perl $scriptdir/replace_version.pl --file=$languagefile --version=$version
+done
+
+# +--------------------------------------------------------------------------+
+# | data directories + zip 1                                                 |
+# +--------------------------------------------------------------------------+
+
+# create "data" directories
+cd /tmp/$version
+
+mkdir piwigo/upload
 mkdir piwigo/_data
 touch piwigo/_data/dummy.txt
 
-mkdir piwigo/upload
+zip -q -r $name-nochmod.zip piwigo
 
-zip -r $name-nochmod.zip piwigo
+# +--------------------------------------------------------------------------+
+# | permissions + zip 2                                                      |
+# +--------------------------------------------------------------------------+
 
 chmod -R a+w piwigo/local
 chmod a+w piwigo/_data
 chmod a+w piwigo/upload
+chmod a+w piwigo/plugins
+chmod a+w piwigo/themes
 
-zip -r $name.zip piwigo
+zip -q -r $name.zip piwigo
 
 echo cd /tmp/$version
diff --git a/sources/tools/replace_version.pl b/sources/tools/replace_version.pl
new file mode 100644
index 0000000..845948d
--- /dev/null
+++ b/sources/tools/replace_version.pl
@@ -0,0 +1,39 @@
+#!/usr/bin/perl
+
+####
+# Usage
+#
+# perl replace_version.pl --file=/path/to/file.php --version=2.8.0
+
+use strict;
+use warnings;
+
+use Getopt::Long;
+use File::Basename;
+
+my %opt = ();
+GetOptions(
+    \%opt,
+    qw/
+          file=s
+          version=s
+      /
+);
+
+if (not -e $opt{file}) {
+    die "file missing ".$opt{file};
+}
+
+my $new_content = '';
+open(my $ifh, '<'.$opt{file}) or die 'Houston, problem with "'.$opt{file}.'" for reading';
+while (<$ifh>) {
+    if (/^Version:/) {
+        $_ = 'Version: '.$opt{version}.''."\n";
+    }
+    $new_content.= $_;
+}
+close($ifh);
+
+open(my $ofh, '>'.$opt{file}) or die 'Houston, problem with "'.$opt{file}.'" for writing';
+print {$ofh} $new_content;
+close($ofh);
diff --git a/sources/tools/translation_analysis.php b/sources/tools/translation_analysis.php
index 3fb120d..a80d6e8 100644
--- a/sources/tools/translation_analysis.php
+++ b/sources/tools/translation_analysis.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/tools/triggers_list.php b/sources/tools/triggers_list.php
index fda1709..4596ba8 100644
--- a/sources/tools/triggers_list.php
+++ b/sources/tools/triggers_list.php
@@ -912,8 +912,8 @@ array(
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>Piwigo Core Triggers</title>
   
-  <link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css">
-  <link rel="stylesheet" type="text/css" href="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/css/jquery.dataTables_themeroller.css">
+  <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css">
+  <link rel="stylesheet" type="text/css" href="//ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/css/jquery.dataTables_themeroller.css">
   
   <style type="text/css">
   /* BEGIN CSS RESET
@@ -1020,12 +1020,12 @@ array(
 </div> <!-- the_page -->
 
 <div id="the_footer">
-  Copyright &copy; 2002-2013 <a href="http://piwigo.org">Piwigo Team</a>
+  Copyright &copy; 2002-2016 <a href="http://piwigo.org">Piwigo Team</a>
 </div> <!-- the_footer -->
 
 
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="//code.jquery.com/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.min.js"></script>
   
 <script type="text/javascript">
 var oTable = $('#list').dataTable({
diff --git a/sources/tools/ws.htm b/sources/tools/ws.htm
index 22af3d8..a97d169 100644
--- a/sources/tools/ws.htm
+++ b/sources/tools/ws.htm
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>Piwigo web API (web-services) explorer</title>
 
-  <link rel="stylesheet" href="http://cdn.jsdelivr.net/tiptip/1.3/tipTip.css">
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/tiptip/1.3/tipTip.css">
 
   <style>
   /* BEGIN CSS RESET
@@ -242,11 +242,11 @@
 </div> <!-- the_page -->
 
 <div id="the_footer">
-  Copyright &copy; 2002-2013 <a href="http://piwigo.org">Piwigo Team</a>
+  Copyright &copy; 2002-2016 <a href="http://piwigo.org">Piwigo Team</a>
 </div> <!-- the_footer -->
 
-<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
-<script src="https://cdn.jsdelivr.net/tiptip/1.3/jquery.tipTip.minified.js"></script>
+<script src="//code.jquery.com/jquery-1.9.1.min.js"></script>
+<script src="//cdn.jsdelivr.net/tiptip/1.3/jquery.tipTip.minified.js"></script>
 
 <script>
 // global vars
@@ -571,4 +571,4 @@ function invokeMethod(methodName, newWindow) {
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/sources/upgrade.php b/sources/upgrade.php
index b9b1385..11b745b 100644
--- a/sources/upgrade.php
+++ b/sources/upgrade.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -50,6 +50,7 @@ define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db');
 
 include_once(PHPWG_ROOT_PATH.'include/functions.inc.php');
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH . 'include/template.class.php');
 
 // +-----------------------------------------------------------------------+
 // |                              functions                                |
@@ -341,6 +342,10 @@ else if (!in_array('nb_available_tags', $columns_of[PREFIX_TABLE.'user_cache']))
 {
   $current_release = '2.5.0';
 }
+else if (!in_array('activation_key_expire', $columns_of[PREFIX_TABLE.'user_infos']))
+{
+  $current_release = '2.6.0';
+}
 else
 {
   // retrieve already applied upgrades
@@ -350,9 +355,9 @@ SELECT id
 ;';
   $applied_upgrades = array_from_query($query, 'id');
 
-  if (!in_array(144, $applied_upgrades))
+  if (!in_array(148, $applied_upgrades))
   {
-    $current_release = '2.6.0';
+    $current_release = '2.7.0';
   }
   else
   {
@@ -475,7 +480,8 @@ REPLACE INTO '.PLUGINS_TABLE.'
         
         $template->assign(
           array(
-            'button_label' => l10n('2_7_0_descrp'), // TODO avoid to update it on each release
+            // TODO find a better way to do that, with a core string in English
+            'button_label' => str_replace('2.7', get_branch_from_version(PHPWG_VERSION), l10n('2_7_0_descrp')),
             'button_link' => 'admin.php?submited_tour_path=tours/'.$version_.'&amp;pwg_token='.get_pwg_token(),
             )
           );
@@ -486,9 +492,6 @@ REPLACE INTO '.PLUGINS_TABLE.'
     invalidate_user_cache(true);
     $template->delete_compiled_templates();
 
-    // Tables Maintenance
-    do_maintenance_all_tables();
-
     // Restore $page['infos'] in order to hide informations messages from functions calles
     // errors messages are not hide
     $page['infos'] = $page['infos_sav'];
diff --git a/sources/upgrade_feed.php b/sources/upgrade_feed.php
index 77e2aea..2e30bfd 100644
--- a/sources/upgrade_feed.php
+++ b/sources/upgrade_feed.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/ws.php b/sources/ws.php
index 5e45001..6a2bd21 100644
--- a/sources/ws.php
+++ b/sources/ws.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -193,6 +193,10 @@ function ws_addDefaultMethods( $arr )
                                 'type'=>WS_TYPE_BOOL),
         'fullname' =>     array('default'=>false,
                                 'type'=>WS_TYPE_BOOL),
+        'thumbnail_size' => array(
+          'default' => IMG_THUMB,
+          'info' => 'square, thumb, 2small, xsmall, small, medium, large, xlarge, xxlarge'
+          ),
         ),
       'Returns a list of categories.',
       $ws_functions_root . 'pwg.categories.php'
@@ -293,11 +297,16 @@ function ws_addDefaultMethods( $arr )
       'pwg.images.setRank',
       'ws_images_setRank',
       array(
-        'image_id'    => array('type'=>WS_TYPE_ID),
+        'image_id'    => array('type'=>WS_TYPE_ID,'flags'=>WS_PARAM_FORCE_ARRAY),
         'category_id' => array('type'=>WS_TYPE_ID),
-        'rank'        => array('type'=>WS_TYPE_INT|WS_TYPE_POSITIVE|WS_TYPE_NOTNULL)
+        'rank'        => array('type'=>WS_TYPE_INT|WS_TYPE_POSITIVE|WS_TYPE_NOTNULL, 'default'=>null)
         ),
-      'Sets the rank of a photo for a given album.',
+      'Sets the rank of a photo for a given album.
+<br><br>If you provide a list for image_id:
+<ul>
+<li>rank becomes useless, only the order of the image_id list matters</li>
+<li>you are supposed to provide the list of all image_ids belonging to the album.
+</ul>',
       $ws_functions_root . 'pwg.images.php',
       array('admin_only'=>true, 'post_only'=>true)
     );
@@ -570,6 +579,28 @@ function ws_addDefaultMethods( $arr )
       $ws_functions_root . 'pwg.categories.php',
       array('admin_only'=>true, 'post_only'=>true)
     );
+  
+  $service->addMethod(
+      'pwg.categories.deleteRepresentative',
+      'ws_categories_deleteRepresentative',
+      array(
+        'category_id' =>  array('type'=>WS_TYPE_ID),
+        ),
+      'Deletes the album thumbnail. Only possible if $conf[\'allow_random_representative\']',
+      $ws_functions_root . 'pwg.categories.php',
+      array('admin_only'=>true, 'post_only'=>true)
+    );
+
+  $service->addMethod(
+      'pwg.categories.refreshRepresentative',
+      'ws_categories_refreshRepresentative',
+      array(
+        'category_id' =>  array('type'=>WS_TYPE_ID),
+        ),
+      'Find a new album thumbnail.',
+      $ws_functions_root . 'pwg.categories.php',
+      array('admin_only'=>true, 'post_only'=>true)
+    );
 
   $service->addMethod(
       'pwg.tags.getAdminList',
@@ -661,6 +692,8 @@ function ws_addDefaultMethods( $arr )
         'category_id' =>  array('type'=>WS_TYPE_ID),
         'name' =>         array('default'=>null),
         'comment' =>      array('default'=>null),
+        'status' =>       array('default'=>null,
+                                'info'=>'public, private'),
         ),
       'Changes properties of an album.',
       $ws_functions_root . 'pwg.categories.php',