diff -Naur gallery-1.5.3/add_comment.php gallery-1.5.4/add_comment.php --- gallery-1.5.3/add_comment.php 2006-04-06 13:49:10.000000000 +0200 +++ gallery-1.5.4/add_comment.php 2006-04-06 13:49:10.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_comment.php,v 1.57.2.2 2006/04/06 11:49:10 jenst Exp $ + * $Id: add_comment.php 13409 2006-04-06 11:49:10Z jenst $ */ ?> Refresh diff -Naur gallery-1.5.3/administer_startpage.php gallery-1.5.4/administer_startpage.php --- gallery-1.5.3/administer_startpage.php 2006-03-27 17:31:24.000000000 +0200 +++ gallery-1.5.4/administer_startpage.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: administer_startpage.php,v 1.5.2.1 2006/03/27 15:31:24 jenst Exp $ + * $Id: administer_startpage.php 13338 2006-03-27 15:32:14Z jenst $ * */ ?> diff -Naur gallery-1.5.3/admin-page.php gallery-1.5.4/admin-page.php --- gallery-1.5.3/admin-page.php 2006-03-27 17:31:24.000000000 +0200 +++ gallery-1.5.4/admin-page.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: admin-page.php,v 1.18.2.1 2006/03/27 15:31:24 jenst Exp $ + * $Id: admin-page.php 13338 2006-03-27 15:32:14Z jenst $ * */ ?> diff -Naur gallery-1.5.3/album_permissions.php gallery-1.5.4/album_permissions.php --- gallery-1.5.3/album_permissions.php 2006-03-27 17:31:24.000000000 +0200 +++ gallery-1.5.4/album_permissions.php 2006-04-11 00:19:30.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: album_permissions.php,v 1.63.2.1 2006/03/27 15:31:24 jenst Exp $ + * $Id: album_permissions.php 13433 2006-04-10 22:19:30Z jenst $ */ ?> $action) { if(isset($action) && isset($actionUid)) { + $action = unhtmlentities($action); if($action == '-->') { $gallery->album->setPerm($perm, $actionUid, true); $changed++; diff -Naur gallery-1.5.3/albums.php gallery-1.5.4/albums.php --- gallery-1.5.3/albums.php 2006-04-05 00:13:34.000000000 +0200 +++ gallery-1.5.4/albums.php 2006-04-05 00:13:34.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: albums.php,v 1.218.2.2 2006/04/04 22:13:34 jenst Exp $ + * $Id: albums.php 13362 2006-04-04 22:13:34Z jenst $ */ ?> + + *** Re-Release 1.5.4 *** + + * Forgot tools folder. + + * Fixed very litle bug sneaked in b15. + +2006-08-14 Jens Tkotz + + *** Release: 1.5.4 *** + + +2006-08-14 Jens Tkotz 1.5.4-svn-b17 + + * Fix: #1444556; + +2006-08-14 Jens Tkotz 1.5.4-svn-b16 + + * Change: _() to gTranslate at various places. + +2006-08-14 Jens Tkotz 1.5.4-svn-b15 + + * Change: Use non-table tabs from 1.6 + + * HTML fixes in setup/config_data.inc + + * Adjustments in skins: hotred, yellow, jenskin, white1 + + * Some indenting. + + * if galleryLink as empty target, dont use href= + +2006-08-13 Jens Tkotz 1.5.4-svn-b14 + + * Change: Removed "No Votes messages". + + * Change: Show link to full results only if there are results. + +2006-08-13 Jens Tkotz 1.5.4-svn-b13 + + * Fix: Links in voting box were wrong. + + * CSS changes in view_album.php + + * Jensskin updates. + +2006-08-02 Jens Tkotz 1.5.4-svn-b12 + + * Fix: JS warning in ImageMap when no ImageMap is available. + Thanks to StephaneT from forums. + + * Little CSS changes in jenskin. + +2006-07-29 Jens Tkotz 1.5.4-svn-b11 + + * Fix: Order of captions was mixed in IE and Opera when given direct in the form. + Fixed by using this.nextSibling in insertBefore() + +2006-07-21 Jens Tkotz 1.5.4-svn-b10 + + * Fix: drawSelect in slideshow misbehaved and selected the wrong transition. + +2006-07-12 Jens Tkotz 1.5.4-svn-b9 + + * Fix: Little warning in configwizard ; occured in first install. + +2006-06-19 Jens Tkotz 1.5.4-svn-b8 + + * Fix: init_language() is not called redundant in init.php + + * Change: When user updates his language, the parent page is reloaded with the new language. + +2006-06-19 Jens Tkotz 1.5.4-svn-b7 + + * PHP5 fix: + In classes/Mail/htmlMimeMail.php and do_command.php was $HTTP_SERVER_VARS used, + which is not longer present in PHP5 + + * Fix: Correct use of $MIN_PHP_MAJOR_VERSION in lib/setup.php + + * SVN-Fix: + Date of last change in Version.php was wrong extracted. + +2006-05-10 Jens Tkotz 1.5.4-svn-b6 + + * Added php-gettext + https://savannah.nongnu.org/projects/php-gettext/ + +2006-05-02 Jens Tkotz 1.5.4-svn-b5 + + * Updated and/or added $Id SVN Keywords. + +2006-04-26 Jens Tkotz 1.5.4-svn-b4 + + * Fix: Often bots access the ecardform without having correct photo loaded etc. + This leaves unnecessary Errormessage in Apaches logfile + + Thanks to Peter Schumacher from forums. + + * Fix: Only do userinput sanitation if value contains html tags. + + * FIX: Compressing an Image with having maximum filesize failed. + Thanks to Scott Barnes (atomsmith) from forums. + + * FIX: Just compressing(no resize) an Image with NetPBM failed. + + * Changing Checks in setup to SVN. + +2006-04-22 Jens Tkotz 1.5.4-cvs-b3 + + * Fix: Name of not logged in commenters was displayed as "anonymous" instead of entered name. + Thanks to Mottie from forum. + +2006-04-13 Jens Tkotz 1.5.4-cvs-b2 + + * Fix: Gallery uses the same XML_HTMLSax3 library as postNuke does. + Thus a redeclare error occured. + Thanks to Christian Ruffer. + +2006-04-11 Jens Tkotz 1.5.4-cvs-b1 + + * Fix: Album Permissions were not working proper. + Thanks to Jonathan Stanley (SHS` in IRC) + 2006-04-06 Chris Kelly 1.5.3 * Release: 1.5.3 diff -Naur gallery-1.5.3/classes/AlbumDB.php gallery-1.5.4/classes/AlbumDB.php --- gallery-1.5.3/classes/AlbumDB.php 2006-03-27 17:31:26.000000000 +0200 +++ gallery-1.5.4/classes/AlbumDB.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: AlbumDB.php,v 1.47.2.1 2006/03/27 15:31:26 jenst Exp $ + * $Id: AlbumDB.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> = 1 && $index <= sizeof($this->photos)) { - return $this->photos[$index-1]; - } else { - echo gallery_error(sprintf(_("Requested index [%d] out of bounds [%d]"),$index,sizeof($this->photos))); + $photo = & $this->photos[$index-1]; } + else { + $errortext = sprintf( + gTranslate('core',"Requested index [%d] out of bounds [%d]. Gallery could not load the requested album item."), + $index, + sizeof($this->photos) + ); + echo debugMessage($errortext, __FILE__, __LINE__); + $photo = false; + } + + return $photo; } function getPhotoIndex($id) { diff -Naur gallery-1.5.3/classes/Comment.php gallery-1.5.4/classes/Comment.php --- gallery-1.5.3/classes/Comment.php 2006-03-27 17:31:26.000000000 +0200 +++ gallery-1.5.4/classes/Comment.php 2006-04-22 23:09:30.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: Comment.php,v 1.21.2.1 2006/03/27 15:31:26 jenst Exp $ + * $Id: Comment.php 13504 2006-04-22 21:09:30Z jenst $ */ ?> userDB->getUserByUid($this->UID); - if ($gallery->app->comments_anonymous == 'no') { + if (!$user->isPseudo()) { $name = $user->printableName($gallery->app->comments_display_name); } diff -Naur gallery-1.5.3/classes/database/mysql/Database.php gallery-1.5.4/classes/database/mysql/Database.php --- gallery-1.5.3/classes/database/mysql/Database.php 2006-03-27 17:31:26.000000000 +0200 +++ gallery-1.5.4/classes/database/mysql/Database.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: Database.php,v 1.12.2.1 2006/03/27 15:31:26 jenst Exp $ + * $Id: Database.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> * @copyright 2004-2005 Roman Ivanov * @license http://www.debian.org/misc/bsd.license BSD License (3 Clause) - * @version CVS: $Id: Safe.php,v 1.1.2.1 2006/03/28 10:54:52 jenst Exp $ + * @version CVS: $Id: Safe.php 13455 2006-04-12 23:48:27Z jenst $ * @link http://pear.php.net/package/HTML_Safe */ @@ -19,8 +19,10 @@ /** * This package requires HTMLSax3 package */ -require_once (dirname(dirname(__FILE__)) .'/XML_HTMLSax3/HTMLSax3.php'); +if (! class_exists('xml_htmlsax3_stateparser')) { + require_once(dirname(dirname(__FILE__)) .'/XML_HTMLSax3/HTMLSax3.php'); +} /** * diff -Naur gallery-1.5.3/classes/Image.php gallery-1.5.4/classes/Image.php --- gallery-1.5.3/classes/Image.php 2006-03-27 17:31:26.000000000 +0200 +++ gallery-1.5.4/classes/Image.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: Image.php,v 1.72.2.1 2006/03/27 15:31:26 jenst Exp $ + * $Id: Image.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> ', base_convert(time(), 10, 36), base_convert(rand(), 10, 36), !empty($GLOBALS['HTTP_SERVER_VARS']['HTTP_HOST']) ? $GLOBALS['HTTP_SERVER_VARS']['HTTP_HOST'] : $GLOBALS['HTTP_SERVER_VARS']['SERVER_NAME']); + $message_id = sprintf('<%s.%s@%s>', base_convert(time(), 10, 36), base_convert(rand(), 10, 36), !empty($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']); $this->headers['Message-ID'] = $message_id; $this->is_built = true; diff -Naur gallery-1.5.3/classes/Mail/mimePart.php gallery-1.5.4/classes/Mail/mimePart.php --- gallery-1.5.3/classes/Mail/mimePart.php 2005-04-17 15:31:40.000000000 +0200 +++ gallery-1.5.4/classes/Mail/mimePart.php 2006-05-02 12:22:26.000000000 +0200 @@ -1,4 +1,9 @@ -* @version $Revision: 1.1 $ +* @version $Revision: 13580 $ * @package Mail */ diff -Naur gallery-1.5.3/classes/Mail/RFC822.php gallery-1.5.4/classes/Mail/RFC822.php --- gallery-1.5.3/classes/Mail/RFC822.php 2005-04-17 15:31:40.000000000 +0200 +++ gallery-1.5.4/classes/Mail/RFC822.php 2006-05-02 12:22:26.000000000 +0200 @@ -1,5 +1,10 @@ * @author Chuck Hagenbuch -* @version $Revision: 1.1 $ +* @version $Revision: 13580 $ * @package Mail +* */ class Mail_RFC822 diff -Naur gallery-1.5.3/classes/Mail/smtp.php gallery-1.5.4/classes/Mail/smtp.php --- gallery-1.5.3/classes/Mail/smtp.php 2005-07-29 19:21:32.000000000 +0200 +++ gallery-1.5.4/classes/Mail/smtp.php 2006-05-02 12:22:26.000000000 +0200 @@ -1,5 +1,10 @@ First version January 2004. * - * $Id: UserDB.php,v 1.5.2.1 2006/03/27 15:31:27 jenst Exp $ + * $Id: UserDB.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> First version January 2004. * - * $Id: User.php,v 1.5.2.1 2006/03/27 15:31:27 jenst Exp $ + * $Id: User.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> phpBB2 integration ver. (www.snailsource.com) -** Written by Martin Smallridge -** -** This file was modified for official integration into Gallery 1.4.3 by -** Jens Tkotz + * Instead of using or duplicating memberships manually in Gallery. + * + * Gallery <-> phpBB2 integration ver. (www.snailsource.com) + * Written by Martin Smallridge + * + * This file was modified for official integration into Gallery 1.4.3 by + * Jens Tkotz */ class phpbb_UserDB extends Abstract_UserDB { diff -Naur gallery-1.5.3/classes/phpbb/User.php gallery-1.5.4/classes/phpbb/User.php --- gallery-1.5.3/classes/phpbb/User.php 2006-01-06 07:38:06.000000000 +0100 +++ gallery-1.5.4/classes/phpbb/User.php 2006-05-02 12:22:26.000000000 +0200 @@ -16,16 +16,18 @@ * 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. + * + * $Id: User.php 13580 2006-05-02 10:22:26Z jenst $ */ /* This class is written for phpBB2 and provides full integration of the phpbb users database -** Instead of using or duplicating memberships manually in Gallery. -** -** Gallery <-> phpBB2 integration ver. (www.snailsource.com) -** Written by Martin Smallridge -** -** This file was modified for official integration into Gallery 1.4.3 by -** Jens Tkotz + * Instead of using or duplicating memberships manually in Gallery. + * + * Gallery <-> phpBB2 integration ver. (www.snailsource.com) + * Written by Martin Smallridge + * + * This file was modified for official integration into Gallery 1.4.3 by + * Jens Tkotz */ class phpbb_User extends Abstract_User { diff -Naur gallery-1.5.3/classes/php-gettext/AUTHORS gallery-1.5.4/classes/php-gettext/AUTHORS --- gallery-1.5.3/classes/php-gettext/AUTHORS 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/AUTHORS 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,3 @@ +Danilo Segan +Nico Kaiser (contributed most changes between 1.0.2 and 1.0.3, bugfix for 1.0.5) +Steven Armstrong (gettext.inc, leading to 1.0.6) diff -Naur gallery-1.5.3/classes/php-gettext/ChangeLog gallery-1.5.4/classes/php-gettext/ChangeLog --- gallery-1.5.3/classes/php-gettext/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/ChangeLog 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,160 @@ +2006-02-28 Danilo Šegan + + * gettext.php: Added some comments about these workarounds for + different PHP versions and architectures. + +2006-02-28 Danilo Šegan + + Fixes bug #15923. + + * gettext.php (gettext_reader): make magic check work on 64-bit + platforms as well (by Steffen Pingel). + +2006-02-20 Danilo Šegan + + * gettext.inc (_bindtextdomain): Use php_uname to detect Windows. + +2006-02-07 Danilo Šegan + + * examples/pigs_dropin.php: comment-out bind_textdomain_codeset + + * gettext.inc (T_bind_textdomain_codeset): bind_textdomain_codeset + is available only in PHP 4.2.0+ (thanks to Jens A. Tkotz). + + * Makefile: Include gettext.inc in DIST_FILES, VERSION up to + 1.0.7. + +2006-02-03 Danilo Šegan + + Added setlocale() emulation as well. + + * examples/pigs_dropin.php: Use T_setlocale() and locale_emulation(). + * examples/pigs_fallback.php: Use T_setlocale() and locale_emulation(). + + * gettext.inc: Added globals $EMULATEGETTEXT and $CURRENTLOCALE. + (locale_emulation): Whether emulation is active. + (_check_locale): Rewrite. + (_setlocale): Added emulated setlocale function. + (T_setlocale): Wrapper around _setlocale. + (_get_reader): Use variables and _setlocale. + +2006-02-02 Danilo Šegan + + Fix bug #12192. + + * examples/locale/sr_CS/LC_MESSAGES/messages.po: Correct grammar. + * examples/locale/sr_CS/LC_MESSAGES/messages.mo: Rebuild. + +2006-02-02 Danilo Šegan + + Fix bug #15419. + + * streams.php: Support for PHP 5.1.1 fread() which reads most 8kb. + (Fix by Piotr Szotkowski ) + +2006-02-02 Danilo Šegan + + Merge Steven Armstrong's changes, supporting standard gettext + interfaces: + + * examples/*: Restructured examples. + * gettext.inc: Added. + * AUTHORS: Added Steven. + * Makefile (VERSION): Up to 1.0.6. + +2006-01-28 Nico Kaiser + + * gettext.php (select_string): Fix "true" <-> 1 difference of PHP + +2005-07-29 Danilo Šegan + + * Makefile (VERSION): Up to 1.0.5. + +2005-07-29 Danilo Šegan + + Fixes bug #13850. + + * gettext.php (gettext_reader): check $Reader->error as well. + +2005-07-29 Danilo Šegan + + * Makefile (VERSION): Up to 1.0.4. + +2005-07-29 Danilo Šegan + + Fixes bug #13771. + + * gettext.php (gettext_reader->get_plural_forms): Plural forms + header extraction regex change. Reported by Edgar Gonzales. + +2005-02-28 Danilo Šegan + + * AUTHORS: Added Nico to the list. + + * Makefile (VERSION): Up to 1.0.3. + + * README: Updated. + +2005-02-28 Danilo Šegan + + * gettext.php: Added pre-loading, code documentation, and many + code clean-ups by Nico Kaiser . + +2005-02-28 Danilo Šegan + + * streams.php (FileReader.read): Handle read($bytes = 0). + + * examples/pigs.php: Prefix gettext function names with T or T_. + + * examples/update: Use the same keywords T_ and T_ngettext. + + * streams.php: Added CachedFileReader. + +2003-11-11 Danilo Šegan + + * gettext.php: Added hashing to find_string. + +2003-11-01 Danilo Šegan + + * Makefile (DIST_FILES): Replaced LICENSE with COPYING. + (VERSION): Up to 1.0.2. + + * AUTHORS: Minor edits. + + * README: Minor edits. + + * COPYING: Removed LICENSE, added this file. + + * gettext.php: Added copyright notice and disclaimer. + * streams.php: Same. + * examples/pigs.php: Same. + +2003-10-23 Danilo Šegan + + * Makefile: Upped version to 1.0.1. + + * gettext.php (gettext_reader): Remove a call to set_total_plurals. + (set_total_plurals): Removed unused function for some better days. + +2003-10-23 Danilo Šegan + + * Makefile: Added, version 1.0.0. + + * examples/*: Added an example of usage. + + * README: Described all the crap. + +2003-10-22 Danilo Šegan + + * gettext.php: Plural forms implemented too. + + * streams.php: Added FileReader for direct access to files (no + need to keep file in memory). + + * gettext.php: It works, except for plural forms. + + * streams.php: Created abstract class StreamReader. + Added StringReader class. + + * gettext.php: Started writing gettext_reader. + diff -Naur gallery-1.5.3/classes/php-gettext/COPYING gallery-1.5.4/classes/php-gettext/COPYING --- gallery-1.5.3/classes/php-gettext/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/COPYING 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Library 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. + + + Copyright (C) + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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. + + , 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 Library General +Public License instead of this License. diff -Naur gallery-1.5.3/classes/php-gettext/examples/index.php gallery-1.5.4/classes/php-gettext/examples/index.php --- gallery-1.5.3/classes/php-gettext/examples/index.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/examples/index.php 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,27 @@ + + +PHP-gettext examples + + +

PHP-gettext

+ +

Introduction

+

PHP-gettext provides a simple gettext replacement that works independently from the system's gettext abilities. +It can read MO files and use them for translating strings.

+

This version has the ability to cache all strings and translations to speed up the string lookup. +While the cache is enabled by default, it can be switched off with the second parameter in the constructor (e.g. when using very large MO files +that you don't want to keep in memory)

+ + +

Examples

+ + +
+

Copyright (c) 2003-2006 Danilo Segan

+

Copyright (c) 2005-2006 Steven Armstrong

+ + + diff -Naur gallery-1.5.3/classes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo gallery-1.5.4/classes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo --- gallery-1.5.3/classes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,18 @@ +4L`6a;8+%d pig went to the market +%d pigs went to the market +This is how the story goes. + +Project-Id-Version: pigs +Report-Msgid-Bugs-To: +POT-Creation-Date: 2003-10-23 04:50+0200 +PO-Revision-Date: 2003-11-01 23:40+0100 +Last-Translator: Danilo Segan +Language-Team: Serbian (sr) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +%d Schwein ging zum Markt +%d Schweine gingen zum Markt +Und so geht die Geschichte. + + \ Pas de fin de ligne la fin du fichier. diff -Naur gallery-1.5.3/classes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.po gallery-1.5.4/classes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.po --- gallery-1.5.3/classes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.po 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/examples/locale/de_CH/LC_MESSAGES/messages.po 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,30 @@ +# Sample translation for PHP-gettext 1.0 +# Copyright (c) 2003 Danilo Segan +# +msgid "" +msgstr "" +"Project-Id-Version: pigs\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-23 04:50+0200\n" +"PO-Revision-Date: 2003-11-01 23:40+0100\n" +"Last-Translator: Danilo Segan \n" +"Language-Team: Serbian (sr) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +#"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: pigs.php:19 +msgid "" +"This is how the story goes.\n" +"\n" +msgstr "" +"Und so geht die Geschichte.\n" +"\n" + +#: pigs.php:21 +#, php-format +msgid "%d pig went to the market\n" +msgid_plural "%d pigs went to the market\n" +msgstr[0] "%d Schwein ging zum Markt\n" +msgstr[1] "%d Schweine gingen zum Markt\n" diff -Naur gallery-1.5.3/classes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo gallery-1.5.4/classes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo --- gallery-1.5.3/classes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,20 @@ +4L`6aj"%d pig went to the market +%d pigs went to the market +This is how the story goes. + +Project-Id-Version: pigs +Report-Msgid-Bugs-To: +POT-Creation-Date: 2003-10-23 04:50+0200 +PO-Revision-Date: 2006-02-02 21:06+0100 +Last-Translator: Danilo Segan +Language-Team: Serbian (sr) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); +%d мало прасе је отишло на пијац +%d мала прасета су отишла на пијац +%d малих прасића је отишло на пијац +Овако иде прича. + + \ Pas de fin de ligne la fin du fichier. diff -Naur gallery-1.5.3/classes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po gallery-1.5.4/classes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po --- gallery-1.5.3/classes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,29 @@ +# Sample translation for PHP-gettext 1.0 +# Copyright (c) 2003,2006 Danilo Segan +# +msgid "" +msgstr "" +"Project-Id-Version: pigs\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-23 04:50+0200\n" +"PO-Revision-Date: 2006-02-02 21:06+0100\n" +"Last-Translator: Danilo Segan \n" +"Language-Team: Serbian (sr) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: pigs.php:19 +msgid "" +"This is how the story goes.\n" +"\n" +msgstr "Овако иде прича.\n\n" + +#: pigs.php:21 +#, php-format +msgid "%d pig went to the market\n" +msgid_plural "%d pigs went to the market\n" +msgstr[0] "%d мало прасе је отишло на пијац\n" +msgstr[1] "%d мала прасета су отишла на пијац\n" +msgstr[2] "%d малих прасића је отишло на пијац\n" diff -Naur gallery-1.5.3/classes/php-gettext/examples/pigs_dropin.php gallery-1.5.4/classes/php-gettext/examples/pigs_dropin.php --- gallery-1.5.3/classes/php-gettext/examples/pigs_dropin.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/examples/pigs_dropin.php 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,95 @@ +. + Copyright (c) 2005,2006 Steven Armstrong + + This file is part of PHP-gettext. + + PHP-gettext 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. + + PHP-gettext 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 PHP-gettext; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +/* + * 10.05.2006, Jens Tkotz + * Added quotes around constant names. + * + * Gallery SVN ID: + * $Id: albums.php 13362 2006-04-04 22:13:34Z jenst $ +*/ + +// define constants +define("PROJECT_DIR", realpath('./')); +define("LOCALE_DIR", PROJECT_DIR .'/locale'); +define("DEFAULT_LOCALE", 'en_US'); + +require_once('../gettext.inc'); + +$supported_locales = array('en_US', 'sr_CS', 'de_CH'); +$encoding = 'UTF-8'; + +$locale = (isset($_GET['lang']))? $_GET['lang'] : DEFAULT_LOCALE; + +// gettext setup +T_setlocale(LC_MESSAGES, $locale); +// Set the text domain as 'messages' +$domain = 'messages'; +bindtextdomain($domain, LOCALE_DIR); +// bind_textdomain_codeset is supported only in PHP 4.2.0+ +if (function_exists('bind_textdomain_codeset')) + bind_textdomain_codeset($domain, $encoding); +textdomain($domain); + +header("Content-type: text/html; charset=$encoding"); +?> + + +PHP-gettext dropin example + + +

PHP-gettext as a dropin replacement

+

Example showing how to use PHP-gettext as a dropin replacement for the native gettext library.

+"; +foreach($supported_locales as $l) { + print "[$l] "; +} +print "

\n"; + +if (!locale_emulation()) { + print "

locale '$locale' is supported by your system, using native gettext implementation.

\n"; +} +else { + print "

locale '$locale' is _not_ supported on your system, using the default locale '". DEFAULT_LOCALE ."'.

\n"; +} +?> + +
+ +"; +print _("This is how the story goes.\n\n"); +for ($number=6; $number>=0; $number--) { + print sprintf(T_ngettext("%d pig went to the market\n", + "%d pigs went to the market\n", $number), + $number ); +} +print "\n"; +?> + +
+

« back

+ + diff -Naur gallery-1.5.3/classes/php-gettext/examples/pigs_fallback.php gallery-1.5.4/classes/php-gettext/examples/pigs_fallback.php --- gallery-1.5.3/classes/php-gettext/examples/pigs_fallback.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/examples/pigs_fallback.php 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,94 @@ +. + Copyright (c) 2005,2006 Steven Armstrong + + This file is part of PHP-gettext. + + PHP-gettext 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. + + PHP-gettext 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 PHP-gettext; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +/* + * 10.05.2006, Jens Tkotz + * Added quotes around constant names. + * + * Gallery SVN ID: + * $Id: albums.php 13362 2006-04-04 22:13:34Z jenst $ +*/ + +// define constants +define("PROJECT_DIR", realpath('./')); +define("LOCALE_DIR", PROJECT_DIR .'/locale'); +define("DEFAULT_LOCALE", 'en_US'); + +require_once('../gettext.inc'); + +$supported_locales = array('en_US', 'sr_CS', 'de_CH'); +$encoding = 'UTF-8'; + +$locale = (isset($_GET['lang']))? $_GET['lang'] : DEFAULT_LOCALE; + +// gettext setup +T_setlocale(LC_MESSAGES, $locale); +// Set the text domain as 'messages' +$domain = 'messages'; +T_bindtextdomain($domain, LOCALE_DIR); +T_bind_textdomain_codeset($domain, $encoding); +T_textdomain($domain); + +header("Content-type: text/html; charset=$encoding"); +?> + + +PHP-gettext fallback example + + +

PHP-gettext as a fallback solution

+

Example showing how to use PHP-gettext as a fallback solution if the native gettext library is not available or the system does not support the requested locale.

+ +"; +foreach($supported_locales as $l) { + print "[$l] "; +} +print "

\n"; + +if (!locale_emulation()) { + print "

locale '$locale' is supported by your system, using native gettext implementation.

\n"; +} +else { + print "

locale '$locale' is not supported on your system, using custom gettext implementation.

\n"; +} +?> + +
+ +"; +print T_("This is how the story goes.\n\n"); +for ($number=6; $number>=0; $number--) { + print sprintf( T_ngettext("%d pig went to the market\n", + "%d pigs went to the market\n", $number), + $number ); +} +print "\n"; +?> + +
+

« back

+ + diff -Naur gallery-1.5.3/classes/php-gettext/examples/update gallery-1.5.4/classes/php-gettext/examples/update --- gallery-1.5.3/classes/php-gettext/examples/update 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/examples/update 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,14 @@ +#!/bin/sh +TEMPLATE=pigs.pot +xgettext -kT_ngettext:1,2 -kT_ -L PHP -o $TEMPLATE pigs_dropin.php +if [ x$1 == 'x-p' ]; then + msgfmt --statistics $TEMPLATE +else + if [ -f $1.po ]; then + msgmerge -o .tmp$1.po $1.po $TEMPLATE + mv .tmp$1.po $1.po + msgfmt --statistics $1.po + else + echo "Usage: $0 [-p|]" + fi +fi diff -Naur gallery-1.5.3/classes/php-gettext/gettext.inc gallery-1.5.4/classes/php-gettext/gettext.inc --- gallery-1.5.3/classes/php-gettext/gettext.inc 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/gettext.inc 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,323 @@ + + + Drop in replacement for native gettext. + + This file is part of PHP-gettext. + + PHP-gettext 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. + + PHP-gettext 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 PHP-gettext; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ +/* +LC_CTYPE 0 +LC_NUMERIC 1 +LC_TIME 2 +LC_COLLATE 3 +LC_MONETARY 4 +LC_MESSAGES 5 +LC_ALL 6 +*/ + +require('streams.php'); +require('gettext.php'); + + +// Variables + +global $text_domains, $default_domain, $LC_CATEGORIES, $EMULATEGETTEXT, $CURRENTLOCALE; +$text_domains = array(); +$default_domain = 'messages'; +$LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', 'LC_MESSAGES', 'LC_ALL'); +$EMULATEGETTEXT = 0; +$CURRENTLOCALE = ''; + + +// Utility functions + +/** + * Utility function to get a StreamReader for the given text domain. + */ +function _get_reader($domain=null, $category=5, $enable_cache=true) { + global $text_domains, $default_domain, $LC_CATEGORIES; + if (!isset($domain)) $domain = $default_domain; + if (!isset($text_domains[$domain]->l10n)) { + // get the current locale + $locale = _setlocale(LC_MESSAGES, 0); + $p = isset($text_domains[$domain]->path) ? $text_domains[$domain]->path : './'; + $path = $p . "$locale/". $LC_CATEGORIES[$category] ."/$domain.mo"; + if (file_exists($path)) { + $input = new FileReader($path); + } + else { + $input = null; + } + $text_domains[$domain]->l10n = new gettext_reader($input, $enable_cache); + } + return $text_domains[$domain]->l10n; +} + +/** + * Returns whether we are using our emulated gettext API or PHP built-in one. + */ +function locale_emulation() { + global $EMULATEGETTEXT; + return $EMULATEGETTEXT; +} + +/** + * Checks if the current locale is supported on this system. + */ +function _check_locale() { + global $EMULATEGETTEXT; + return !$EMULATEGETTEXT; +} + +/** + * Get the codeset for the given domain. + */ +function _get_codeset($domain=null) { + global $text_domains, $default_domain, $LC_CATEGORIES; + if (!isset($domain)) $domain = $default_domain; + return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding'); +} + +/** + * Convert the given string to the encoding set by bind_textdomain_codeset. + */ +function _encode($text) { + $source_encoding = mb_detect_encoding($text); + $target_encoding = _get_codeset(); + if ($source_encoding != $target_encoding) { + return mb_convert_encoding($text, $target_encoding, $source_encoding); + } + else { + return $text; + } +} + + + + +// Custom implementation of the standard gettext related functions + +/** + * Sets a requested locale, if needed emulates it. + */ +function _setlocale($category, $locale) { + global $CURRENTLOCALE, $EMULATEGETTEXT; + if ($locale === 0) { // use === to differentiate between string "0" + if ($CURRENTLOCALE != '') + return $CURRENTLOCALE; + else + // obey LANG variable, maybe extend to support all of LC_* vars + // even if we tried to read locale without setting it first + return _setlocale($category, $CURRENTLOCALE); + } else { + $ret = 0; + if (function_exists('setlocale')) // I don't know if this ever happens ;) + $ret = setlocale($category, $locale); + if (($ret and $locale == '') or ($ret == $locale)) { + $EMULATEGETTEXT = 0; + $CURRENTLOCALE = $ret; + } else { + if ($locale == '') // emulate variable support + $CURRENTLOCALE = getenv('LANG'); + else + $CURRENTLOCALE = $locale; + $EMULATEGETTEXT = 1; + } + return $CURRENTLOCALE; + } +} + +/** + * Sets the path for a domain. + */ +function _bindtextdomain($domain, $path) { + global $text_domains; + // ensure $path ends with a slash ('/' should work for both, but lets still play nice) + if (substr(php_uname(), 0, 7) == "Windows") { + if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/') + $path .= '\\'; + } else { + if ($path[strlen($path)-1] != '/') + $path .= '/'; + } + $text_domains[$domain]->path = $path; +} + +/** + * Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. + */ +function _bind_textdomain_codeset($domain, $codeset) { + global $text_domains; + $text_domains[$domain]->codeset = $codeset; +} + +/** + * Sets the default domain. + */ +function _textdomain($domain) { + global $default_domain; + $default_domain = $domain; +} + +/** + * Lookup a message in the current domain. + */ +function _gettext($msgid) { + $l10n = _get_reader(); + //return $l10n->translate($msgid); + return _encode($l10n->translate($msgid)); +} +/** + * Alias for gettext. + */ +function __($msgid) { + return _gettext($msgid); +} +/** + * Plural version of gettext. + */ +function _ngettext($single, $plural, $number) { + $l10n = _get_reader(); + //return $l10n->ngettext($single, $plural, $number); + return _encode($l10n->ngettext($single, $plural, $number)); +} + +/** + * Override the current domain. + */ +function _dgettext($domain, $msgid) { + $l10n = _get_reader($domain); + //return $l10n->translate($msgid); + return _encode($l10n->translate($msgid)); +} +/** + * Plural version of dgettext. + */ +function _dngettext($domain, $single, $plural, $number) { + $l10n = _get_reader($domain); + //return $l10n->ngettext($single, $plural, $number); + return _encode($l10n->ngettext($single, $plural, $number)); +} + +/** + * Overrides the domain and category for a single lookup. + */ +function _dcgettext($domain, $msgid, $category) { + $l10n = _get_reader($domain, $category); + //return $l10n->translate($msgid); + return _encode($l10n->translate($msgid)); +} +/** + * Plural version of dcgettext. + */ +function _dcngettext($domain, $single, $plural, $number, $category) { + $l10n = _get_reader($domain, $category); + //return $l10n->ngettext($single, $plural, $number); + return _encode($l10n->ngettext($single, $plural, $number)); +} + + + +// Wrappers to use if the standard gettext functions are available, but the current locale is not supported by the system. +// Use the standard impl if the current locale is supported, use the custom impl otherwise. + +function T_setlocale($category, $locale) { + return _setlocale($category, $locale); +} + +function T_bindtextdomain($domain, $path) { + if (_check_locale()) return bindtextdomain($domain, $path); + else return _bindtextdomain($domain, $path); +} +function T_bind_textdomain_codeset($domain, $codeset) { + // bind_textdomain_codeset is available only in PHP 4.2.0+ + if (_check_locale() and function_exists('bind_textdomain_codeset')) return bind_textdomain_codeset($domain, $codeset); + else return _bind_textdomain_codeset($domain, $codeset); +} +function T_textdomain($domain) { + if (_check_locale()) return textdomain($domain); + else return _textdomain($domain); +} +function T_gettext($msgid) { + if (_check_locale()) return gettext($msgid); + else return _gettext($msgid); +} +function T_($msgid) { + if (_check_locale()) return _($msgid); + return __($msgid); +} +function T_ngettext($single, $plural, $number) { + if (_check_locale()) return ngettext($single, $plural, $number); + else return _ngettext($single, $plural, $number); +} +function T_dgettext($domain, $msgid) { + if (_check_locale()) return dgettext($domain, $msgid); + else return _dgettext($domain, $msgid); +} +function T_dngettext($domain, $single, $plural, $number) { + if (_check_locale()) return dngettext($domain, $single, $plural, $number); + else return _dngettext($domain, $single, $plural, $number); +} +function T_dcgettext($domain, $msgid, $category) { + if (_check_locale()) return dcgettext($domain, $msgid, $category); + else return _dcgettext($domain, $msgid, $category); +} +function T_dcngettext($domain, $single, $plural, $number, $category) { + if (_check_locale()) return dcngettext($domain, $single, $plural, $number, $category); + else return _dcngettext($domain, $single, $plural, $number, $category); +} + + + +// Wrappers used as a drop in replacement for the standard gettext functions + +if (!function_exists('gettext')) { + function bindtextdomain($domain, $path) { + return _bindtextdomain($domain, $path); + } + function bind_textdomain_codeset($domain, $codeset) { + return _bind_textdomain_codeset($domain, $codeset); + } + function textdomain($domain) { + return _textdomain($domain); + } + function gettext($msgid) { + return _gettext($msgid); + } + function _($msgid) { + return __($msgid); + } + function ngettext($single, $plural, $number) { + return _ngettext($single, $plural, $number); + } + function dgettext($domain, $msgid) { + return _dgettext($domain, $msgid); + } + function dngettext($domain, $single, $plural, $number) { + return _dngettext($domain, $single, $plural, $number); + } + function dcgettext($domain, $msgid, $category) { + return _dcgettext($domain, $msgid, $category); + } + function dcngettext($domain, $single, $plural, $number, $category) { + return _dcngettext($domain, $single, $plural, $number, $category); + } +} + +?> \ Pas de fin de ligne la fin du fichier. diff -Naur gallery-1.5.3/classes/php-gettext/gettext.php gallery-1.5.4/classes/php-gettext/gettext.php --- gallery-1.5.3/classes/php-gettext/gettext.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/gettext.php 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,358 @@ +. + Copyright (c) 2005 Nico Kaiser + + This file is part of PHP-gettext. + + PHP-gettext 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. + + PHP-gettext 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 PHP-gettext; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +/** + * Provides a simple gettext replacement that works independently from + * the system's gettext abilities. + * It can read MO files and use them for translating strings. + * The files are passed to gettext_reader as a Stream (see streams.php) + * + * This version has the ability to cache all strings and translations to + * speed up the string lookup. + * While the cache is enabled by default, it can be switched off with the + * second parameter in the constructor (e.g. whenusing very large MO files + * that you don't want to keep in memory) + */ +class gettext_reader { + //public: + var $error = 0; // public variable that holds error code (0 if no error) + + //private: + var $BYTEORDER = 0; // 0: low endian, 1: big endian + var $STREAM = NULL; + var $short_circuit = false; + var $enable_cache = false; + var $originals = NULL; // offset of original table + var $translations = NULL; // offset of translation table + var $pluralheader = NULL; // cache header field for plural forms + var $total = 0; // total string count + var $table_originals = NULL; // table for original strings (offsets) + var $table_translations = NULL; // table for translated strings (offsets) + var $cache_translations = NULL; // original -> translation mapping + + + /* Methods */ + + + /** + * Reads a 32bit Integer from the Stream + * + * @access private + * @return Integer from the Stream + */ + function readint() { + if ($this->BYTEORDER == 0) { + // low endian + return array_shift(unpack('V', $this->STREAM->read(4))); + } else { + // big endian + return array_shift(unpack('N', $this->STREAM->read(4))); + } + } + + /** + * Reads an array of Integers from the Stream + * + * @param int count How many elements should be read + * @return Array of Integers + */ + function readintarray($count) { + if ($this->BYTEORDER == 0) { + // low endian + return unpack('V'.$count, $this->STREAM->read(4 * $count)); + } else { + // big endian + return unpack('N'.$count, $this->STREAM->read(4 * $count)); + } + } + + /** + * Constructor + * + * @param object Reader the StreamReader object + * @param boolean enable_cache Enable or disable caching of strings (default on) + */ + function gettext_reader($Reader, $enable_cache = true) { + // If there isn't a StreamReader, turn on short circuit mode. + if (! $Reader || isset($Reader->error) ) { + $this->short_circuit = true; + return; + } + + // Caching can be turned off + $this->enable_cache = $enable_cache; + + // $MAGIC1 = (int)0x950412de; //bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565 + $MAGIC1 = (int) - 1794895138; + // $MAGIC2 = (int)0xde120495; //bug + $MAGIC2 = (int) - 569244523; + + $this->STREAM = $Reader; + $magic = $this->readint(); + if ($magic == ($MAGIC1 & 0xFFFFFFFF)) { // to make sure it works for 64-bit platforms + $this->BYTEORDER = 0; + } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) { + $this->BYTEORDER = 1; + } else { + $this->error = 1; // not MO file + return false; + } + + // FIXME: Do we care about revision? We should. + $revision = $this->readint(); + + $this->total = $this->readint(); + $this->originals = $this->readint(); + $this->translations = $this->readint(); + } + + /** + * Loads the translation tables from the MO file into the cache + * If caching is enabled, also loads all strings into a cache + * to speed up translation lookups + * + * @access private + */ + function load_tables() { + if (is_array($this->cache_translations) && + is_array($this->table_originals) && + is_array($this->table_translations)) + return; + + /* get original and translations tables */ + $this->STREAM->seekto($this->originals); + $this->table_originals = $this->readintarray($this->total * 2); + $this->STREAM->seekto($this->translations); + $this->table_translations = $this->readintarray($this->total * 2); + + if ($this->enable_cache) { + $this->cache_translations = array (); + /* read all strings in the cache */ + for ($i = 0; $i < $this->total; $i++) { + $this->STREAM->seekto($this->table_originals[$i * 2 + 2]); + $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]); + $this->STREAM->seekto($this->table_translations[$i * 2 + 2]); + $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]); + $this->cache_translations[$original] = $translation; + } + } + } + + /** + * Returns a string from the "originals" table + * + * @access private + * @param int num Offset number of original string + * @return string Requested string if found, otherwise '' + */ + function get_original_string($num) { + $length = $this->table_originals[$num * 2 + 1]; + $offset = $this->table_originals[$num * 2 + 2]; + if (! $length) + return ''; + $this->STREAM->seekto($offset); + $data = $this->STREAM->read($length); + return (string)$data; + } + + /** + * Returns a string from the "translations" table + * + * @access private + * @param int num Offset number of original string + * @return string Requested string if found, otherwise '' + */ + function get_translation_string($num) { + $length = $this->table_translations[$num * 2 + 1]; + $offset = $this->table_translations[$num * 2 + 2]; + if (! $length) + return ''; + $this->STREAM->seekto($offset); + $data = $this->STREAM->read($length); + return (string)$data; + } + + /** + * Binary search for string + * + * @access private + * @param string string + * @param int start (internally used in recursive function) + * @param int end (internally used in recursive function) + * @return int string number (offset in originals table) + */ + function find_string($string, $start = -1, $end = -1) { + if (($start == -1) or ($end == -1)) { + // find_string is called with only one parameter, set start end end + $start = 0; + $end = $this->total; + } + if (abs($start - $end) <= 1) { + // We're done, now we either found the string, or it doesn't exist + $txt = $this->get_original_string($start); + if ($string == $txt) + return $start; + else + return -1; + } else if ($start > $end) { + // start > end -> turn around and start over + return $this->find_string($string, $end, $start); + } else { + // Divide table in two parts + $half = (int)(($start + $end) / 2); + $cmp = strcmp($string, $this->get_original_string($half)); + if ($cmp == 0) + // string is exactly in the middle => return it + return $half; + else if ($cmp < 0) + // The string is in the upper half + return $this->find_string($string, $start, $half); + else + // The string is in the lower half + return $this->find_string($string, $half, $end); + } + } + + /** + * Translates a string + * + * @access public + * @param string string to be translated + * @return string translated string (or original, if not found) + */ + function translate($string) { + if ($this->short_circuit) + return $string; + $this->load_tables(); + + if ($this->enable_cache) { + // Caching enabled, get translated string from cache + if (array_key_exists($string, $this->cache_translations)) + return $this->cache_translations[$string]; + else + return $string; + } else { + // Caching not enabled, try to find string + $num = $this->find_string($string); + if ($num == -1) + return $string; + else + return $this->get_translation_string($num); + } + } + + /** + * Get possible plural forms from MO header + * + * @access private + * @return string plural form header + */ + function get_plural_forms() { + // lets assume message number 0 is header + // this is true, right? + $this->load_tables(); + + // cache header field for plural forms + if (! is_string($this->pluralheader)) { + if ($this->enable_cache) { + $header = $this->cache_translations[""]; + } else { + $header = $this->get_translation_string(0); + } + if (eregi("plural-forms: ([^\n]*)\n", $header, $regs)) + $expr = $regs[1]; + else + $expr = "nplurals=2; plural=n == 1 ? 0 : 1;"; + $this->pluralheader = $expr; + } + return $this->pluralheader; + } + + /** + * Detects which plural form to take + * + * @access private + * @param n count + * @return int array index of the right plural form + */ + function select_string($n) { + $string = $this->get_plural_forms(); + $string = str_replace('nplurals',"\$total",$string); + $string = str_replace("n",$n,$string); + $string = str_replace('plural',"\$plural",$string); + + $total = 0; + $plural = 0; + + eval("$string"); + if ($plural >= $total) $plural = $total - 1; + return $plural; + } + + /** + * Plural version of gettext + * + * @access public + * @param string single + * @param string plural + * @param string number + * @return translated plural form + */ + function ngettext($single, $plural, $number) { + if ($this->short_circuit) { + if ($number != 1) + return $plural; + else + return $single; + } + + // find out the appropriate form + $select = $this->select_string($number); + + // this should contains all strings separated by NULLs + $key = $single.chr(0).$plural; + + + if ($this->enable_cache) { + if (! array_key_exists($key, $this->cache_translations)) { + return ($number != 1) ? $plural : $single; + } else { + $result = $this->cache_translations[$key]; + $list = explode(chr(0), $result); + return $list[$select]; + } + } else { + $num = $this->find_string($key); + if ($num == -1) { + return ($number != 1) ? $plural : $single; + } else { + $result = $this->get_translation_string($num); + $list = explode(chr(0), $result); + return $list[$select]; + } + } + } + +} + +?> diff -Naur gallery-1.5.3/classes/php-gettext/Makefile gallery-1.5.4/classes/php-gettext/Makefile --- gallery-1.5.3/classes/php-gettext/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/Makefile 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,32 @@ +PACKAGE = php-gettext-$(VERSION) +VERSION = 1.0.7 + +DIST_FILES = \ + gettext.php \ + gettext.inc \ + streams.php \ + AUTHORS \ + ChangeLog \ + README \ + COPYING \ + Makefile \ + examples/index.php \ + examples/pigs_dropin.php \ + examples/pigs_fallback.php \ + examples/locale/sr_CS/LC_MESSAGES/messages.po \ + examples/locale/sr_CS/LC_MESSAGES/messages.mo \ + examples/locale/de_CH/LC_MESSAGES/messages.po \ + examples/locale/de_CH/LC_MESSAGES/messages.mo \ + examples/update + +dist: + if [ -d $(PACKAGE) ]; then \ + rm -rf $(PACKAGE); \ + fi; \ + mkdir $(PACKAGE); \ + if [ -d $(PACKAGE) ]; then \ + cp -rp --parents $(DIST_FILES) $(PACKAGE); \ + tar cvzf $(PACKAGE).tar.gz $(PACKAGE); \ + rm -rf $(PACKAGE); \ + fi; + diff -Naur gallery-1.5.3/classes/php-gettext/README gallery-1.5.4/classes/php-gettext/README --- gallery-1.5.3/classes/php-gettext/README 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/README 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,189 @@ +PHP-gettext 1.0 + +Copyright 2003, 2006 -- Danilo "angry with PHP[1]" Segan +Licensed under GPLv2 (or any later version, see COPYING) + +[1] PHP is actually cyrillic, and translates roughly to + "works-doesn't-work" (UTF-8: Ради-Не-Ради) + + +Introduction + + How many times did you look for a good translation tool, and + found out that gettext is best for the job? Many times. + + How many times did you try to use gettext in PHP, but failed + miserably, because either your hosting provider didn't support + it, or the server didn't have adequate locale? Many times. + + Well, this is a solution to your needs. It allows using gettext + tools for managing translations, yet it doesn't require gettext + library at all. It parses generated MO files directly, and thus + might be a bit slower than the (maybe provided) gettext library. + + PHP-gettext is a simple reader for GNU gettext MO files. Those + are binary containers for translations, produced by GNU msgfmt. + +Why? + + I got used to having gettext work even without gettext + library. It's there in my favourite language Python, so I was + surprised that I couldn't find it in PHP. I even Googled for it, + but to no avail. + + So, I said, what the heck, I'm going to write it for this + disguisting language of PHP, because I'm often constrained to it. + +Features + + o Support for simple translations + Just define a simple alias for translate() function (suggested + use of _() or gettext(); see provided example). + + o Support for ngettext calls (plural forms, see a note under bugs) + You may also use plural forms. Translations in MO files need to + provide this, and they must also provide "plural-forms" header. + Please see 'info gettext' for more details. + + o Support for reading straight files, or strings (!!!) + Since I can imagine many different backends for reading in the MO + file data, I used imaginary abstract class StreamReader to do all + the input (check streams.php). For your convenience, I've already + provided two classes for reading files: FileReader and + StringReader (CachedFileReader is a combination of the two: it + loads entire file contents into a string, and then works on that). + See example below for usage. You can for instance use StringReader + when you read in data from a database, or you can create your own + derivative of StreamReader for anything you like. + + +Bugs + + Plural-forms field in MO header (translation for empty string, + i.e. "") is treated according to PHP syntactic rules (it's + eval()ed). Since these should actually follow C syntax, there are + some problems. + + For instance, I'm used to using this: + Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : \ + n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2; + but it fails with PHP (it sets $plural=2 instead of 0 for $n==1). + + The fix is usually simple, but I'm lazy to go into the details of + PHP operator precedence, and maybe try to fix it. In here, I had + to put everything after the first ':' in parenthesis: + Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : \ + (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); + That works, and I'm satisfied. + + Besides this one, there are probably a bunch of other bugs, since + I hate PHP (did I mention it already? no? strange), and don't + know it very well. So, feel free to fix any of those and report + them back to me at . + +Usage + + Put files streams.php and gettext.php somewhere you can load them + from, and require 'em in where you want to use them. + + Then, create one 'stream reader' (a class that provides functions + like read(), seekto(), currentpos() and length()) which will + provide data for the 'gettext_reader', with eg. + $streamer = new FileStream('data.mo'); + + Then, use that as a parameter to gettext_reader constructor: + $wohoo = new gettext_reader($streamer); + + If you want to disable pre-loading of entire message catalog in + memory (if, for example, you have a multi-thousand message catalog + which you'll use only occasionally), use "false" for second + parameter to gettext_reader constructor: + $wohoo = new gettext_reader($streamer, false); + + From now on, you have all the benefits of gettext data at your + disposal, so may run: + print $wohoo->translate("This is a test"); + print $wohoo->ngettext("%d bird", "%d birds", $birds); + + You might need to pass parameter "-k" to xgettext to make it + extract all the strings. In above example, try with + xgettext -ktranslate -kngettext:1,2 file.php + what should create messages.po which contains two messages for + translation. + + I suggest creating simple aliases for these functions (see + example/pigs.php for how do I do it, which means it's probably a + bad way). + + +Usage with gettext.inc (standard gettext interfaces emulation) + + Check example in examples/pig_dropin.php, basically you include + gettext.inc and use all the standard gettext interfaces as + documented on: + + http://www.php.net/gettext + + The only catch is that you can check return value of setlocale() + to see if your locale is system supported or not. + + +Example + + See in examples/ subdirectory. There are a couple of files. + pigs.php is an example, serbian.po is a translation to Serbian + language, and serbian.mo is generated with + msgfmt -o serbian.mo serbian.po + There is also simple "update" script that can be used to generate + POT file and to update the translation using msgmerge. + +Interesting TODO: + + o Try to parse "plural-forms" header field, and to follow C syntax + rules. This won't be easy. + +Boring TODO: + + o Learn PHP and fix bugs, slowness and other stuff resulting from + my lack of knowledge (but *maybe*, it's not my knowledge that is + bad, but PHP itself ;-). + + (This is mostly done thanks to Nico Kaiser.) + + o Try to use hash tables in MO files: with pre-loading, would it + be useful at all? + +Never-asked-questions: + + o Why did you mark this as version 1.0 when this is the first code + release? + + Well, it's quite simple. I consider that the first released thing + should be labeled "version 1" (first, right?). Zero is there to + indicate that there's zero improvement and/or change compared to + "version 1". + + I plan to use version numbers 1.0.* for small bugfixes, and to + release 1.1 as "first stable release of version 1". + + This may trick someone that this is actually useful software, but + as with any other free software, I take NO RESPONSIBILITY for + creating such a masterpiece that will smoke crack, trash your + hard disk, and make lasers in your CD device dance to the tune of + Mozart's 40th Symphony (there is one like that, right?). + + o Can I...? + + Yes, you can. This is free software (as in freedom, free speech), + and you might do whatever you wish with it, provided you do not + limit freedom of others (GPL). + + I'm considering licensing this under LGPL, but I *do* want + *every* PHP-gettext user to contribute and respect ideas of free + software, so don't count on it happening anytime soon. + + I'm sorry that I'm taking away your freedom of taking others' + freedom away, but I believe that's neglible as compared to what + freedoms you could take away. ;-) + + Uhm, whatever. diff -Naur gallery-1.5.3/classes/php-gettext/streams.php gallery-1.5.4/classes/php-gettext/streams.php --- gallery-1.5.3/classes/php-gettext/streams.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.4/classes/php-gettext/streams.php 2006-05-10 13:51:37.000000000 +0200 @@ -0,0 +1,174 @@ +. + + This file is part of PHP-gettext. + + PHP-gettext 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. + + PHP-gettext 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 PHP-gettext; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +/* + * 10.05.2006, Jens Tkotz + * Added fix described in bug #16400. + * + * Gallery SVN ID: + * $Id: albums.php 13362 2006-04-04 22:13:34Z jenst $ +*/ + +// Simple class to wrap file streams, string streams, etc. +// seek is essential, and it should be byte stream +class StreamReader { + // should return a string [FIXME: perhaps return array of bytes?] + function read($bytes) { + return false; + } + + // should return new position + function seekto($position) { + return false; + } + + // returns current position + function currentpos() { + return false; + } + + // returns length of entire stream (limit for seekto()s) + function length() { + return false; + } +} + +class StringReader { + var $_pos; + var $_str; + + function StringReader($str='') { + $this->_str = $str; + $this->_pos = 0; + } + + function read($bytes) { + $data = substr($this->_str, $this->_pos, $bytes); + $this->_pos += $bytes; + if (strlen($this->_str)<$this->_pos) + $this->_pos = strlen($this->_str); + + return $data; + } + + function seekto($pos) { + $this->_pos = $pos; + if (strlen($this->_str)<$this->_pos) + $this->_pos = strlen($this->_str); + return $this->_pos; + } + + function currentpos() { + return $this->_pos; + } + + function length() { + return strlen($this->_str); + } + +} + + +class FileReader { + var $_pos; + var $_fd; + var $_length; + + function FileReader($filename) { + if (file_exists($filename)) { + + $this->_length=filesize($filename); + $this->_pos = 0; + $this->_fd = fopen($filename,'rb'); + if (!$this->_fd) { + $this->error = 3; // Cannot read file, probably permissions + return false; + } + } else { + $this->error = 2; // File doesn't exist + return false; + } + } + + function read($bytes) { + $data = NULL; + if ($bytes) { + fseek($this->_fd, $this->_pos); + + // PHP 5.1.1 does not read more than 8192 bytes in one fread() + // the discussions at PHP Bugs suggest it's the intended behaviour + while ($bytes > 0) { + $chunk = fread($this->_fd, $bytes); + $data .= $chunk; + $bytes -= strlen($chunk); + } + $this->_pos = ftell($this->_fd); + + return $data; + } else return ''; + } + + function seekto($pos) { + fseek($this->_fd, $pos); + $this->_pos = ftell($this->_fd); + return $this->_pos; + } + + function currentpos() { + return $this->_pos; + } + + function length() { + return $this->_length; + } + + function close() { + fclose($this->_fd); + } + +} + +// Preloads entire file in memory first, then creates a StringReader +// over it (it assumes knowledge of StringReader internals) +class CachedFileReader extends StringReader { + function CachedFileReader($filename) { + if (file_exists($filename)) { + + $length=filesize($filename); + $fd = fopen($filename,'rb'); + + if (!$fd) { + $this->error = 3; // Cannot read file, probably permissions + return false; + } + $this->_str = fread($fd, $length); + fclose($fd); + + } else { + $this->error = 2; // File doesn't exist + return false; + } + } +} + + +?> \ Pas de fin de ligne la fin du fichier. diff -Naur gallery-1.5.3/classes/postnuke/UserDB.php gallery-1.5.4/classes/postnuke/UserDB.php --- gallery-1.5.3/classes/postnuke/UserDB.php 2006-03-27 17:31:27.000000000 +0200 +++ gallery-1.5.4/classes/postnuke/UserDB.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: UserDB.php,v 1.12.2.1 2006/03/27 15:31:27 jenst Exp $ + * $Id: UserDB.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> Original port from Python | -// | Authors: Harry Fuecks Port to PEAR + more | -// | Authors: Many @ Sitepointforums Advanced PHP Forums | -// +----------------------------------------------------------------------+ -// -// $Id: Decorators.php,v 1.1.2.1 2006/03/28 10:54:52 jenst Exp $ -// -/** -* Decorators for dealing with parser options -* @package XML_HTMLSax3 -* @version $Id: Decorators.php,v 1.1.2.1 2006/03/28 10:54:52 jenst Exp $ -* @see XML_HTMLSax3::set_option -*/ -/** -* Trims the contents of element data from whitespace at start and end -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_Trim { - /** - * Original handler object - * @var object - * @access private - */ - var $orig_obj; - /** - * Original handler method - * @var string - * @access private - */ - var $orig_method; - /** - * Constructs XML_HTMLSax3_Trim - * @param object handler object being decorated - * @param string original handler method - * @access protected - */ - function XML_HTMLSax3_Trim(&$orig_obj, $orig_method) { - $this->orig_obj =& $orig_obj; - $this->orig_method = $orig_method; - } - /** - * Trims the data - * @param XML_HTMLSax3 - * @param string element data - * @access protected - */ - function trimData(&$parser, $data) { - $data = trim($data); - if ($data != '') { - $this->orig_obj->{$this->orig_method}($parser, $data); - } - } -} -/** -* Coverts tag names to upper case -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_CaseFolding { - /** - * Original handler object - * @var object - * @access private - */ - var $orig_obj; - /** - * Original open handler method - * @var string - * @access private - */ - var $orig_open_method; - /** - * Original close handler method - * @var string - * @access private - */ - var $orig_close_method; - /** - * Constructs XML_HTMLSax3_CaseFolding - * @param object handler object being decorated - * @param string original open handler method - * @param string original close handler method - * @access protected - */ - function XML_HTMLSax3_CaseFolding(&$orig_obj, $orig_open_method, $orig_close_method) { - $this->orig_obj =& $orig_obj; - $this->orig_open_method = $orig_open_method; - $this->orig_close_method = $orig_close_method; - } - /** - * Folds up open tag callbacks - * @param XML_HTMLSax3 - * @param string tag name - * @param array tag attributes - * @access protected - */ - function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE) { - $this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty); - } - /** - * Folds up close tag callbacks - * @param XML_HTMLSax3 - * @param string tag name - * @access protected - */ - function foldClose(&$parser, $tag, $empty = FALSE) { - $this->orig_obj->{$this->orig_close_method}($parser, strtoupper($tag), $empty); - } -} -/** -* Breaks up data by linefeed characters, resulting in additional -* calls to the data handler -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_Linefeed { - /** - * Original handler object - * @var object - * @access private - */ - var $orig_obj; - /** - * Original handler method - * @var string - * @access private - */ - var $orig_method; - /** - * Constructs XML_HTMLSax3_LineFeed - * @param object handler object being decorated - * @param string original handler method - * @access protected - */ - function XML_HTMLSax3_LineFeed(&$orig_obj, $orig_method) { - $this->orig_obj =& $orig_obj; - $this->orig_method = $orig_method; - } - /** - * Breaks the data up by linefeeds - * @param XML_HTMLSax3 - * @param string element data - * @access protected - */ - function breakData(&$parser, $data) { - $data = explode("\n",$data); - foreach ( $data as $chunk ) { - $this->orig_obj->{$this->orig_method}($parser, $chunk); - } - } -} -/** -* Breaks up data by tab characters, resulting in additional -* calls to the data handler -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_Tab { - /** - * Original handler object - * @var object - * @access private - */ - var $orig_obj; - /** - * Original handler method - * @var string - * @access private - */ - var $orig_method; - /** - * Constructs XML_HTMLSax3_Tab - * @param object handler object being decorated - * @param string original handler method - * @access protected - */ - function XML_HTMLSax3_Tab(&$orig_obj, $orig_method) { - $this->orig_obj =& $orig_obj; - $this->orig_method = $orig_method; - } - /** - * Breaks the data up by linefeeds - * @param XML_HTMLSax3 - * @param string element data - * @access protected - */ - function breakData(&$parser, $data) { - $data = explode("\t",$data); - foreach ( $data as $chunk ) { - $this->orig_obj->{$this->orig_method}($this, $chunk); - } - } -} -/** -* Breaks up data by XML entities and parses them with html_entity_decode(), -* resulting in additional calls to the data handler
-* Requires PHP 4.3.0+ -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_Entities_Parsed { - /** - * Original handler object - * @var object - * @access private - */ - var $orig_obj; - /** - * Original handler method - * @var string - * @access private - */ - var $orig_method; - /** - * Constructs XML_HTMLSax3_Entities_Parsed - * @param object handler object being decorated - * @param string original handler method - * @access protected - */ - function XML_HTMLSax3_Entities_Parsed(&$orig_obj, $orig_method) { - $this->orig_obj =& $orig_obj; - $this->orig_method = $orig_method; - } - /** - * Breaks the data up by XML entities - * @param XML_HTMLSax3 - * @param string element data - * @access protected - */ - function breakData(&$parser, $data) { - $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); - foreach ( $data as $chunk ) { - $chunk = html_entity_decode($chunk,ENT_NOQUOTES); - $this->orig_obj->{$this->orig_method}($this, $chunk); - } - } -} -/** -* Compatibility with older PHP versions -*/ -if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) { - function html_entity_decode($str, $style=ENT_NOQUOTES) { - return strtr($str, - array_flip(get_html_translation_table(HTML_ENTITIES,$style))); - } -} -/** -* Breaks up data by XML entities but leaves them unparsed, -* resulting in additional calls to the data handler
-* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_Entities_Unparsed { - /** - * Original handler object - * @var object - * @access private - */ - var $orig_obj; - /** - * Original handler method - * @var string - * @access private - */ - var $orig_method; - /** - * Constructs XML_HTMLSax3_Entities_Unparsed - * @param object handler object being decorated - * @param string original handler method - * @access protected - */ - function XML_HTMLSax3_Entities_Unparsed(&$orig_obj, $orig_method) { - $this->orig_obj =& $orig_obj; - $this->orig_method = $orig_method; - } - /** - * Breaks the data up by XML entities - * @param XML_HTMLSax3 - * @param string element data - * @access protected - */ - function breakData(&$parser, $data) { - $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); - foreach ( $data as $chunk ) { - $this->orig_obj->{$this->orig_method}($this, $chunk); - } - } -} - -/** -* Strips the HTML comment markers or CDATA sections from an escape. -* If XML_OPTIONS_FULL_ESCAPES is on, this decorator is not used.
-* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_Escape_Stripper { - /** - * Original handler object - * @var object - * @access private - */ - var $orig_obj; - /** - * Original handler method - * @var string - * @access private - */ - var $orig_method; - /** - * Constructs XML_HTMLSax3_Entities_Unparsed - * @param object handler object being decorated - * @param string original handler method - * @access protected - */ - function XML_HTMLSax3_Escape_Stripper(&$orig_obj, $orig_method) { - $this->orig_obj =& $orig_obj; - $this->orig_method = $orig_method; - } - /** - * Breaks the data up by XML entities - * @param XML_HTMLSax3 - * @param string element data - * @access protected - */ - function strip(&$parser, $data) { - // Check for HTML comments first - if ( substr($data,0,2) == '--' ) { - $patterns = array( - '/^\-\-/', // Opening comment: -- - '/\-\-$/', // Closing comment: -- - ); - $data = preg_replace($patterns,'',$data); - - // Check for XML CDATA sections (note: don't do both!) - } else if ( substr($data,0,1) == '[' ) { - $patterns = array( - '/^\[.*CDATA.*\[/s', // Opening CDATA - '/\].*\]$/s', // Closing CDATA - ); - $data = preg_replace($patterns,'',$data); - } - - $this->orig_obj->{$this->orig_method}($this, $data); - } -} + Original port from Python | +// | Authors: Harry Fuecks Port to PEAR + more | +// | Authors: Many @ Sitepointforums Advanced PHP Forums | +// +----------------------------------------------------------------------+ +// +// $Id: Decorators.php 13349 2006-03-28 10:54:53Z jenst $ +// +/** +* Decorators for dealing with parser options +* @package XML_HTMLSax3 +* @version $Id: Decorators.php 13349 2006-03-28 10:54:53Z jenst $ +* @see XML_HTMLSax3::set_option +*/ +/** +* Trims the contents of element data from whitespace at start and end +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_Trim { + /** + * Original handler object + * @var object + * @access private + */ + var $orig_obj; + /** + * Original handler method + * @var string + * @access private + */ + var $orig_method; + /** + * Constructs XML_HTMLSax3_Trim + * @param object handler object being decorated + * @param string original handler method + * @access protected + */ + function XML_HTMLSax3_Trim(&$orig_obj, $orig_method) { + $this->orig_obj =& $orig_obj; + $this->orig_method = $orig_method; + } + /** + * Trims the data + * @param XML_HTMLSax3 + * @param string element data + * @access protected + */ + function trimData(&$parser, $data) { + $data = trim($data); + if ($data != '') { + $this->orig_obj->{$this->orig_method}($parser, $data); + } + } +} +/** +* Coverts tag names to upper case +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_CaseFolding { + /** + * Original handler object + * @var object + * @access private + */ + var $orig_obj; + /** + * Original open handler method + * @var string + * @access private + */ + var $orig_open_method; + /** + * Original close handler method + * @var string + * @access private + */ + var $orig_close_method; + /** + * Constructs XML_HTMLSax3_CaseFolding + * @param object handler object being decorated + * @param string original open handler method + * @param string original close handler method + * @access protected + */ + function XML_HTMLSax3_CaseFolding(&$orig_obj, $orig_open_method, $orig_close_method) { + $this->orig_obj =& $orig_obj; + $this->orig_open_method = $orig_open_method; + $this->orig_close_method = $orig_close_method; + } + /** + * Folds up open tag callbacks + * @param XML_HTMLSax3 + * @param string tag name + * @param array tag attributes + * @access protected + */ + function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE) { + $this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty); + } + /** + * Folds up close tag callbacks + * @param XML_HTMLSax3 + * @param string tag name + * @access protected + */ + function foldClose(&$parser, $tag, $empty = FALSE) { + $this->orig_obj->{$this->orig_close_method}($parser, strtoupper($tag), $empty); + } +} +/** +* Breaks up data by linefeed characters, resulting in additional +* calls to the data handler +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_Linefeed { + /** + * Original handler object + * @var object + * @access private + */ + var $orig_obj; + /** + * Original handler method + * @var string + * @access private + */ + var $orig_method; + /** + * Constructs XML_HTMLSax3_LineFeed + * @param object handler object being decorated + * @param string original handler method + * @access protected + */ + function XML_HTMLSax3_LineFeed(&$orig_obj, $orig_method) { + $this->orig_obj =& $orig_obj; + $this->orig_method = $orig_method; + } + /** + * Breaks the data up by linefeeds + * @param XML_HTMLSax3 + * @param string element data + * @access protected + */ + function breakData(&$parser, $data) { + $data = explode("\n",$data); + foreach ( $data as $chunk ) { + $this->orig_obj->{$this->orig_method}($parser, $chunk); + } + } +} +/** +* Breaks up data by tab characters, resulting in additional +* calls to the data handler +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_Tab { + /** + * Original handler object + * @var object + * @access private + */ + var $orig_obj; + /** + * Original handler method + * @var string + * @access private + */ + var $orig_method; + /** + * Constructs XML_HTMLSax3_Tab + * @param object handler object being decorated + * @param string original handler method + * @access protected + */ + function XML_HTMLSax3_Tab(&$orig_obj, $orig_method) { + $this->orig_obj =& $orig_obj; + $this->orig_method = $orig_method; + } + /** + * Breaks the data up by linefeeds + * @param XML_HTMLSax3 + * @param string element data + * @access protected + */ + function breakData(&$parser, $data) { + $data = explode("\t",$data); + foreach ( $data as $chunk ) { + $this->orig_obj->{$this->orig_method}($this, $chunk); + } + } +} +/** +* Breaks up data by XML entities and parses them with html_entity_decode(), +* resulting in additional calls to the data handler
+* Requires PHP 4.3.0+ +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_Entities_Parsed { + /** + * Original handler object + * @var object + * @access private + */ + var $orig_obj; + /** + * Original handler method + * @var string + * @access private + */ + var $orig_method; + /** + * Constructs XML_HTMLSax3_Entities_Parsed + * @param object handler object being decorated + * @param string original handler method + * @access protected + */ + function XML_HTMLSax3_Entities_Parsed(&$orig_obj, $orig_method) { + $this->orig_obj =& $orig_obj; + $this->orig_method = $orig_method; + } + /** + * Breaks the data up by XML entities + * @param XML_HTMLSax3 + * @param string element data + * @access protected + */ + function breakData(&$parser, $data) { + $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); + foreach ( $data as $chunk ) { + $chunk = html_entity_decode($chunk,ENT_NOQUOTES); + $this->orig_obj->{$this->orig_method}($this, $chunk); + } + } +} +/** +* Compatibility with older PHP versions +*/ +if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) { + function html_entity_decode($str, $style=ENT_NOQUOTES) { + return strtr($str, + array_flip(get_html_translation_table(HTML_ENTITIES,$style))); + } +} +/** +* Breaks up data by XML entities but leaves them unparsed, +* resulting in additional calls to the data handler
+* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_Entities_Unparsed { + /** + * Original handler object + * @var object + * @access private + */ + var $orig_obj; + /** + * Original handler method + * @var string + * @access private + */ + var $orig_method; + /** + * Constructs XML_HTMLSax3_Entities_Unparsed + * @param object handler object being decorated + * @param string original handler method + * @access protected + */ + function XML_HTMLSax3_Entities_Unparsed(&$orig_obj, $orig_method) { + $this->orig_obj =& $orig_obj; + $this->orig_method = $orig_method; + } + /** + * Breaks the data up by XML entities + * @param XML_HTMLSax3 + * @param string element data + * @access protected + */ + function breakData(&$parser, $data) { + $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); + foreach ( $data as $chunk ) { + $this->orig_obj->{$this->orig_method}($this, $chunk); + } + } +} + +/** +* Strips the HTML comment markers or CDATA sections from an escape. +* If XML_OPTIONS_FULL_ESCAPES is on, this decorator is not used.
+* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_Escape_Stripper { + /** + * Original handler object + * @var object + * @access private + */ + var $orig_obj; + /** + * Original handler method + * @var string + * @access private + */ + var $orig_method; + /** + * Constructs XML_HTMLSax3_Entities_Unparsed + * @param object handler object being decorated + * @param string original handler method + * @access protected + */ + function XML_HTMLSax3_Escape_Stripper(&$orig_obj, $orig_method) { + $this->orig_obj =& $orig_obj; + $this->orig_method = $orig_method; + } + /** + * Breaks the data up by XML entities + * @param XML_HTMLSax3 + * @param string element data + * @access protected + */ + function strip(&$parser, $data) { + // Check for HTML comments first + if ( substr($data,0,2) == '--' ) { + $patterns = array( + '/^\-\-/', // Opening comment: -- + '/\-\-$/', // Closing comment: -- + ); + $data = preg_replace($patterns,'',$data); + + // Check for XML CDATA sections (note: don't do both!) + } else if ( substr($data,0,1) == '[' ) { + $patterns = array( + '/^\[.*CDATA.*\[/s', // Opening CDATA + '/\].*\]$/s', // Closing CDATA + ); + $data = preg_replace($patterns,'',$data); + } + + $this->orig_obj->{$this->orig_method}($this, $data); + } +} ?> \ Pas de fin de ligne la fin du fichier. diff -Naur gallery-1.5.3/classes/XML_HTMLSax3/HTMLSax3/States.php gallery-1.5.4/classes/XML_HTMLSax3/HTMLSax3/States.php --- gallery-1.5.3/classes/XML_HTMLSax3/HTMLSax3/States.php 2006-03-28 12:54:52.000000000 +0200 +++ gallery-1.5.4/classes/XML_HTMLSax3/HTMLSax3/States.php 2006-03-28 12:54:53.000000000 +0200 @@ -1,287 +1,287 @@ - Original port from Python | -// | Authors: Harry Fuecks Port to PEAR + more | -// | Authors: Many @ Sitepointforums Advanced PHP Forums | -// +----------------------------------------------------------------------+ -// -// $Id: States.php,v 1.1.2.1 2006/03/28 10:54:52 jenst Exp $ -// -/** -* Parsing states. -* @package XML_HTMLSax3 -* @version $Id: States.php,v 1.1.2.1 2006/03/28 10:54:52 jenst Exp $ -*/ -/** -* Define parser states -*/ -define('XML_HTMLSAX3_STATE_STOP', 0); -define('XML_HTMLSAX3_STATE_START', 1); -define('XML_HTMLSAX3_STATE_TAG', 2); -define('XML_HTMLSAX3_STATE_OPENING_TAG', 3); -define('XML_HTMLSAX3_STATE_CLOSING_TAG', 4); -define('XML_HTMLSAX3_STATE_ESCAPE', 6); -define('XML_HTMLSAX3_STATE_JASP', 7); -define('XML_HTMLSAX3_STATE_PI', 8); -/** -* StartingState searches for the start of any XML tag -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_StartingState { - /** - * @param XML_HTMLSax3_StateParser subclass - * @return constant XML_HTMLSAX3_STATE_TAG - * @access protected - */ - function parse(&$context) { - $data = $context->scanUntilString('<'); - if ($data != '') { - $context->handler_object_data-> - {$context->handler_method_data}($context->htmlsax, $data); - } - $context->IgnoreCharacter(); - return XML_HTMLSAX3_STATE_TAG; - } -} -/** -* Decides which state to move one from after StartingState -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_TagState { - /** - * @param XML_HTMLSax3_StateParser subclass - * @return constant the next state to move into - * @access protected - */ - function parse(&$context) { - switch($context->ScanCharacter()) { - case '/': - return XML_HTMLSAX3_STATE_CLOSING_TAG; - break; - case '?': - return XML_HTMLSAX3_STATE_PI; - break; - case '%': - return XML_HTMLSAX3_STATE_JASP; - break; - case '!': - return XML_HTMLSAX3_STATE_ESCAPE; - break; - default: - $context->unscanCharacter(); - return XML_HTMLSAX3_STATE_OPENING_TAG; - } - } -} -/** -* Dealing with closing XML tags -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_ClosingTagState { - /** - * @param XML_HTMLSax3_StateParser subclass - * @return constant XML_HTMLSAX3_STATE_START - * @access protected - */ - function parse(&$context) { - $tag = $context->scanUntilCharacters('/>'); - if ($tag != '') { - $char = $context->scanCharacter(); - if ($char == '/') { - $char = $context->scanCharacter(); - if ($char != '>') { - $context->unscanCharacter(); - } - } - $context->handler_object_element-> - {$context->handler_method_closing}($context->htmlsax, $tag, FALSE); - } - return XML_HTMLSAX3_STATE_START; - } -} -/** -* Dealing with opening XML tags -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_OpeningTagState { - /** - * Handles attributes - * @param string attribute name - * @param string attribute value - * @return void - * @access protected - * @see XML_HTMLSax3_AttributeStartState - */ - function parseAttributes(&$context) { - $Attributes = array(); - - $context->ignoreWhitespace(); - $attributename = $context->scanUntilCharacters("=/> \n\r\t"); - while ($attributename != '') { - $attributevalue = NULL; - $context->ignoreWhitespace(); - $char = $context->scanCharacter(); - if ($char == '=') { - $context->ignoreWhitespace(); - $char = $context->ScanCharacter(); - if ($char == '"') { - $attributevalue= $context->scanUntilString('"'); - $context->IgnoreCharacter(); - } else if ($char == "'") { - $attributevalue = $context->scanUntilString("'"); - $context->IgnoreCharacter(); - } else { - $context->unscanCharacter(); - $attributevalue = - $context->scanUntilCharacters("> \n\r\t"); - } - } else if ($char !== NULL) { - $attributevalue = NULL; - $context->unscanCharacter(); - } - $Attributes[$attributename] = $attributevalue; - - $context->ignoreWhitespace(); - $attributename = $context->scanUntilCharacters("=/> \n\r\t"); - } - return $Attributes; - } - - /** - * @param XML_HTMLSax3_StateParser subclass - * @return constant XML_HTMLSAX3_STATE_START - * @access protected - */ - function parse(&$context) { - $tag = $context->scanUntilCharacters("/> \n\r\t"); - if ($tag != '') { - $this->attrs = array(); - $Attributes = $this->parseAttributes($context); - $char = $context->scanCharacter(); - if ($char == '/') { - $char = $context->scanCharacter(); - if ($char != '>') { - $context->unscanCharacter(); - } - $context->handler_object_element-> - {$context->handler_method_opening}($context->htmlsax, $tag, - $Attributes, TRUE); - $context->handler_object_element-> - {$context->handler_method_closing}($context->htmlsax, $tag, - TRUE); - } else { - $context->handler_object_element-> - {$context->handler_method_opening}($context->htmlsax, $tag, - $Attributes, FALSE); - } - } - return XML_HTMLSAX3_STATE_START; - } -} - -/** -* Deals with XML escapes handling comments and CDATA correctly -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_EscapeState { - /** - * @param XML_HTMLSax3_StateParser subclass - * @return constant XML_HTMLSAX3_STATE_START - * @access protected - */ - function parse(&$context) { - $char = $context->ScanCharacter(); - if ($char == '-') { - $char = $context->ScanCharacter(); - if ($char == '-') { - $context->unscanCharacter(); - $context->unscanCharacter(); - $text = $context->scanUntilString('-->'); - $text .= $context->scanCharacter(); - $text .= $context->scanCharacter(); - } else { - $context->unscanCharacter(); - $text = $context->scanUntilString('>'); - } - } else if ( $char == '[') { - $context->unscanCharacter(); - $text = $context->scanUntilString(']>'); - $text.= $context->scanCharacter(); - } else { - $context->unscanCharacter(); - $text = $context->scanUntilString('>'); - } - - $context->IgnoreCharacter(); - if ($text != '') { - $context->handler_object_escape-> - {$context->handler_method_escape}($context->htmlsax, $text); - } - return XML_HTMLSAX3_STATE_START; - } -} -/** -* Deals with JASP/ASP markup -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_JaspState { - /** - * @param XML_HTMLSax3_StateParser subclass - * @return constant XML_HTMLSAX3_STATE_START - * @access protected - */ - function parse(&$context) { - $text = $context->scanUntilString('%>'); - if ($text != '') { - $context->handler_object_jasp-> - {$context->handler_method_jasp}($context->htmlsax, $text); - } - $context->IgnoreCharacter(); - $context->IgnoreCharacter(); - return XML_HTMLSAX3_STATE_START; - } -} -/** -* Deals with XML processing instructions -* @package XML_HTMLSax3 -* @access protected -*/ -class XML_HTMLSax3_PiState { - /** - * @param XML_HTMLSax3_StateParser subclass - * @return constant XML_HTMLSAX3_STATE_START - * @access protected - */ - function parse(&$context) { - $target = $context->scanUntilCharacters(" \n\r\t"); - $data = $context->scanUntilString('?>'); - if ($data != '') { - $context->handler_object_pi-> - {$context->handler_method_pi}($context->htmlsax, $target, $data); - } - $context->IgnoreCharacter(); - $context->IgnoreCharacter(); - return XML_HTMLSAX3_STATE_START; - } -} + Original port from Python | +// | Authors: Harry Fuecks Port to PEAR + more | +// | Authors: Many @ Sitepointforums Advanced PHP Forums | +// +----------------------------------------------------------------------+ +// +// $Id: States.php 13349 2006-03-28 10:54:53Z jenst $ +// +/** +* Parsing states. +* @package XML_HTMLSax3 +* @version $Id: States.php 13349 2006-03-28 10:54:53Z jenst $ +*/ +/** +* Define parser states +*/ +define('XML_HTMLSAX3_STATE_STOP', 0); +define('XML_HTMLSAX3_STATE_START', 1); +define('XML_HTMLSAX3_STATE_TAG', 2); +define('XML_HTMLSAX3_STATE_OPENING_TAG', 3); +define('XML_HTMLSAX3_STATE_CLOSING_TAG', 4); +define('XML_HTMLSAX3_STATE_ESCAPE', 6); +define('XML_HTMLSAX3_STATE_JASP', 7); +define('XML_HTMLSAX3_STATE_PI', 8); +/** +* StartingState searches for the start of any XML tag +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_StartingState { + /** + * @param XML_HTMLSax3_StateParser subclass + * @return constant XML_HTMLSAX3_STATE_TAG + * @access protected + */ + function parse(&$context) { + $data = $context->scanUntilString('<'); + if ($data != '') { + $context->handler_object_data-> + {$context->handler_method_data}($context->htmlsax, $data); + } + $context->IgnoreCharacter(); + return XML_HTMLSAX3_STATE_TAG; + } +} +/** +* Decides which state to move one from after StartingState +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_TagState { + /** + * @param XML_HTMLSax3_StateParser subclass + * @return constant the next state to move into + * @access protected + */ + function parse(&$context) { + switch($context->ScanCharacter()) { + case '/': + return XML_HTMLSAX3_STATE_CLOSING_TAG; + break; + case '?': + return XML_HTMLSAX3_STATE_PI; + break; + case '%': + return XML_HTMLSAX3_STATE_JASP; + break; + case '!': + return XML_HTMLSAX3_STATE_ESCAPE; + break; + default: + $context->unscanCharacter(); + return XML_HTMLSAX3_STATE_OPENING_TAG; + } + } +} +/** +* Dealing with closing XML tags +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_ClosingTagState { + /** + * @param XML_HTMLSax3_StateParser subclass + * @return constant XML_HTMLSAX3_STATE_START + * @access protected + */ + function parse(&$context) { + $tag = $context->scanUntilCharacters('/>'); + if ($tag != '') { + $char = $context->scanCharacter(); + if ($char == '/') { + $char = $context->scanCharacter(); + if ($char != '>') { + $context->unscanCharacter(); + } + } + $context->handler_object_element-> + {$context->handler_method_closing}($context->htmlsax, $tag, FALSE); + } + return XML_HTMLSAX3_STATE_START; + } +} +/** +* Dealing with opening XML tags +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_OpeningTagState { + /** + * Handles attributes + * @param string attribute name + * @param string attribute value + * @return void + * @access protected + * @see XML_HTMLSax3_AttributeStartState + */ + function parseAttributes(&$context) { + $Attributes = array(); + + $context->ignoreWhitespace(); + $attributename = $context->scanUntilCharacters("=/> \n\r\t"); + while ($attributename != '') { + $attributevalue = NULL; + $context->ignoreWhitespace(); + $char = $context->scanCharacter(); + if ($char == '=') { + $context->ignoreWhitespace(); + $char = $context->ScanCharacter(); + if ($char == '"') { + $attributevalue= $context->scanUntilString('"'); + $context->IgnoreCharacter(); + } else if ($char == "'") { + $attributevalue = $context->scanUntilString("'"); + $context->IgnoreCharacter(); + } else { + $context->unscanCharacter(); + $attributevalue = + $context->scanUntilCharacters("> \n\r\t"); + } + } else if ($char !== NULL) { + $attributevalue = NULL; + $context->unscanCharacter(); + } + $Attributes[$attributename] = $attributevalue; + + $context->ignoreWhitespace(); + $attributename = $context->scanUntilCharacters("=/> \n\r\t"); + } + return $Attributes; + } + + /** + * @param XML_HTMLSax3_StateParser subclass + * @return constant XML_HTMLSAX3_STATE_START + * @access protected + */ + function parse(&$context) { + $tag = $context->scanUntilCharacters("/> \n\r\t"); + if ($tag != '') { + $this->attrs = array(); + $Attributes = $this->parseAttributes($context); + $char = $context->scanCharacter(); + if ($char == '/') { + $char = $context->scanCharacter(); + if ($char != '>') { + $context->unscanCharacter(); + } + $context->handler_object_element-> + {$context->handler_method_opening}($context->htmlsax, $tag, + $Attributes, TRUE); + $context->handler_object_element-> + {$context->handler_method_closing}($context->htmlsax, $tag, + TRUE); + } else { + $context->handler_object_element-> + {$context->handler_method_opening}($context->htmlsax, $tag, + $Attributes, FALSE); + } + } + return XML_HTMLSAX3_STATE_START; + } +} + +/** +* Deals with XML escapes handling comments and CDATA correctly +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_EscapeState { + /** + * @param XML_HTMLSax3_StateParser subclass + * @return constant XML_HTMLSAX3_STATE_START + * @access protected + */ + function parse(&$context) { + $char = $context->ScanCharacter(); + if ($char == '-') { + $char = $context->ScanCharacter(); + if ($char == '-') { + $context->unscanCharacter(); + $context->unscanCharacter(); + $text = $context->scanUntilString('-->'); + $text .= $context->scanCharacter(); + $text .= $context->scanCharacter(); + } else { + $context->unscanCharacter(); + $text = $context->scanUntilString('>'); + } + } else if ( $char == '[') { + $context->unscanCharacter(); + $text = $context->scanUntilString(']>'); + $text.= $context->scanCharacter(); + } else { + $context->unscanCharacter(); + $text = $context->scanUntilString('>'); + } + + $context->IgnoreCharacter(); + if ($text != '') { + $context->handler_object_escape-> + {$context->handler_method_escape}($context->htmlsax, $text); + } + return XML_HTMLSAX3_STATE_START; + } +} +/** +* Deals with JASP/ASP markup +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_JaspState { + /** + * @param XML_HTMLSax3_StateParser subclass + * @return constant XML_HTMLSAX3_STATE_START + * @access protected + */ + function parse(&$context) { + $text = $context->scanUntilString('%>'); + if ($text != '') { + $context->handler_object_jasp-> + {$context->handler_method_jasp}($context->htmlsax, $text); + } + $context->IgnoreCharacter(); + $context->IgnoreCharacter(); + return XML_HTMLSAX3_STATE_START; + } +} +/** +* Deals with XML processing instructions +* @package XML_HTMLSax3 +* @access protected +*/ +class XML_HTMLSax3_PiState { + /** + * @param XML_HTMLSax3_StateParser subclass + * @return constant XML_HTMLSAX3_STATE_START + * @access protected + */ + function parse(&$context) { + $target = $context->scanUntilCharacters(" \n\r\t"); + $data = $context->scanUntilString('?>'); + if ($data != '') { + $context->handler_object_pi-> + {$context->handler_method_pi}($context->htmlsax, $target, $data); + } + $context->IgnoreCharacter(); + $context->IgnoreCharacter(); + return XML_HTMLSAX3_STATE_START; + } +} ?> \ Pas de fin de ligne la fin du fichier. diff -Naur gallery-1.5.3/classes/XML_HTMLSax3/HTMLSax3.php gallery-1.5.4/classes/XML_HTMLSax3/HTMLSax3.php --- gallery-1.5.3/classes/XML_HTMLSax3/HTMLSax3.php 2006-03-28 12:54:52.000000000 +0200 +++ gallery-1.5.4/classes/XML_HTMLSax3/HTMLSax3.php 2006-03-28 12:54:53.000000000 +0200 @@ -19,12 +19,12 @@ // | Authors: Many @ Sitepointforums Advanced PHP Forums | // +----------------------------------------------------------------------+ // -// $Id: HTMLSax3.php,v 1.1.2.1 2006/03/28 10:54:52 jenst Exp $ +// $Id: HTMLSax3.php 13349 2006-03-28 10:54:53Z jenst $ // /** * Main parser components * @package XML_HTMLSax3 -* @version $Id: HTMLSax3.php,v 1.1.2.1 2006/03/28 10:54:52 jenst Exp $ +* @version $Id: HTMLSax3.php 13349 2006-03-28 10:54:53Z jenst $ */ /** * Required classes diff -Naur gallery-1.5.3/configure.sh gallery-1.5.4/configure.sh --- gallery-1.5.3/configure.sh 2004-06-09 23:48:15.000000000 +0200 +++ gallery-1.5.4/configure.sh 2004-06-09 23:48:15.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure.sh,v 1.11 2004/06/09 21:48:15 cryptographite Exp $ +# $Id: configure.sh 6290 2004-06-09 21:48:15Z cryptographite $ chmod 755 setup diff -Naur gallery-1.5.3/contrib/joomla/admin.gallery.html.php gallery-1.5.4/contrib/joomla/admin.gallery.html.php --- gallery-1.5.3/contrib/joomla/admin.gallery.html.php 2006-03-27 17:31:28.000000000 +0200 +++ gallery-1.5.4/contrib/joomla/admin.gallery.html.php 2006-03-27 17:32:14.000000000 +0200 @@ -20,7 +20,7 @@ * Gallery Component for Mambo Open Source CMS v4.5 or newer * Original author: Beckett Madden-Woods * - * $Id: admin.gallery.html.php,v 1.2.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: admin.gallery.html.php 13338 2006-03-27 15:32:14Z jenst $ */ class HTML_content { diff -Naur gallery-1.5.3/contrib/joomla/admin.gallery.php gallery-1.5.4/contrib/joomla/admin.gallery.php --- gallery-1.5.3/contrib/joomla/admin.gallery.php 2006-03-27 17:31:28.000000000 +0200 +++ gallery-1.5.4/contrib/joomla/admin.gallery.php 2006-03-27 17:32:14.000000000 +0200 @@ -20,7 +20,7 @@ * Gallery Component for Mambo Open Source CMS v4.5 or newer * Original author: Beckett Madden-Woods * - * $Id: admin.gallery.php,v 1.2.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: admin.gallery.php 13338 2006-03-27 15:32:14Z jenst $ */ defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' ); diff -Naur gallery-1.5.3/contrib/joomla/classes/mambo.php gallery-1.5.4/contrib/joomla/classes/mambo.php --- gallery-1.5.3/contrib/joomla/classes/mambo.php 2005-10-17 19:46:12.000000000 +0200 +++ gallery-1.5.4/contrib/joomla/classes/mambo.php 2005-10-17 19:46:13.000000000 +0200 @@ -1,5 +1,5 @@ * - * $Id: gallery.php,v 1.2.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: gallery.php 13338 2006-03-27 15:32:14Z jenst $ */ defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' ); diff -Naur gallery-1.5.3/contrib/joomla/gallery.xml gallery-1.5.4/contrib/joomla/gallery.xml --- gallery-1.5.3/contrib/joomla/gallery.xml 2006-03-27 17:31:28.000000000 +0200 +++ gallery-1.5.4/contrib/joomla/gallery.xml 2006-03-27 17:32:14.000000000 +0200 @@ -21,7 +21,7 @@ | Original author: Beckett Madden-Woods | Last author: Kai Tomalik | - | $Id: gallery.xml,v 1.3.2.1 2006/03/27 15:31:28 jenst Exp $ + | $Id: gallery.xml 13338 2006-03-27 15:32:14Z jenst $ --> Gallery diff -Naur gallery-1.5.3/contrib/joomla/includes/frontend.php gallery-1.5.4/contrib/joomla/includes/frontend.php --- gallery-1.5.3/contrib/joomla/includes/frontend.php 2005-10-17 19:46:12.000000000 +0200 +++ gallery-1.5.4/contrib/joomla/includes/frontend.php 2005-10-17 19:46:13.000000000 +0200 @@ -1,5 +1,5 @@ * - * $Id: toolbar.gallery.php,v 1.2.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: toolbar.gallery.php 13338 2006-03-27 15:32:14Z jenst $ */ require_once($mainframe->getPath('toolbar_default')); diff -Naur gallery-1.5.3/contrib/mambo/admin.gallery.html.php gallery-1.5.4/contrib/mambo/admin.gallery.html.php --- gallery-1.5.3/contrib/mambo/admin.gallery.html.php 2006-03-27 17:31:28.000000000 +0200 +++ gallery-1.5.4/contrib/mambo/admin.gallery.html.php 2006-03-27 17:32:14.000000000 +0200 @@ -20,7 +20,7 @@ * Gallery Component for Mambo Open Source CMS v4.5 or newer * Original author: Beckett Madden-Woods * - * $Id: admin.gallery.html.php,v 1.4.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: admin.gallery.html.php 13338 2006-03-27 15:32:14Z jenst $ */ class HTML_content { diff -Naur gallery-1.5.3/contrib/mambo/admin.gallery.php gallery-1.5.4/contrib/mambo/admin.gallery.php --- gallery-1.5.3/contrib/mambo/admin.gallery.php 2006-03-27 17:31:28.000000000 +0200 +++ gallery-1.5.4/contrib/mambo/admin.gallery.php 2006-03-27 17:32:14.000000000 +0200 @@ -20,7 +20,7 @@ * Gallery Component for Mambo Open Source CMS v4.5 or newer * Original author: Beckett Madden-Woods * - * $Id: admin.gallery.php,v 1.5.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: admin.gallery.php 13338 2006-03-27 15:32:14Z jenst $ */ defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' ); diff -Naur gallery-1.5.3/contrib/mambo/classes/mambo.php gallery-1.5.4/contrib/mambo/classes/mambo.php --- gallery-1.5.3/contrib/mambo/classes/mambo.php 2004-08-06 07:42:30.000000000 +0200 +++ gallery-1.5.4/contrib/mambo/classes/mambo.php 2004-08-06 07:42:31.000000000 +0200 @@ -1,5 +1,5 @@ * - * $Id: gallery.php,v 1.6.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: gallery.php 13338 2006-03-27 15:32:14Z jenst $ */ defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' ); diff -Naur gallery-1.5.3/contrib/mambo/gallery.xml gallery-1.5.4/contrib/mambo/gallery.xml --- gallery-1.5.3/contrib/mambo/gallery.xml 2006-03-27 17:31:28.000000000 +0200 +++ gallery-1.5.4/contrib/mambo/gallery.xml 2006-03-27 17:32:14.000000000 +0200 @@ -21,7 +21,7 @@ | Original author: Beckett Madden-Woods | Last author: Kai Tomalik | - | $Id: gallery.xml,v 1.7.2.1 2006/03/27 15:31:28 jenst Exp $ + | $Id: gallery.xml 13338 2006-03-27 15:32:14Z jenst $ --> Gallery diff -Naur gallery-1.5.3/contrib/mambo/includes/frontend.php gallery-1.5.4/contrib/mambo/includes/frontend.php --- gallery-1.5.3/contrib/mambo/includes/frontend.php 2004-04-23 18:11:42.000000000 +0200 +++ gallery-1.5.4/contrib/mambo/includes/frontend.php 2004-04-23 18:11:45.000000000 +0200 @@ -1,5 +1,5 @@ * - * $Id: toolbar.gallery.php,v 1.4.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: toolbar.gallery.php 13338 2006-03-27 15:32:14Z jenst $ */ require_once($mainframe->getPath('toolbar_default')); diff -Naur gallery-1.5.3/contrib/phpBB2/modules.php gallery-1.5.4/contrib/phpBB2/modules.php --- gallery-1.5.3/contrib/phpBB2/modules.php 2006-03-27 17:31:28.000000000 +0200 +++ gallery-1.5.4/contrib/phpBB2/modules.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: modules.php,v 1.10.2.1 2006/03/27 15:31:28 jenst Exp $ + * $Id: modules.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> session->username ." from ". $HTTP_SERVER_VARS['REMOTE_ADDR']); + gallery_syslog("Logout by ". $gallery->session->username ." from ". $_SERVER['REMOTE_ADDR']); $gallery->session->username = ''; $gallery->session->language = ''; destroyGallerySession(); diff -Naur gallery-1.5.3/docs/g1package/gallery1-install.credits.html gallery-1.5.4/docs/g1package/gallery1-install.credits.html --- gallery-1.5.3/docs/g1package/gallery1-install.credits.html 2006-04-10 04:16:35.000000000 +0200 +++ gallery-1.5.4/docs/g1package/gallery1-install.credits.html 2006-08-15 14:21:29.000000000 +0200 @@ -12,7 +12,7 @@ 

 
-$Id: credits.xml,v 1.5 2005/04/26 20:25:18 schultmc Exp $
+$Id: credits.xml 9896 2005-04-26 20:25:18Z schultmc $
 
 Many people have dedicated their time to making Gallery what it is
 today.  Here is a list of folks in alphabetical order who have
diff -Naur gallery-1.5.3/docs/g1package/gallery1-install.faq.a.html gallery-1.5.4/docs/g1package/gallery1-install.faq.a.html
--- gallery-1.5.3/docs/g1package/gallery1-install.faq.a.html	2006-04-10 04:16:37.000000000 +0200
+++ gallery-1.5.4/docs/g1package/gallery1-install.faq.a.html	2006-08-15 14:21:29.000000000 +0200
@@ -2,7 +2,7 @@
        How can I get the latest version of Gallery?
       
A.2. 
        How can I get the latest CVS version of Gallery?
-      
A.1.

+      A.1.

        How can I get the latest version of Gallery?
       

        There are two different 'latest' versions of Gallery. There is the version
@@ -14,7 +14,7 @@
        more current bugfixes and neat modifications. The version in CVS is
        typically pretty stable, since the developers use it to power their own
        personal Galleries, but it is bound to have the occasional major glitch.
-      
A.2.

+      
A.2.

        How can I get the latest CVS version of Gallery?
       

        The CVS binaries are a prerequisite. You can get them from cvshome.org.
diff -Naur gallery-1.5.3/docs/g1package/gallery1-install.faq.b.html gallery-1.5.4/docs/g1package/gallery1-install.faq.b.html
--- gallery-1.5.3/docs/g1package/gallery1-install.faq.b.html	2006-04-10 04:16:37.000000000 +0200
+++ gallery-1.5.4/docs/g1package/gallery1-install.faq.b.html	2006-08-15 14:21:29.000000000 +0200
@@ -10,7 +10,7 @@
       
B.5. 
        Where can I find the unzip and zipinfo
        binaries?
-      
B.1.

+      B.1.

        The setup page tells me that mod_rewrite is not installed. Since mod_rewrite is
        optional, how do I configure this option?
       

@@ -25,13 +25,13 @@
        For more information on mod_rewrite check out the
        Apache
        module mod_rewrite page.
-      
B.2.

+      
B.2.

        Does Gallery work under Windows?
       

        Many people have gotten Gallery to work under Windows using Apache.  However,
        Gallery does not interact well with IIS, because PHP still has some issues
        with executing programs like NetPBM and ImageMagick.
-      
B.3.

+      
B.3.

        How do I run PHP as a CGI?
       

        Running PHP as a CGI is usually done when PHP is not available on your
@@ -79,7 +79,7 @@
        directory.  It is extremely difficult to provide support for
        this, because there are many things that can go wrong and it's hard to
        diagnose the problem.
-      
B.4.

+      
B.4.

        How do I force .php files to use PHP4?
       

        In the rare case that your ISP has PHP3 and PHP4 installed on the same server,
@@ -91,7 +91,7 @@
          ForceType application/x-httpd-php
         </Files>

-

B.5.

+

B.5.

Where can I find the unzip and zipinfo binaries?

diff -Naur gallery-1.5.3/docs/g1package/gallery1-install.faq.c.html gallery-1.5.4/docs/g1package/gallery1-install.faq.c.html --- gallery-1.5.3/docs/g1package/gallery1-install.faq.c.html 2006-04-10 04:16:38.000000000 +0200 +++ gallery-1.5.4/docs/g1package/gallery1-install.faq.c.html 2006-08-15 14:21:30.000000000 +0200 @@ -116,7 +116,7 @@

C.42. When I open Gallery inside Mambo, i get "Gallery seems to be inside Mambo, but we couldn't get the necessary info." What am i or my visitors doing wrong? -
C.1.

+ C.1.

When I try to access the configuration wizard, I get a 500 Internal Server Error. What's up?

@@ -134,7 +134,7 @@ If you don't have access to your httpd.conf, delete the .htaccess file in the setup/ directory. -

C.2.

+

C.2.

I've installed Gallery and all seems well. But when I try to upload an image it says Unable to make thumbnail(0) or Invalid image. What gives? @@ -215,7 +215,7 @@

If you still can't find a solution, try asking in the Gallery Support Forums. -

C.3.

+

C.3.

My ISP has a really old version of PHP, something before 4.0.4pl1, which Gallery can't work with. What do I do?

@@ -224,14 +224,14 @@ probably contains security problems. Your only other good option is to install PHP as a CGI, as in FAQ B.3 -

C.4.

+

C.4.

Whenever I try to upload grayscale JPEG images I get a Unable to make thumbnail error. Why?

This is a bug in some versions of NetPBM that cause it to choke on grayscale images. This is fixed in the version of NetPBM available on the Gallery download page. -

C.5.

+

C.5.

Whenever I try to upload an image in Gallery, I get all these errors about safe mode. How can I fix this?

@@ -249,7 +249,7 @@ Find another host that doesn't use safe mode. Some are listed in the Gallery Hosting Referrals Page -

C.6.

+

C.6.

Why can't I upload big files (over a megabyte or two)?

Craig Goranson wrote a very informative @@ -271,14 +271,14 @@ you want (until you hit upload_max_filesize and/or post_max_size -- see the above email link for more information). -

C.7.

+

C.7.

When I try to run configure.sh, I get an error like this: chmod: getting attributes of `setup\r': No such file or directory How do I fix that?

The answer is to simply upload the configure.sh file in ASCII FTP mode -

C.8.

+

C.8.

When I try to click on the "[login]" link on the Gallery page, nothing happens (no window pops up). What's wrong?

@@ -299,7 +299,7 @@ (note the "www" is missing), you'll still see your Gallery, but you'll experience this problem. The solution is to pick one hostname and stick with it. -

C.9.

+

C.9.

When I try to login, everything seems to go correctly, but Gallery doesn't log me in?

@@ -346,7 +346,7 @@ you need to use the one that is specified in your configuration. If you use the one that's not specified, you may be unable to login. Another remedy for this issue is to follow the instructions in FAQ C.22 -

C.10.

+

C.10.

Why do I see Warning: Undefined variable: GALLERY_BASEDIR... at the top of the page?

@@ -367,7 +367,7 @@ 

         php_value error_reporting 2039

-

C.11.

+

C.11.

I can successfully upload photos, but when I look in my album all I see are broken image icons. Why?

@@ -375,7 +375,7 @@ wizard. You can fix this by re-running the config wizard and correcting the Albums URL value or you can edit the config.php file and fix the $gallery->app->albumDirURL variable. -

C.12.

+

C.12.

Why do I get Failed opening 'html_wrap/inline_albumthumb.header.default'

If you unzipped/untarred the Gallery script on a Mac running OS 9.2.1 @@ -389,7 +389,7 @@ will solve this. This is only a problem if its untarred/gzipped on a Mac. If they are unzipped on the server they will work fine. [Thanks James O'Donnell] -

C.13.

+

C.13.

Why do I see this error: 

         jpegtopnm: WRITING PPM FILE
@@ -403,7 +403,7 @@
         
  • 
          Your NetPBM binaries have a bug.  Please use the NetPBM binaries found
          on the Gallery Download Page.
-        
    • C.14.
    
+        
    C.14.
    
        Why, when I try to upload images, does it say No images uploaded
        ?
       
    
@@ -417,7 +417,7 @@
          file_uploads isn't enabled, then you won't be able
          to upload images to Gallery, and you should talk to your system
          administrator.
-        
    C.15.
    
+        
    C.15.
    
        Why do I get this error: Warning: fopen(".../albums/team/album.dat.lock","a+")
        or Your Userfile is not writeable?
       
    
@@ -440,7 +440,7 @@
        directory 777.  Make sure you chmod the .users
        directory, which can sometimes be hidden from view.  See 
        FAQ C.19 for more details
-      
    C.16.
    
+      
    C.16.
    
        Why do I get the error Allowed memory size of Xxx bytes exhausted
        ?
       
    
@@ -459,7 +459,7 @@
          When adding that line to .htaccess, you must use a 
          number, in bytes.  For example, 8MB would be about 8000000 bytes.
         
    
-      
    C.17.
    
+      
    C.17.
    
        Why do I get pnmtojpeg: No such file or directory when uploading
        images?
       
    
@@ -483,7 +483,7 @@
         
  • 
          Upgrade to Gallery v1.3.4 which lets you specify which one you have in
          the config wizard.
-        
    • C.18.
    
+        
    C.18.
    
        Why do I get this warning: Your script possibly relies on a
        session side-effect which existed until PHP 4.2.3?
       
    
@@ -504,7 +504,7 @@

    This should be fixed in future versions of Gallery. -

    C.19.

    +

    C.19.

    Why, when I try to upload a .htaccess and chmod it with my FTP client, it "disappears"?

    @@ -517,7 +517,7 @@ for Chmod with WS_FTP. If you use CuteFTP, see this thread in the forums. -

    C.20.

    +

    C.20.

    Why does uploading pictures on my RedHat 8.0 system result in an error or scewed picture?

    @@ -530,7 +530,7 @@ this thread in the forums. Keep in mind that these are merely workarounds. The best option is to upgrade your PHP version to the latest from http://www.php.net/ -

    C.21.

    +

    C.21.

    Why doesn't Gallery work correctly on my RedHat 9.0 system?

    As in Red Hat Linux versions since 8.0, the default web server is Apache @@ -542,7 +542,7 @@ http://www.php.net/. See this forum post for information on how to compile PHP. -

    C.22.

    +

    C.22.

    How do I use Gallery both from inside my LAN and the internet?

    Note

    There is a fix planned for future versions of Gallery to allow the config @@ -598,7 +598,7 @@ Linux/Unix /etc/hosts

    -

    C.23.

    +

    C.23.

    I'm running Gallery 1.3.4, PHP 4.0.4 and I get Call to undefined function: array_search() in view_photo.php?

    @@ -622,7 +622,7 @@

    Note

    This has been fixed in Gallery 1.4.0 -

    C.24.

    +

    C.24.

    Why, when I edit an album or photo's text, do quotation marks appear as \' (e.g. John Doe\'s Album)?

    @@ -634,7 +634,7 @@

    Note

    As of Gallery 1.4.0, Gallery will strip the slashes from fields so that this does not happen, even if magic_quotes_gpc is on. -

    C.25.

    +

    C.25.

    I can't extract a .tar.gz file on my Windows machine. Why not?

    @@ -650,12 +650,12 @@

  • Unzip once more

    • -

    C.26.

    +

    C.26.

    Why do I get an EOF / read error reading magic number error when uploading pictures with NetPBM?

    Please see FAQ c.2 -

    C.27.

    +

    C.27.

    Why do I get errors like this: Warning: open_basedir restriction in effect. File is in wrong directory in /home/johndoe/public_html/gallery/platform/fs_unix.php on line 53?

    @@ -664,20 +664,20 @@ Basically, your host has misconfigured this directive and not added the directory where Gallery is located to the directories where PHP can access and modify files. You'll need to contact them and ask them to add the directory where your website files are located. -

    C.28.

    +

    C.28.

    Why do I get this error: Warning: write failed: No space left on device (28) in Unknown on line 0?

    Your host setup a quota for the web server user. Though your account may still have space left, the quota for the web server user has been overrun. Basically, you'll need to contact your host and ask them to cleanup the filesystem and/or adjust the quota. If you are your host, adjust the quota using edquota. -

    C.29.

    +

    C.29.

    Why do I get this error: Warning: exec() has been disabled for security reasons?

    Basically, this is a form of safe mode. Gallery requires functions like exec() to perform operations on images. The steps to "fix" this problem are the same as in FAQ C.5. -

    C.30.

    +

    C.30.

    Why can't I upload images using ImageMagick on FreeBSD?

    The default install of ImageMagick on FreeBSD doesn't seem to compile with some @@ -699,7 +699,7 @@ Then uninstall ImageMagick via ports (make deinstall clean) and reinstall it (make install clean)

    -

    C.31.

    +

    C.31.

    How do I put my Gallery into debug mode?

    There are two ways, each pretty much equal in simplicity. @@ -725,7 +725,7 @@

    And change "no" to "yes" This will enable some extra debugging features and turn up PHP's error reporting level. -

    C.32.

    +

    C.32.

    I have uploaded the NetPBM or ImageMagick binaries to my site, but I don't know the absolute path to specify in the configuration wizard. What do I do? @@ -742,7 +742,7 @@

    View this file via the web (for example: http://www.example.com/gallery/ netpbm/test.php). It will tell you the absolute path to specify. -

    C.33.

    +

    C.33.

    When I try to enter an album, I get a 404 error. What's up?

    One of two things in happening @@ -762,7 +762,7 @@

    Voila! The URLs should work correctly now.

    -

    C.34.

    +

    C.34.

    I changed a value on Step 3 of the configuration wizard (or in config.php), but the change isn't taking effect. What's going on?

    @@ -774,7 +774,7 @@ Select "properties" from the <<admin options>> pulldown. Then, in the popup window you will be able to change the properties for that album. -

    C.35.

    +

    C.35.

    Can I host images on another server to conserve space?

    The straight answer is no. Gallery must have the images on the local @@ -789,7 +789,7 @@ will attempt to use the images on the server with lots of bandwidth, so that the local server doesn't suffer so much. More information is available in the mirroring tutorial. -

    C.36.

    +

    C.36.

    Why do I get errors with email on Windows?

    If you go to http://www.example.com/gallery/setup/check_mail.php and it gives you the following @@ -824,7 +824,7 @@ SMTP = smtp.server.com sendmail_from = youremail@server.com

    -

    C.37.

    +

    C.37.

    I've forgotten my admin password! How can I reset it?

    Version 1.4.3 or below: Resetting your admin password is easy; @@ -837,7 +837,7 @@ and you will be required to edit the resetadmin file, add the string, save, and refresh your browser. This is a security measure to prove that you are an administrator. -

    C.38.

    +

    C.38.

    Why are my picture frames screwed up?

    If you have a file called gallery/css/embedded_style.css (ie @@ -863,7 +863,7 @@ If you didn't touch the CSS or frame files, this probably means that you didn't override the files upon upgrade. Make sure that your FTP client overrides the old files and upgrades to the new ones. -

    C.39.

    +

    C.39.

    Why do I get this error: Fatal error: session_start(): Failed to initialize storage module: user...?

    @@ -876,7 +876,7 @@

    This should fix it if you host allows you to edit PHP directives in .htaccess. If not, you may need to contact them to get it changed globally. -

    C.40.

    +

    C.40.

    I need to remove my albums directory, but I can't since the webserver user owns the files. What can I do?

    @@ -885,7 +885,7 @@ here: Gallery Utilities ("Bharat's Cleanup Script"). Instructions are included in the top of the file. -

    C.41.

    +

    C.41.

    Why is my Gallery blue?!

    As of Gallery 1.5, the CSS system has changed. There is a base.css @@ -894,7 +894,7 @@ Finally, there is embedded.css which loads when your gallery is embedded in another program. To change the color of your gallery, you can edit the appropriate CSS file or select a skin in the configuration wizard. -

    C.42.

    +

    C.42.

    When I open Gallery inside Mambo, i get "Gallery seems to be inside Mambo, but we couldn't get the necessary info." What am i or my visitors doing wrong?

    diff -Naur gallery-1.5.3/docs/g1package/gallery1-install.faq.d.html gallery-1.5.4/docs/g1package/gallery1-install.faq.d.html --- gallery-1.5.3/docs/g1package/gallery1-install.faq.d.html 2006-04-10 04:16:38.000000000 +0200 +++ gallery-1.5.4/docs/g1package/gallery1-install.faq.d.html 2006-08-15 14:21:30.000000000 +0200 @@ -8,7 +8,7 @@ (comment, images, etc..)?

    D.4. Something went wrong, it's not working! What do I do? -
    D.1.

    + D.1.

    How can I migrate my Gallery from one host to another?

    Warning

    If you are moving between a Windows and non-Windows host, please @@ -52,14 +52,14 @@ the albums directory you just uploaded, not a blank directory, as you would on a clean install of Gallery. After you secure Gallery, all your data should show up intact! -

    D.2.

    +

    D.2.

    Why do I get this error after migration: Warning: fopen ('.../albums/foo/album.dat.lock', 'a+')?

    This is caused by not recursively chmodding the new albums directory 0777. See FAQ C.15 for information on how to fix this. -

    D.3.

    +

    D.3.

    Will moving my Gallery to another host cause me to lose data (comment, images, etc..)?

    @@ -67,7 +67,7 @@ , there should be no lose of data whatsoever. However, because of Murphy's law, it's a good idea not to delete your albums directory on your old host before you know everything is working on the new host. -

    D.4.

    +

    D.4.

    Something went wrong, it's not working! What do I do?

    First, try again. Make sure you follow all the instructions in diff -Naur gallery-1.5.3/docs/g1package/html.css gallery-1.5.4/docs/g1package/html.css --- gallery-1.5.3/docs/g1package/html.css 2006-04-10 04:16:41.000000000 +0200 +++ gallery-1.5.4/docs/g1package/html.css 2006-08-15 14:21:31.000000000 +0200 @@ -1,5 +1,5 @@ /* -$Id: html.css,v 1.1 2003/08/16 17:23:47 alindeman Exp $ +$Id: html.css 3633 2003-08-16 17:23:47Z alindeman $ */ .question { font-weight: bold } diff -Naur gallery-1.5.3/docs/g1package/index.html gallery-1.5.4/docs/g1package/index.html --- gallery-1.5.3/docs/g1package/index.html 2006-04-10 04:16:40.000000000 +0200 +++ gallery-1.5.4/docs/g1package/index.html 2006-08-15 14:21:31.000000000 +0200 @@ -1,6 +1,6 @@ -Gallery Manual

    Gallery Manual
    Next

    Authors

    Bharat Mediratta
    Gaile Elliott
    Christian Mohn
    Andrew Lindeman
    Joan McGalliard
    Pierre-Luc Paour
    Beckett Madden-Woods
    Jens Tkotz

    Edited by

    Michael Schultheiss

    Copyright 2003-2005 Gallery Documentation Group

    +Gallery Manual

    Gallery Manual
    Next

    Authors

    Bharat Mediratta
    Gaile Elliott
    Christian Mohn
    Andrew Lindeman
    Joan McGalliard
    Pierre-Luc Paour
    Beckett Madden-Woods
    Jens Tkotz

    Edited by

    Michael Schultheiss

    Copyright 2003-2005 Gallery Documentation Group

    This guide is distributed under the terms of the GNU General Public License.

    Table of Contents

    1. Gallery 1.x Installation Guide
    Overview
    Features
    Credits
    Installation Requirements
    Installing on a Unix/Linux Server with FTP
    Installing on a Unix/Linux Server with Shell Access
    Installing on a Windows Server (Apache)
    Installing on a Windows Server (IIS)
    Upgrading a Previous Gallery Installation
    Getting Additional Help
    Installing Required Programs
    Installing (or updating) Gallery Remote Applets
    Installing Language Packs
    The Configuration Wizard
    Frequently Asked Questions
    2. Gallery 1.x Administration Guide
    Basics
    Users and Permissions
    Embedding Gallery
    Securing Gallery
    Performance Tips
    Backup and Restore
    Creating an Offline Copy
    Patching your Gallery
    Mirroring Gallery
    3. Gallery 1.x User's Guide
    Importing into gallery
    Watermarking

    - Documentation last generated on: Sun Apr 9 22:16:32 EDT 2006 + Documentation last generated on: Tue Aug 15 14:21:27 CEST 2006

    Next
    Chapter1.Gallery 1.x Installation Guide
    diff -Naur gallery-1.5.3/docs/html.css gallery-1.5.4/docs/html.css --- gallery-1.5.3/docs/html.css 2004-04-15 00:38:47.000000000 +0200 +++ gallery-1.5.4/docs/html.css 2004-04-15 00:38:47.000000000 +0200 @@ -1,5 +1,5 @@ /* -$Id: html.css,v 1.3 2004/04/14 22:38:47 alindeman Exp $ +$Id: html.css 5828 2004-04-14 22:38:47Z alindeman $ */ .question { font-weight: bold } diff -Naur gallery-1.5.3/download.php gallery-1.5.4/download.php --- gallery-1.5.3/download.php 2006-03-27 17:31:25.000000000 +0200 +++ gallery-1.5.4/download.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * -* $Id: download.php,v 1.4.2.1 2006/03/27 15:31:25 jenst Exp $ +* $Id: download.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> album->getPhoto($ecard['photoIndex']); + + if(!$photo = $gallery->album->getPhoto($ecard['photoIndex'])) { + echo gallery_error($errortext); + echo "\n

    "; + echo galleryLink(makeGalleryUrl(), "Back to Gallery"); + exit; + } /* Get the dimensions of the sized Photo */ list($width, $height) = $photo->getDimensions(0, false); @@ -78,12 +85,7 @@ $ecard["image_name"] = $photo->getPhotoPath($gallery->album->fields['name'], false); } } -doctype(); -?> - - - <?php echo _("Send this photo as eCard") ?> - +?> - - - -
    -
    - album->getThumbnailTag($photoIndex); diff -Naur gallery-1.5.3/ecard_preview.php gallery-1.5.4/ecard_preview.php --- gallery-1.5.3/ecard_preview.php 2006-03-27 17:31:25.000000000 +0200 +++ gallery-1.5.4/ecard_preview.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: ecard_preview.php,v 1.4.2.1 2006/03/27 15:31:25 jenst Exp $ + * $Id: ecard_preview.php 13338 2006-03-27 15:32:14Z jenst $ */ ?>
    - "theform"), - array("type" => "popup")); +
    "; +echo makeFormIntro('edit_appearance.php', + array("name" => "theform"), + array('type' => 'popup', 'initialtab' => $initialtab)); foreach ($properties as $key => $val) { if(!empty($val['skip'])) { @@ -258,7 +258,7 @@ } else { $display = 'none'; } - echo "\n
    "; + echo "\n
    "; echo make_separator($key, $val); echo "\n"; continue; diff -Naur gallery-1.5.3/edit_caption.php gallery-1.5.4/edit_caption.php --- gallery-1.5.3/edit_caption.php 2006-03-27 17:31:25.000000000 +0200 +++ gallery-1.5.4/edit_caption.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: edit_caption.php,v 1.69.2.1 2006/03/27 15:31:25 jenst Exp $ + * $Id: edit_caption.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> +app->galleryTitle // - Album Title: $gallery->album->fields["title"] // -// $Id: album.header.default,v 1.19 2005/08/15 23:01:22 jenst Exp $ +// $Id: album.header.default 11373 2005-08-15 23:01:22Z jenst $ ?> + + +How to create new frames
    + album->fields['name']}&id=$id"; diff -Naur gallery-1.5.3/layout/commentbox.inc gallery-1.5.4/layout/commentbox.inc --- gallery-1.5.3/layout/commentbox.inc 2005-10-17 19:46:12.000000000 +0200 +++ gallery-1.5.4/layout/commentbox.inc 2005-10-17 19:46:13.000000000 +0200 @@ -1,4 +1,4 @@ - + + diff -Naur gallery-1.5.3/layout/commentdraw.inc gallery-1.5.4/layout/commentdraw.inc --- gallery-1.5.3/layout/commentdraw.inc 2005-06-19 15:44:35.000000000 +0200 +++ gallery-1.5.4/layout/commentdraw.inc 2005-06-19 15:44:36.000000000 +0200 @@ -1,4 +1,4 @@ - + + + + +
    diff -Naur gallery-1.5.3/layout/navtableend.inc gallery-1.5.4/layout/navtableend.inc --- gallery-1.5.3/layout/navtableend.inc 2004-06-15 02:53:09.000000000 +0200 +++ gallery-1.5.4/layout/navtableend.inc 2004-06-15 02:53:32.000000000 +0200 @@ -1,4 +1,4 @@ - +
    diff -Naur gallery-1.5.3/layout/navtablemiddle.inc gallery-1.5.4/layout/navtablemiddle.inc --- gallery-1.5.3/layout/navtablemiddle.inc 2004-06-15 02:53:09.000000000 +0200 +++ gallery-1.5.4/layout/navtablemiddle.inc 2004-06-15 02:53:32.000000000 +0200 @@ -1,4 +1,4 @@ - + diff -Naur gallery-1.5.3/layout/searchdraw.inc gallery-1.5.4/layout/searchdraw.inc --- gallery-1.5.3/layout/searchdraw.inc 2004-10-20 00:07:30.000000000 +0200 +++ gallery-1.5.4/layout/searchdraw.inc 2004-10-20 00:07:35.000000000 +0200 @@ -1,4 +1,4 @@ - + fields['name']}&field=$field"; // should replace with & for validatation $buf .= ' '; - $buf .= popup_link( "[". sprintf(gTranslate('common', "edit %s"), _($field)) . "]", $url) ; + $buf .= popup_link( "[". sprintf(gTranslate('common', "edit %s"), gTranslate('common', $field)) . "]", $url) ; $buf .= ''; } return $buf; @@ -56,7 +56,7 @@ if (($gallery->user->canChangeTextOfAlbum($album) || ($gallery->album->getItemOwnerModify() && - $gallery->album->isItemOwner($gallery->user->getUid(), $index))) && + $gallery->album->isItemOwner($gallery->user->getUid(), $index))) && !$gallery->session->offline) { if (empty($buf)) { @@ -139,7 +139,7 @@ "> -$highlightTag "; $tree[] = array( 'albumUrl' => $albumUrl, - 'albumName' => $myName, + 'albumName' => $myName, 'titel' => $title, 'clicksText' => $clicksText, 'microthumb' => $microthumb, @@ -595,10 +595,10 @@ } /** - * This is either a wrapper around fs_file_size(), + * This is either a wrapper around fs_file_size(), * or just a formatter for a filesize given in bytes. * Return a human readable filesize. - * + * * @param string $filesize if omitted, function gets filesize of given filename * @param string $filename * @return string the formated filesize @@ -610,7 +610,7 @@ if($filesize == 0 || $filename != '') { $filesize = fs_filesize($filename); } - + $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); $unit_count = (count($units) - 1); @@ -909,7 +909,7 @@ return ''; } if ($gallery->app->comments_indication_verbose == 'yes') { - $ret = "
    ". + $ret = "
    ". sprintf(gTranslate('common', "Last comment %s."), strftime($gallery->app->dateString, $lastCommentDate)); } else { $ret= '*'; @@ -935,7 +935,7 @@ $dir = "$base/skins"; $opts['none'] = gTranslate('common', "No Skin"); $descriptions = '
    '; - $name = "". + $name = "". gTranslate('common', "No Skin") . ""; $descriptions .= sprintf("
    %s
    ", $name); $descriptions .= '
    '. gTranslate('common', "The original look and feel.") .'
    '; @@ -970,9 +970,11 @@ $opts[$file]=$name; if (fs_file_exists("$dir/$file/images/screenshot.jpg")) { $screenshot = $base_url . "/skins/$file/images/screenshot.jpg"; - } elseif (fs_file_exists("$dir/$file/images/screenshot.gif")) { + } + elseif (fs_file_exists("$dir/$file/images/screenshot.gif")) { $screenshot = $base_url . "/skins/$file/images/screenshot.gif"; - } else { + } + else { $screenshot = ''; } @@ -1015,14 +1017,14 @@ 'dots' => gTranslate('common', "Dots"), 'solid' => gTranslate('common', "Solid"), ); - + $descriptions="
    " . "
    " . popup_link(gTranslate('common', "None"), "frame_test.php?frame=none", 1) . "
    ". gTranslate('common', "No frames")."
    " . "
    " . popup_link(gTranslate('common', "Dots"), "frame_test.php?frame=dots", 1) . "
    ". gTranslate('common', "Just a simple dashed border around the thumb.")."
    " . "
    " . popup_link(gTranslate('common', "Solid"), "frame_test.php?frame=solid", 1) . "
    ". gTranslate('common', "Just a simple solid border around the thumb.")."
    " ; - + $dir = $GALLERY_BASE . '/html_wrap/frames'; - + if (fs_is_dir($dir) && is_readable($dir) && $fd = fs_opendir($dir)) { while ($file = readdir($fd)) { $subdir = "$dir/$file"; @@ -1038,7 +1040,7 @@ $description = $file; } $opts[$file] = $name; - $descriptions.="\n
    " . popup_link($name, "frame_test.php?frame=$file", 1) . "
    $description
    "; + $descriptions.="\n
    " . popup_link($name, "frame_test.php?frame=$file", 1) . "
    $description
    "; } else { if (false && isDebugging()) { echo gallery_error(sprintf(gTranslate('common', "Skipping %s."), @@ -1095,7 +1097,7 @@ /** * Generates a link to w3c validator - * + * * @param string $file file to validate, relative to gallery dir * @param boolean $valid true/false wether we know the result ;) * @param array $arg optional array with urlargs @@ -1140,7 +1142,7 @@ urlencode(eregi_replace("&", "&", makeAlbumURL($album, $photo, $args))). '"> Valid HTML 4.01!'; - + if (!$valid) { $link .= gTranslate('common', "Not valid yet"); } @@ -1172,10 +1174,10 @@ function showImageMap($index) { global $gallery; - + $allImageAreas = $gallery->album->getAllImageAreas($index); $html = ''; - + if (!empty($allImageAreas)) { $html .= "\n". ''; foreach($allImageAreas as $nr => $area) { @@ -1216,7 +1218,7 @@ } } $html .= '>'; - + return $html; } diff -Naur gallery-1.5.3/lib/Form.php gallery-1.5.4/lib/Form.php --- gallery-1.5.3/lib/Form.php 2006-04-06 13:21:49.000000000 +0200 +++ gallery-1.5.4/lib/Form.php 2006-08-14 09:49:09.000000000 +0200 @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: Form.php,v 1.32.2.3 2006/04/06 11:21:49 jenst Exp $ + * $Id: Form.php 14311 2006-08-14 07:49:09Z jenst $ */ ?> -'. _("Check All") . ' + '. gTranslate('common', "Check All") . ' - - '. _("Clear All") . ' + '. gTranslate('common', "Clear All") . ' - - '. _("Invert Selection") .''; + '. gTranslate('common', "Invert Selection") .''; return $buf; } @@ -103,7 +103,7 @@ } } } - + return $attrs; } @@ -120,7 +120,7 @@ $sel = ' selected'; } } - else if ($value == $selected || $text == $selected || $selected === '__ALL__') { + else if ($value == $selected || $text === $selected || $selected === '__ALL__') { $sel = ' selected'; } $buf .= "" . $crlf; @@ -139,7 +139,7 @@ } $attrs = generateAttrs($attrList); - + $buf = "'; - $html .= ' '; - $html .= "". $imgColorpicker .''; - $html .= '
    '; - $html .= ''; + $html = "\n"; + $html .= "\n"; + $html .= "\n". ''; + $html .= "\n". ''; + $html .= "\n'; + $html .= "\n". ''; + $html .= "\n
    ". $imgColorpicker .'
    \n"; return $html; } diff -Naur gallery-1.5.3/lib/imageManipulation.php gallery-1.5.4/lib/imageManipulation.php --- gallery-1.5.3/lib/imageManipulation.php 2006-03-27 17:31:30.000000000 +0200 +++ gallery-1.5.4/lib/imageManipulation.php 2006-05-02 11:59:13.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: imageManipulation.php,v 1.12.2.1 2006/03/27 15:31:30 jenst Exp $ + * $Id: imageManipulation.php 13579 2006-05-02 09:59:13Z jenst $ */ /** @@ -93,7 +93,10 @@ } processingMsg("   ". sprintf(_("target file size %d kbytes"), $target_fs)."\n"); + $loop = 0; do { + $loop ++; + processingMsg("Loop: $loop"); compressImage($src, $out, $target, $quality, $keepProfiles, $createThumbnail); $prev_quality = $quality; @@ -684,7 +687,7 @@ global $gallery; static $ImVersion; - if (empty($src) || empty($dest) || empty($targetSize)) { + if (empty($src) || empty($dest)) { echo gallery_error(_("Not all necessary params for resizing given.")); echo debugMessage(sprintf(_("Resizing params: src: %s, dest : %s, targetSize: %s"), $src, $dest, $targetSize), __FILE__, __LINE__); return false; @@ -697,17 +700,25 @@ } if ($targetSize === 'off') { - $targetSize = ''; + $targetSize = 0; } + $srcFile = fs_import_filename($src); $destFile = fs_import_filename($dest); switch($gallery->app->graphics) { case "NetPBM": - $result = exec_wrapper(toPnmCmd($src) . ' | ' . - NetPBM('pnmscale', " -xysize $targetSize $targetSize") . ' | ' . - fromPnmCmd($dest, $quality) - ); + if ($targetSize) { + $result = exec_wrapper(toPnmCmd($src) .' | '. + NetPBM('pnmscale', " -xysize $targetSize $targetSize") .' | '. + fromPnmCmd($dest, $quality) + ); + } + else { + /* If no targetSize is given, then this is just for setting (decreasing) quality */ + $result = exec_wrapper(toPnmCmd($src) .' | '. fromPnmCmd($dest, $quality)); + } + if (!$result) { return false; } @@ -744,7 +755,8 @@ $destOperator = ''; $srcOperator = ''; - /* If not targetSize is given, then this is just for setting (decreasing) quality */ + + /* If no targetSize is given, then this is just for setting (decreasing) quality */ $destOperator = "-quality $quality"; if ($targetSize) { diff -Naur gallery-1.5.3/lib/lang.php gallery-1.5.4/lib/lang.php --- gallery-1.5.3/lib/lang.php 2006-04-04 23:58:25.000000000 +0200 +++ gallery-1.5.4/lib/lang.php 2006-05-02 11:59:13.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: lang.php,v 1.70.2.2 2006/04/04 21:58:25 jenst Exp $ + * $Id: lang.php 13579 2006-05-02 09:59:13Z jenst $ */ /** @@ -35,7 +35,7 @@ * @param string $plural * @param int $count * @param string $nonetext - * @return string $translation string with translation on success, otherwise '--- TranslationError --' + * @return string $translation string with translation on success, otherwise '--- TranslationError --' * @author Jens Tkotz */ function gTranslate($domain = null, $singular, $plural = '', $count = null, $nonetext = '') { @@ -50,11 +50,11 @@ return $nonetext; } - if (gettext_installed()) { - $gDomain = $gallery->language. "-gallery_$domain"; - bindtextdomain($gDomain, dirname(dirname(__FILE__)) . '/locale'); - textdomain($gDomain); - } + if (gettext_installed()) { + $gDomain = $gallery->language. "-gallery_$domain"; + bindtextdomain($gDomain, dirname(dirname(__FILE__)) . '/locale'); + textdomain($gDomain); + } if(!$plural) { if (gettext_installed()) { diff -Naur gallery-1.5.3/lib/mail.php gallery-1.5.4/lib/mail.php --- gallery-1.5.3/lib/mail.php 2006-03-27 17:31:30.000000000 +0200 +++ gallery-1.5.4/lib/mail.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: mail.php,v 1.9.2.1 2006/03/27 15:31:30 jenst Exp $ + * $Id: mail.php 13338 2006-03-27 15:32:14Z jenst $ */ /** diff -Naur gallery-1.5.3/lib/messages.php gallery-1.5.4/lib/messages.php --- gallery-1.5.3/lib/messages.php 2006-03-27 17:31:30.000000000 +0200 +++ gallery-1.5.4/lib/messages.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: messages.php,v 1.7.2.1 2006/03/27 15:31:30 jenst Exp $ + * $Id: messages.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> + *'; - } - if ($fields[3] == "block_element") { - $buf .= "\n$f0".$fields[1].""; - } else if ($fields[3] == "block_start") { - $buf .= "\n"; - $buf .= "\n"; - $buf .= "\n\t"; - $buf .= "\n
    $f0

    "; - $buf .= "\n\t".$fields[2]."

    "; - } else if ($fields[3] == "block_end") { - $buf .= "\n"; - } else { - $buf .= "\n"; - $buf .= "\n\t$fields[0]"; - $buf .= "\n\t$fields[1]"; - $buf .= "\n"; - $buf .= "\n"; - if (!empty($fields[2])) { - $buf .= "\n\t$fields[2]"; - $buf .= "\n\n"; - } - } + $f0 = $fields[0]; + if ($fields[4]) { + $f0 .= ' *'; + } - return $buf; + if ($fields[3] == "block_start") { + $html .= "\n" . + "\n\t$f0

    " . $fields[2] ."

    " . + "\n"; + } + else { + $html .= "\n" . + "\n\t$f0" . + "\n\t$fields[1]" . + "\n"; + + if (!empty($fields[2])) { + $html .= "\n\t$fields[2]"; + } + } + + return $html; } function make_attrs($attrList) { @@ -80,7 +73,7 @@ } else { $col1 = ''; } - if (isset($arr['type']) && + if (isset($arr['type']) && ($arr['type'] == 'text' || $arr['type'] == 'hidden' || $arr['type'] == 'checkbox')) { $col2 = form_input($key, $arr); } else if (isset($arr['choices'])) { @@ -125,7 +118,7 @@ $attrs = (isset($arr['attrs'])) ? make_attrs($arr['attrs']) : ''; $name = (isset($arr['name'])) ? $arr['name'] : $key; - + return ""; } @@ -387,8 +380,8 @@ /* * the .htaccess file in the parent directory tries to - * auto_prepend the got-htaccess.php file. If that worked, - * then GALLERY_PHP_VALUE_OK will be set. + * auto_prepend the got-htaccess.php file. If that worked, + * then GALLERY_PHP_VALUE_OK will be set. */ $success = array(); $fail = array(); @@ -403,24 +396,25 @@ } function check_php() { - global $MIN_PHP_MAJOR_VERSION; - - $version = phpversion(); - $success = array(); - $fail = array(); - $warn = array(); + global $MIN_PHP_MAJOR_VERSION; - if (!function_exists('version_compare') || !version_compare($version, "4.1.0", ">=")) { - $fail['fail-too-old'] = 1; + $version = phpversion(); + $success = array(); + $fail = array(); + $warn = array(); + + if (!function_exists('version_compare') || + !version_compare($version, $MIN_PHP_MAJOR_VERSION, ">=")) { + $fail['fail-too-old'] = 1; + } + else { + if (strstr(__FILE__, 'lib/setup.php') || strstr(__FILE__, 'lib\\setup.php')) { + $success[] = sprintf(_("PHP v%s is OK."), $version); } - - if (strstr(__FILE__, 'lib/setup.php') || - strstr(__FILE__, 'lib\\setup.php')) { - $success[] = sprintf(_("PHP v%s is OK."), $version); - } else { + else { $fail['fail-buggy__FILE__'] = 1; } - + } return array($success, $fail, $warn); } @@ -468,17 +462,17 @@ $fail = array(); $success = array(); $warn = array(); - + $missing_critical = array(); $missing = 0; $netpbm = array( - fs_executable("jpegtopnm"), - fs_executable("giftopnm"), - fs_executable("pngtopnm"), - fs_executable("pnmtojpeg"), - fs_executable("ppmtogif"), - fs_executable("pnmtopng"), - fs_executable("pnmscale"), + fs_executable("jpegtopnm"), + fs_executable("giftopnm"), + fs_executable("pngtopnm"), + fs_executable("pnmtojpeg"), + fs_executable("ppmtogif"), + fs_executable("pnmtopng"), + fs_executable("pnmscale"), fs_executable("pnmfile"), fs_executable("ppmquant"), fs_executable("pnmcut"), @@ -493,14 +487,14 @@ ); $optional = array( - fs_executable("pnmcomp") => + fs_executable("pnmcomp") => _("Without pnmcomp and pamcomp gallery will not be able to watermark images, unless you use ImageMagick and have the composite binary installed."), ); - + $missing_optional = 0; - + /* Start checks */ - + if ($graphtool == 'ImageMagick') { $success[] = _("NetPBM not being used in this installation."); return array($success, $fail, $warn); @@ -538,7 +532,7 @@ $bin = $newbin; } } - + if (empty($dir)) { if (isset($optional[$bin])) { $warn[$bin] = '
    '. sprintf(_("Missing optional binary %s. %s"), $bin, $optional[$bin]); @@ -550,19 +544,19 @@ } if (!empty($dir) && inOpenBasedir($dir) && !fs_is_executable("$dir/$bin")) { - $warn[$bin] = '
    '. sprintf(_("%s is not executable!"), "$bin "); + $warn[$bin] = '
    '. sprintf(_("%s is not executable!"), "$bin "); } } - + if ($missing == count($netpbm)) { $fail["fail-netpbm"] = 1; /* Any other warning doesnt care */ $warn = array(); } elseif ($missing > 0) { - $warn[] = sprintf(_("%d of %d NetPBM binaries located."), + $warn[] = sprintf(_("%d of %d NetPBM binaries located."), count($netpbm) - $missing, count($netpbm)); - + if(count($missing_critical) > 0) { $fail["fail-netpbm-partial"] = array_values($missing_critical); } @@ -584,13 +578,13 @@ $missing_critical = array(); $missing = 0; $imagick = array( - fs_executable("identify"), + fs_executable("identify"), fs_executable("convert"), fs_executable("composite"), ); $optional = array( - fs_executable("composite") => + fs_executable("composite") => _("Without composite gallery will not be able to watermark images, except you use NetPBM and have the pnmcomp binary installed."), ); @@ -631,16 +625,16 @@ $warn[$bin] = '
    '. sprintf(_("%s is not executable!"), "$bin "); } } - + if ($missing == count($imagick)) { $fail["fail-imagemagick"] = 1; /* Any other warning doesnt care */ $warn = array(); } elseif ($missing > 0) { - $warn[] = sprintf(_("%d of %d ImageMagick binaries located."), + $warn[] = sprintf(_("%d of %d ImageMagick binaries located."), count($imagick) - $missing, count($imagick)); - + if(count($missing_critical) > 0) { $fail["fail-imagemagick-partial"] = array_values($missing_critical); } @@ -711,6 +705,7 @@ function check_gallery_version() { global $gallery; + $fail = array(); $success = array(); $warn = array(); @@ -726,6 +721,7 @@ $visit = sprintf(_("You can check for more recent versions by visiting %s."), $link); $this_version = sprintf(_("This version of %s was released on %s."), Gallery(), strftime("%x", $gallery->last_change)); + $this_beta_version = sprintf(_("This is a development build of %s that was released on %s."), Gallery(), strftime("%x", $gallery->last_change)); @@ -734,7 +730,7 @@ } else if ($age > 14 && $beta) { $fail["too_old"] = "$this_beta_version $visit"; } else if ($beta) { - $success["ok"] = "$this_beta_version $visit" . " " + $success["ok"] = "$this_beta_version $visit" . " " . _("Please check regularly for updates."); } else { $success["ok"] = "$this_version $visit"; @@ -785,13 +781,13 @@ $nls = getNLS(); $gallery_languages = array_keys(gallery_languages()); $system_locales = array(); - + $available_locales = array(); $maybe_locales = array(); $unavailable_locales = array(); /* Lets see which system locales are installed. */ - if (getOS() != OS_WINDOWS) { + if (getOS() != OS_WINDOWS) { # Unix / Linux # Check which locales are installed @@ -808,7 +804,7 @@ } } - /* DAMN, there are none we use Linux and our PHP uses gettext*/ + /* DAMN, there are none we use Linux and our PHP uses gettext*/ if( sizeof($system_locales) == 0 && getOS() == OS_LINUX && gettext_installed()) { return NULL; } @@ -818,16 +814,16 @@ */ foreach ($gallery_languages as $locale) { $aliases=array(); - + /* Found an supported one, put it in availables */ if ( (in_array($locale, $system_locales)) || (setlocale(LC_ALL, $locale))) { $available_locales[$locale]=$locale; continue; } - - /* - ** First, we try using the full lang, (first 5 chars) if - ** that doesn't match then + + /* + ** First, we try using the full lang, (first 5 chars) if + ** that doesn't match then ** we use the first 2 letter to build an alias list ** e.g. nl to find nl_BE or nl_NL */ @@ -854,7 +850,7 @@ } $aliases=array_unique($aliases); - $noway=Array ('zh_TW.eucTW'); + $noway=Array ('zh_TW.eucTW'); if ($aliases) { foreach ($aliases as $test) { // We do this because all locales in $noway seem to crash at least some NetBSD @@ -874,9 +870,9 @@ } - // Set locale correct back + // Set locale correct back if (isset($gallery->locale)) { - setlocale(LC_ALL,$gallery->locale); + setlocale(LC_ALL,$gallery->locale); } else { setlocale(LC_ALL,""); } @@ -903,14 +899,14 @@ $maybe = $locales["maybe_locales"]; $unavailable = $locales["unavailable_locales"]; - // If we are in Linux, our PHP has gettext, + // If we are in Linux, our PHP has gettext, // but we could not find any locale we skip the whole aliasing part. if($locales == NULL) return $results; // blank array $nls = getNLS(); $block_start_done = false; - + $nr=0; foreach ($maybe as $key => $aliases) { if (sizeof($aliases) < 1) { @@ -920,7 +916,7 @@ /* if (sizeof($aliases) == 1) { $results["locale_alias['$key']"] = array ( - "type" => "hidden", + "type" => "hidden", "value" => array_pop($aliases), "desc" => "locale_alias[$key]", "prompt" => "locale_alias[$key]" @@ -932,7 +928,7 @@ if (!$block_start_done) { $block_start_done=true; $results[] = array ( - "type" => "block_start", + "type" => "block_start", "prompt" => "(" . _("Advanced") . ")
    ".sprintf(_("System locale selection required")), "desc" => _("There is more than one suitable system locale installed on your machine for the following languages. Please chose the one you think is most suitable.") . "

    " . @@ -943,7 +939,7 @@ $choices=array(); - foreach ($aliases as $value) { + foreach ($aliases as $value) { $choices[$value]=$value; } if (getOS() != OS_WINDOWS) { @@ -962,7 +958,7 @@ "remove_empty" => true ); - + } if ($block_start_done) { @@ -973,7 +969,7 @@ $choices=array(); if (getOS() != OS_WINDOWS) $choices=array("" => _("System locale")); if (sizeof($available) > 0) { - foreach ($available as $choice => $value) { + foreach ($available as $choice => $value) { $choices[$choice]=$nls['language'][$value]; } @@ -993,13 +989,13 @@ $skip=true; } } - + if (! isset ($skip)) { $avail_keys=array_keys($choices); foreach ($unavailable as $key) { if (sizeof($choices) == 1) { $results["locale_alias['$key']"] = array ( - "type" => "hidden", + "type" => "hidden", "value" => $avail_keys[0], "desc" => "locale_alias[$key]", "prompt" => "locale_alias[$key]", @@ -1012,7 +1008,7 @@ if (!$block_start_done) { $block_start_done=true; $results[] = array ( - "type" => "block_start", + "type" => "block_start", "prompt" => "(" . _("Advanced") . ")
    ".sprintf(_("System locale problems")), "desc" => _("There are no apparently suitable system locales installed on your machine for the following languages. Please choose the one you think is most suitable.") . "

    " . @@ -1040,7 +1036,7 @@ function default_graphics() { list ($imageMagick,) = check_graphics_im(); - + if (count ($imageMagick)) { return "ImageMagick"; } else { @@ -1088,8 +1084,8 @@ $finished=true; if ($element["value"]) { $fail[]=sprintf(_("In %s, missing %s in row %d with %s %s."), - _("Vote words and values"), - _("Name"), $rownum, _("Value"), + _("Vote words and values"), + _("Name"), $rownum, _("Value"), $element["value"]); break; } @@ -1097,13 +1093,13 @@ } else { if ($finished) { $fail[]=sprintf(_("In %s, blank in row %d."), - _("Vote words and values"), - $rownum-1); + _("Vote words and values"), + $rownum-1); break; } else if (!ereg("^[1-9][0-9]*$", $element["value"])) { - $fail[]=sprintf(_("In %s, for name %s (row %d) value %s should be a positive whole number"), - _("Vote words and values"), - $element["name"], + $fail[]=sprintf(_("In %s, for name %s (row %d) value %s should be a positive whole number"), + _("Vote words and values"), + $element["name"], $rownum, $element["value"]); break; } @@ -1136,7 +1132,7 @@ return $gallery->app->expectedExecStatus; } - // If PHP is compiled with the --enable-sigchild option, then every + // If PHP is compiled with the --enable-sigchild option, then every // exec() call returns an error status of -1. WTF?!?! Sigh. So // Let's do some checking on some pretty standard programs and see // what they return. @@ -1162,7 +1158,7 @@ } else { $count[$status]=1; } - } + } } } @@ -1201,32 +1197,31 @@ function inOpenBasedir($dir) { $openBasedir = ini_get('open_basedir'); if (empty($openBasedir)) { - return true; + return true; } /* - * XXX: this is not perfect. For example, if the open_basedir list - * contains "/usr/localx" this code will match "/usr/local". Let's not - * worry too much about that now. - */ + * XXX: this is not perfect. For example, if the open_basedir list + * contains "/usr/localx" this code will match "/usr/local". Let's not + * worry too much about that now. + */ foreach (explode(':', $openBasedir) as $basedir) { - if (!strncmp($basedir, $dir, strlen($basedir))) { - return true; - } + if (!strncmp($basedir, $dir, strlen($basedir))) { + return true; + } } - + return false; } function make_separator($key, $arr) { - $buf ="\n
    "; - $buf .= "\n\t
    ". $arr["title"] ."
    "; - if( isset($arr["desc"])) { - $buf .= "\n
    ". $arr["desc"] ."
    "; - } - $buf .="\n
    "; + $html = "\n\t
    {$arr["title"]}
    "; + + if(!empty($arr["desc"])) { + $html .= "\n
    {$arr["desc"]}
    "; + } - return $buf; + return $html; } function array_stripslashes($subject) { @@ -1240,14 +1235,14 @@ foreach ($subject as $key => $value) { $ret[$key] = array_stripslashes($value); } - + return $ret; } /* ** Check if Magic Quotes are On ** If yes stripslashes and return the cleaned input. -** +** ** Jens Tkotz, 02/2004 */ function stripWQuotesON($mixed) { @@ -1325,7 +1320,7 @@ $adminEmail .= "$join$email"; $join=","; if (! check_email($email)) { - $fail[] = sprintf(_("%s is not a valid email address."), + $fail[] = sprintf(_("%s is not a valid email address."), $email); } else { $success[] = "Valid admin email given."; @@ -1341,10 +1336,10 @@ if (!empty($gallery->session->configForm->emailGreeting) && !strstr($gallery->session->configForm->emailGreeting, "!!USERNAME!!")) { $fail[]= sprintf(_("You must include %s in your welcome email"), "!!USERNAME!!"); } - if (!empty($emailGreeting) && + if (!empty($emailGreeting) && !strstr($gallery->session->configForm->emailGreeting, "!!PASSWORD!!" ) && !strstr($gallery->session->configForm->emailGreeting, "!!NEWPASSWORDLINK!!" )) { - $fail[]= sprintf(_("You must include %s or %s in your welcome email"), + $fail[]= sprintf(_("You must include %s or %s in your welcome email"), "!!PASSWORD!!", "!!NEWPASSWORDLINK!!"); } @@ -1368,14 +1363,14 @@ $warn = array(); list($oks, $errors, $warnings) = checkVersions(false); if ($errors) { - $fail[]=sprintf(_("The following files are out of date, corrupted or missing:
        %s."), + $fail[]=sprintf(_("The following files are out of date, corrupted or missing:
        %s."), implode('
        ', array_keys($errors))). "

    " . - "
    " . _("This should be fixed before proceeding") . - "
    " . sprintf(_("Look at %sCheck Versions%s for more details."), + "
    " . _("This should be fixed before proceeding") . + "
    " . sprintf(_("Look at %sCheck Versions%s for more details."), "", ""); } else if ($warnings) { - $warn[]=sprintf(_("%d files are more recent than expected. This is OK if you are using pre-release, beta, CVS or modified code."), count($warnings)) . - "
    " . sprintf(_("Look at %sCheck Versions%s for more details."), + $warn[]=sprintf(_("%d files are more recent than expected. This is OK if you are using pre-release, beta, SVN or modified code."), count($warnings)) . + "
    " . sprintf(_("Look at %sCheck Versions%s for more details."), "", ""); } else { if (count($oks) == 0) { @@ -1418,7 +1413,7 @@ global $gallery; $admins=array(); - + if (isset($gallery->app->userDir) && fs_is_dir($gallery->app->userDir)) { require_once(GALLERY_BASE . '/classes/User.php'); require_once(GALLERY_BASE . '/classes/EverybodyUser.php'); @@ -1428,7 +1423,7 @@ require_once(GALLERY_BASE . '/classes/gallery/UserDB.php'); require_once(GALLERY_BASE . '/classes/gallery/User.php'); - + $userDB = new Gallery_UserDB(); $admins=array(); @@ -1451,7 +1446,7 @@ else if (! in_array("admin",$admins)) { if (sizeof($admins) == 1) { $desc_text=sprintf(_("It seems you've already configured Gallery, because there is one admin account, but its not called %s."), 'admin'); - } + } else { $desc_text=sprintf(_("It seems you've already configured Gallery, because there are %d admin accounts, but no user called %s."), sizeof($admins), 'admin'); } @@ -1479,7 +1474,7 @@ "attrs" => array("size" => 20), "required" => true, )); - + return $result; } @@ -1505,65 +1500,89 @@ } function checkVersions($verbose=false) { - global $gallery; - /* we assume setup/init.php was loaded ! */ + global $gallery; + /* we assume setup/init.php was loaded ! */ - $manifest=GALLERY_BASE . '/manifest.inc'; - $success=array(); - $fail=array(); - $warn=array(); - if (!fs_file_exists($manifest)) { - $fail["manifest.inc"]=_("File missing or unreadable. Please install then re-run this test."); - return array($success, $fail, $warn); - } - if (!function_exists('getCVSVersion')) { - $fail['util.php']=sprintf(_("Please ensure that %s is the latest version."), "util.php"); - return array($success, $fail, $warn); - } - include (GALLERY_BASE . '/manifest.inc'); - if ($verbose) { - print sprintf(_("Testing status of %d files."), count($versions)); - } + $manifest = GALLERY_BASE . '/manifest.inc'; + $fileskiplist = array( + 'includes/ecard/templates/error.htm', + 'includes/ecard/templates/leer.htm', + 'js/imagemap.js', + 'js/toggle.js', + 'js/wz_jsgraphics.js', + 'js/wz_tooltip.js'); + $success = array(); + $fail = array(); + $warn = array(); + if (!fs_file_exists($manifest)) { + $fail["manifest.inc"]=_("File missing or unreadable. Please install then re-run this test."); + return array($success, $fail, $warn); + } + if (!function_exists('getSVNRevision')) { + $fail['util.php'] = sprintf(_("Please ensure that %s is the latest version."), "util.php"); + return array($success, $fail, $warn); + } + include (GALLERY_BASE . '/manifest.inc'); + if ($verbose) { + print sprintf(_("Testing status of %d files."), count($versions)); + } foreach ($versions as $file => $version) { - $found_version=getCVSVersion($file); - if ($found_version === NULL) { - if ($verbose) { - print "
    \n"; - print sprintf(_("Cannot read file %s."), $file); - } - $fail[$file]=_("File missing or unreadable."); - continue; - } else if ($found_version === "") { - if ($verbose) { - print "
    \n"; - print sprintf(_("Version information not found in %s. File must be old version or corrupted."), $file); - } - $fail[$file]=_("Missing version"); - continue; - } - $compare=compareVersions($version, $found_version); - if ($compare < 0) { - if ($verbose) { - print "
    \n"; - print sprintf(_("Problem with %s. Expected version %s (or greater) but found %s."), $file, $version, $found_version); - } - $fail[$file]=sprintf(_("Expected version %s (or greater) but found %s."), $version, $found_version); - } else if ($compare > 0) { - if ($verbose) { - print "
    \n"; - print sprintf(_("%s OK. Actual version (%s) more recent than expected version (%s)"), $file, $found_version, $version); - } - $warn[$file]=sprintf(_("Expected version %s but found %s."), $version, $found_version); - } else { - if ($verbose) { - print "
    \n"; - print sprintf(_("%s OK"), $file); - } - $success[$file]=sprintf(_("Found expected version %s."), $version); - } - - } - return array($success, $fail, $warn); + $found_version = getSVNRevision($file); + if ($found_version === NULL) { + if ($verbose) { + print "
    \n"; + print sprintf(_("Cannot read file %s."), $file); + } + $fail[$file]=_("File missing or unreadable."); + continue; + } + else if ($found_version === "" ) { + if (preg_match('/(\.jpg|\.png|\.gif|\.jar|.\mo|\.ico|\.tpl|Changelog)$/i', $file, $matches)) { + if($verbose) { + echo "
    \n"; + printf("File with type: %s can not have a compareable Revision Nr.", $matches[1]); + continue; + } + $success[$file] = sprintf("No comparabel Rev for type: %s", $matches[1]); + continue; + } + elseif (in_array($file, $fileskiplist)) { + $success[$file] = sprintf("File '%s' is in skiplist", $file); + continue; + } + else { + if ($verbose) { + print "
    \n"; + print sprintf(_("Version information not found in %s. File must be old version or corrupted."), $file); + } + $fail[$file]=_("Missing version"); + continue; + } + } + +$compare=compareVersions($version, $found_version); + if ($compare < 0) { + if ($verbose) { + print "
    \n"; + print sprintf(_("Problem with %s. Expected version %s (or greater) but found %s."), $file, $version, $found_version); + } + $fail[$file]=sprintf(_("Expected version %s (or greater) but found %s."), $version, $found_version); + } else if ($compare > 0) { + if ($verbose) { + print "
    \n"; + print sprintf(_("%s OK. Actual version (%s) more recent than expected version (%s)"), $file, $found_version, $version); + } + $warn[$file]=sprintf(_("Expected version %s but found %s."), $version, $found_version); + } else { + if ($verbose) { + print "
    \n"; + print sprintf(_("%s OK"), $file); + } + $success[$file]=sprintf(_("Found expected version %s."), $version); + } + + } + return array($success, $fail, $warn); } /** @@ -1590,73 +1609,67 @@ * - You always need a group_end for a group. Otherwise everything below will belong to the group. * * @author Jens Tkotz - */ + */ -function makeSectionTabs($array, $break = 7, $initialtab = '', $sortByTitle = false) { +function makeSectionTabs($array, $initialtab = '', $sortByTitle = false, $visibilityKeyword = '', $visibilityValue = '') { $tabs = array(); foreach ($array as $key => $var) { - if(isset($var['type']) && $var['type'] == 'group_start') { - $tabs[]=$var; + if(isset($var['type']) && $var['type'] == 'group_start') { + $tabs[$key] = $var; } } if ($sortByTitle) { - array_sort_by_fields($tabs, 'title'); + array_sort_by_fields($tabs, 'title'); } - echo "\n"; - echo "\n"; - $tabcount = 0; + echo "\n
    \n"; foreach ($tabs as $cell) { - $tabcount++; + $attrList = array(); + if (($cell['default'] == 'inline' && !$initialtab) || $initialtab == $cell['name']) { - $class = 'class="tab-hi"'; + $attrList['class'] = 'tab-hi'; if (empty($initialtab)) { $initialtab = $cell['name']; } } - else { - $class = 'class="tab"'; - } - echo "\n\t
    '; - echo "\n\t"; - if ($tabcount % $break == 0 && $tabcount < sizeof($tabs)) { - echo "\n\n
    "; - echo $cell['title']; + + $attrList['id'] = 'tab_'. $cell['name']; + $attrList['onClick'] = "section_tabs.toggle('" . $cell['name'] ."')"; + $attrList['style'] = "float:". langleft(); + $text = $cell['title']; if (!empty($cell['contains_required'])) { - echo '*'; - } - echo ' 
    "; - echo "\n\n"; + $text .= '*'; } + + echo galleryLink('', $text, $attrList); } - echo "\n"; - echo "\n
    \n"; - echo "\n". ''; - echo "\n". '\n"; + + return $initialtab; } function configLogin($target) { global $gallery; - + if (fs_file_exists(GALLERY_SETUPDIR . "/resetadmin")) { $resetFile = getFile(GALLERY_SETUPDIR . "/resetadmin"); $resetFile = trim($resetFile); @@ -1666,7 +1679,7 @@ // unset the Guid so we don't keep asking for something that's not there. $gallery->session->resetAdminGuid = null; } - + // The gallery has never been configured, or the admin password has been lost and needs to be reset - ignore login requirement // If the user has already logged in, and is viewing one of the setup pages, they will be logged in automatically by the form if (!isset($gallery->app->userDir) || (isset($gallery->session->resetAdminGuid) && $gallery->session->resetAdminGuid == $resetFile)) { @@ -1694,12 +1707,12 @@ } function placeholderDescription() { - $placeholderDescription = + $placeholderDescription = _("This email will be sent when new accounts are created.") . _("Leaving this field empty sets Gallery to use the default message (see below) which can be translated, or use your own welcome message.") . _("The following placeholder can be used:") . '

    '; - + foreach(welcomeMsgPlaceholderList() as $placeholder => $description) { $placeholderDescription .= ''. ''. @@ -1708,8 +1721,8 @@ } $placeholderDescription .= '
    !!'. strtoupper($placeholder) . '!!

    '. - '
    '. - nl2br(welcome_email(true)) . + '
    '. + nl2br(welcome_email(true)) . '
    '; return $placeholderDescription; diff -Naur gallery-1.5.3/lib/url.php gallery-1.5.4/lib/url.php --- gallery-1.5.3/lib/url.php 2005-12-26 22:23:03.000000000 +0100 +++ gallery-1.5.4/lib/url.php 2006-08-14 09:41:08.000000000 +0200 @@ -1,4 +1,26 @@ +$content"; - + + if (!empty($url)) { + $html = "$content\n"; + } + else { + $html = "$content\n"; + } + return $html; } + + ?> diff -Naur gallery-1.5.3/lib/valchecks.php gallery-1.5.4/lib/valchecks.php --- gallery-1.5.3/lib/valchecks.php 2006-03-28 12:54:53.000000000 +0200 +++ gallery-1.5.4/lib/valchecks.php 2006-05-02 11:59:13.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: valchecks.php,v 1.4.2.2 2006/03/28 10:54:53 jenst Exp $ + * $Id: valchecks.php 13579 2006-05-02 09:59:13Z jenst $ */ ?> album->fields["votes"] as $previous_key => $previous_vote) { if (isset($previous_vote[getVotingID()]) && - $previous_vote[getVotingID()] + $previous_vote[getVotingID()] === intval($vote_value)) { unset($gallery->album->fields["votes"][$previous_key][getVotingID()]); } @@ -133,8 +133,8 @@ global $gallery; if ($gallery->album->numPhotos($gallery->user->canWriteToAlbum($gallery->album)) == 0) { - return false; - } + return false; + } if ($gallery->album->getVoterClass() == "Everybody") { return true; @@ -227,61 +227,62 @@ } function showResultsGraph($num_rows) { - global $gallery; + global $gallery; - $results=array(); - $results_count=array(); - $nv_pairs=$gallery->album->getVoteNVPairs(); - $buf=''; + $results = array(); + $results_count = array(); + $nv_pairs = $gallery->album->getVoteNVPairs(); + $buf = ''; + + $voters = array(); + foreach ($gallery->album->fields["votes"] as $element => $image_votes) { + $accum_votes = 0; + $count = 0; + foreach ($image_votes as $voter => $vote_value ) { + $voters[$voter] = true; + if ($vote_value> $gallery->album->getPollScale()) { // scale has changed + $vote_value = $gallery->album->getPollScale(); + } + $accum_votes += $nv_pairs[$vote_value]["value"]; + $count++; + } + if ($accum_votes > 0) { + $results_count[$element]=$count; + if ($gallery->album->getPollType() == "rank" || $gallery->album->getPollScale() == 1) { + $results[$element]=$accum_votes; + $summary = gTranslate('common', "(Total points in brackets)"); + } + else { + $results[$element] = number_format(((double)$accum_votes)/$count, 2); + $summary = gTranslate('common', "(Average points in brackets)"); + } + } + } - $voters=array(); - foreach ($gallery->album->fields["votes"] as $element => $image_votes) { - $accum_votes=0; - $count=0; - foreach ($image_votes as $voter => $vote_value ) { - $voters[$voter]=true; - if ($vote_value> $gallery->album->getPollScale()) { // scale has changed - $vote_value=$gallery->album->getPollScale(); - } - $accum_votes+=$nv_pairs[$vote_value]["value"]; - $count++; - } - if ($accum_votes > 0) { - $results_count[$element]=$count; - if ($gallery->album->getPollType() == "rank" || $gallery->album->getPollScale() == 1) { - $results[$element]=$accum_votes; - $summary="("._("Total points in brackets") . ")"; - } - else { - $results[$element]=number_format(((double)$accum_votes)/$count, 2); - $summary="("._("Average points in brackets") . ")"; - } - } - } array_multisort($results, SORT_NUMERIC, SORT_DESC, $results_count, SORT_NUMERIC, SORT_DESC); - $rank=0; - $graph=array(); - $needs_saving=false; + $rank = 0; + $graph = array(); + $needs_saving = false; foreach ($results as $element => $count) { - $index=$gallery->album->getIndexByVotingId($element); + $index = $gallery->album->getIndexByVotingId($element); if ($index < 0) { // image has been deleted! continue; - } + } if ($gallery->album->isAlbum($index)) { $url = makeAlbumUrl($gallery->album->getAlbumName($index)); - $album=$gallery->album->getSubAlbum($index); - $desc=sprintf(_("Album: %s"), + $album = $gallery->album->getSubAlbum($index); + $desc = sprintf(gTranslate('common', "Album: %s"), $album->fields['title']); } else { $id = $gallery->album->getPhotoId($index); - $url=makeAlbumUrl($gallery->session->albumName, $id); - $desc=$gallery->album->getCaption($index); - if (trim($desc)== "") { - $desc=$id; - } + $url = makeAlbumUrl($gallery->session->albumName, $id); + $desc = $gallery->album->getCaption($index); + if (trim($desc) == '') { + $desc = $id; + } } $current_rank = $gallery->album->getRank($index); $rank++; @@ -293,46 +294,50 @@ if ($rank > $num_rows) { continue; } - - $name_string='album->save(); } - $graph=arrayToBarGraph($graph, 300, "border=0"); - $buf .="\n
    "; + $graph = arrayToBarGraph($graph, 300); if ($graph) { - $buf .="". - gTranslate('common', "Result from one voter", "Result of %d voters", sizeof($voters)). - ""; - if ($gallery->album->getPollType() == "critique") { - $key_string=""; - foreach ($nv_pairs as $nv_pair) { - if (empty($nv_pair["name"])) { - continue; - } - $key_string .= sprintf(_("%s: %s points; "), - $nv_pair["name"], - $nv_pair["value"]); - } - if (strlen($key_string) > 0) { - $buf .= "
    ". sprintf(_("Key - %s"), - $key_string)." $summary
    "; - } - } - $buf .= $graph; - } else if ($num_rows > 0 && $gallery->user->canWriteToAlbum($gallery->album)) { - $buf .= ""._("No votes so far.")."
    "; + $buf .="
    ". + gTranslate('common', + "Result from one voter", + "Result of %d voters", + sizeof($voters), '', true) . + ''; + + if ($gallery->album->getPollType() == "critique") { + $key_string=""; + foreach ($nv_pairs as $nv_pair) { + if (empty($nv_pair["name"])) { + continue; + } + $key_string .= sprintf(gTranslate('common',"%s: %s points; "), + $nv_pair["name"], + $nv_pair["value"]); + } + if (strlen($key_string) > 0) { + $buf .= "
    ". sprintf(gTranslate('common',"Key - %s"), + $key_string)." $summary
    "; + } + } + $buf .= $graph . '
    '; } + return array($buf, $results); } diff -Naur gallery-1.5.3/LICENSE.txt gallery-1.5.4/LICENSE.txt --- gallery-1.5.3/LICENSE.txt 2005-09-12 19:31:20.000000000 +0200 +++ gallery-1.5.4/LICENSE.txt 2005-09-12 19:32:54.000000000 +0200 @@ -1,4 +1,4 @@ -$Id: LICENSE.txt,v 1.3 2005/09/12 17:31:20 dmolavi Exp $ +$Id: LICENSE.txt 11584 2005-09-12 17:32:54Z dmolavi $ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff -Naur gallery-1.5.3/login.php gallery-1.5.4/login.php --- gallery-1.5.3/login.php 2006-03-27 17:31:25.000000000 +0200 +++ gallery-1.5.4/login.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: login.php,v 1.71.2.1 2006/03/27 15:31:25 jenst Exp $ + * $Id: login.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> diff -Naur gallery-1.5.3/modify_user.php gallery-1.5.4/modify_user.php --- gallery-1.5.3/modify_user.php 2006-03-27 17:31:25.000000000 +0200 +++ gallery-1.5.4/modify_user.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: modify_user.php,v 1.48.2.1 2006/03/27 15:31:25 jenst Exp $ + * $Id: modify_user.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> # @package Languagepack diff -Naur gallery-1.5.3/po/create_po_template.sh gallery-1.5.4/po/create_po_template.sh --- gallery-1.5.3/po/create_po_template.sh 2005-11-05 02:53:07.000000000 +0100 +++ gallery-1.5.4/po/create_po_template.sh 2005-11-05 02:53:07.000000000 +0100 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: create_po_template.sh,v 1.12 2005/11/05 01:53:07 jenst Exp $ +# $Id: create_po_template.sh 11924 2005-11-05 01:53:07Z jenst $ # #note: requires xgettext version 0.12.1 or greater # diff -Naur gallery-1.5.3/po/CREDITS gallery-1.5.4/po/CREDITS --- gallery-1.5.3/po/CREDITS 2004-01-15 16:58:18.000000000 +0100 +++ gallery-1.5.4/po/CREDITS 2004-01-15 16:58:19.000000000 +0100 @@ -1,4 +1,4 @@ -$Id: CREDITS,v 1.25 2004/01/15 15:58:18 jenst Exp $ +$Id: CREDITS 5091 2004-01-15 15:58:19Z jenst $ I am very thankful to following People : diff -Naur gallery-1.5.3/po/edit_changelog.sh gallery-1.5.4/po/edit_changelog.sh --- gallery-1.5.3/po/edit_changelog.sh 2005-12-23 20:20:39.000000000 +0100 +++ gallery-1.5.4/po/edit_changelog.sh 2005-12-23 20:20:39.000000000 +0100 @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: edit_changelog.sh,v 1.12 2005/12/23 19:20:39 jenst Exp $ +# $Id: edit_changelog.sh 12386 2005-12-23 19:20:39Z jenst $ esc=`echo -en "\033"` tab="${esc}[5G" diff -Naur gallery-1.5.3/po/gallery-common.pot gallery-1.5.4/po/gallery-common.pot --- gallery-1.5.3/po/gallery-common.pot 2006-04-05 00:32:03.000000000 +0200 +++ gallery-1.5.4/po/gallery-common.pot 2006-08-14 10:05:15.000000000 +0200 @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # -# $Id: gallery-common.pot,v 1.13.2.3 2006/04/04 22:32:03 jenst Exp $ +# $Id: gallery-common.pot 14313 2006-08-14 08:05:15Z jenst $ # # @version # @package Languagepack @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gallery-translations@lists.sourceforge.net\n" -"POT-Creation-Date: 2006-04-05 00:31+0200\n" +"POT-Creation-Date: 2006-08-14 10:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -445,19 +445,19 @@ msgid "Invert Selection" msgstr "" -#: ../lib/Form.php:237 +#: ../lib/Form.php:238 msgid "Colorpicker" msgstr "" -#: ../lib/colorpicker.php:40 +#: ../lib/colorpicker.php:42 msgid "Color Picker" msgstr "" -#: ../lib/colorpicker.php:52 +#: ../lib/colorpicker.php:54 msgid "The Options window has closed. Exiting." msgstr "" -#: ../lib/colorpicker.php:58 +#: ../lib/colorpicker.php:60 msgid "This window must be called from an Options window" msgstr "" @@ -563,55 +563,55 @@ msgid "The original look and feel." msgstr "" -#: ../lib/content.php:986 ../lib/content.php:990 +#: ../lib/content.php:988 ../lib/content.php:992 msgid "unknown" msgstr "" -#: ../lib/content.php:994 +#: ../lib/content.php:996 #, php-format msgid "Version: %s" msgstr "" -#: ../lib/content.php:996 +#: ../lib/content.php:998 #, php-format msgid "Last Update: %s" msgstr "" -#: ../lib/content.php:1014 ../lib/content.php:1020 +#: ../lib/content.php:1016 ../lib/content.php:1022 msgid "None" msgstr "" -#: ../lib/content.php:1015 ../lib/content.php:1021 +#: ../lib/content.php:1017 ../lib/content.php:1023 msgid "Dots" msgstr "" -#: ../lib/content.php:1016 ../lib/content.php:1022 +#: ../lib/content.php:1018 ../lib/content.php:1024 msgid "Solid" msgstr "" -#: ../lib/content.php:1020 +#: ../lib/content.php:1022 msgid "No frames" msgstr "" -#: ../lib/content.php:1021 +#: ../lib/content.php:1023 msgid "Just a simple dashed border around the thumb." msgstr "" -#: ../lib/content.php:1022 +#: ../lib/content.php:1024 msgid "Just a simple solid border around the thumb." msgstr "" -#: ../lib/content.php:1044 +#: ../lib/content.php:1046 #, php-format msgid "Skipping %s." msgstr "" -#: ../lib/content.php:1050 +#: ../lib/content.php:1052 #, php-format msgid "Can't open %s" msgstr "" -#: ../lib/content.php:1125 ../lib/content.php:1145 +#: ../lib/content.php:1127 ../lib/content.php:1147 msgid "Not valid yet" msgstr "" @@ -629,80 +629,80 @@ msgid "target file size %d kbytes" msgstr "" -#: ../lib/imageManipulation.php:100 ../lib/imageManipulation.php:127 +#: ../lib/imageManipulation.php:103 ../lib/imageManipulation.php:130 #, php-format msgid "-> file size %d kbytes" msgstr "" -#: ../lib/imageManipulation.php:101 +#: ../lib/imageManipulation.php:104 #, php-format msgid "trying quality %d%%" msgstr "" -#: ../lib/imageManipulation.php:128 +#: ../lib/imageManipulation.php:131 msgid "Done." msgstr "" -#: ../lib/imageManipulation.php:220 ../lib/imageManipulation.php:456 -#: ../lib/imageManipulation.php:508 ../lib/imageManipulation.php:781 +#: ../lib/imageManipulation.php:223 ../lib/imageManipulation.php:459 +#: ../lib/imageManipulation.php:511 ../lib/imageManipulation.php:793 msgid "You have no graphics package configured for use!" msgstr "" -#: ../lib/imageManipulation.php:224 +#: ../lib/imageManipulation.php:227 msgid "No watermark name specified!" msgstr "" -#: ../lib/imageManipulation.php:474 +#: ../lib/imageManipulation.php:477 msgid "Cropping Image" msgstr "" -#: ../lib/imageManipulation.php:538 +#: ../lib/imageManipulation.php:541 #, php-format msgid "Generating squared Version to %dpx" msgstr "" -#: ../lib/imageManipulation.php:559 +#: ../lib/imageManipulation.php:562 msgid "No Cropping Done" msgstr "" -#: ../lib/imageManipulation.php:569 +#: ../lib/imageManipulation.php:572 #, php-format msgid "Call to %s failed in %s for file %s!" msgstr "" -#: ../lib/imageManipulation.php:573 +#: ../lib/imageManipulation.php:576 #, php-format msgid "File %s type %d." msgstr "" -#: ../lib/imageManipulation.php:610 ../lib/imageManipulation.php:634 +#: ../lib/imageManipulation.php:613 ../lib/imageManipulation.php:637 #, php-format msgid "Files with type %s are not supported by Gallery with netPBM" msgstr "" -#: ../lib/imageManipulation.php:683 +#: ../lib/imageManipulation.php:686 #, php-format msgid "Compressing image: %s" msgstr "" -#: ../lib/imageManipulation.php:688 +#: ../lib/imageManipulation.php:691 msgid "Not all necessary params for resizing given." msgstr "" -#: ../lib/imageManipulation.php:689 +#: ../lib/imageManipulation.php:692 #, php-format msgid "Resizing params: src: %s, dest : %s, targetSize: %s" msgstr "" -#: ../lib/imageManipulation.php:724 +#: ../lib/imageManipulation.php:735 msgid "Unable to preserve EXIF data (jhead not installed)" msgstr "" -#: ../lib/imageManipulation.php:766 +#: ../lib/imageManipulation.php:778 msgid "Using IM high quality" msgstr "" -#: ../lib/imageManipulation.php:770 +#: ../lib/imageManipulation.php:782 msgid "Not using IM high quality" msgstr "" @@ -810,8 +810,8 @@ msgid "Password for the newly created user." msgstr "" -#: ../lib/mail.php:194 ../lib/setup.php:1489 ../lib/setup.php:1491 -#: ../lib/setup.php:1495 ../lib/setup.php:1503 +#: ../lib/mail.php:194 ../lib/setup.php:1484 ../lib/setup.php:1486 +#: ../lib/setup.php:1490 ../lib/setup.php:1498 msgid "Username" msgstr "" @@ -886,451 +886,451 @@ msgid "Powered by %s v%s" msgstr "" -#: ../lib/setup.php:147 +#: ../lib/setup.php:140 msgid "Please retype your password here" msgstr "" -#: ../lib/setup.php:161 ../lib/setup.php:1092 +#: ../lib/setup.php:154 ../lib/setup.php:1088 msgid "Name" msgstr "" -#: ../lib/setup.php:162 ../lib/setup.php:1092 +#: ../lib/setup.php:155 ../lib/setup.php:1088 msgid "Value" msgstr "" -#: ../lib/setup.php:191 ../lib/setup.php:234 +#: ../lib/setup.php:184 ../lib/setup.php:227 msgid "No content" msgstr "" -#: ../lib/setup.php:361 +#: ../lib/setup.php:354 #, php-format msgid "Missing value: %s" msgstr "" -#: ../lib/setup.php:379 +#: ../lib/setup.php:372 msgid "exec() is enabled on this server." msgstr "" -#: ../lib/setup.php:397 +#: ../lib/setup.php:390 msgid "I can read your .htaccess file." msgstr "" -#: ../lib/setup.php:419 +#: ../lib/setup.php:412 #, php-format msgid "PHP v%s is OK." msgstr "" -#: ../lib/setup.php:434 +#: ../lib/setup.php:428 msgid "mod_rewrite is enabled." msgstr "" -#: ../lib/setup.php:457 +#: ../lib/setup.php:451 msgid "Can't find jhead" msgstr "" -#: ../lib/setup.php:459 +#: ../lib/setup.php:453 msgid "jhead binary located." msgstr "" -#: ../lib/setup.php:497 +#: ../lib/setup.php:491 msgid "Without pnmcomp and pamcomp gallery will not be able to watermark images, unless you use ImageMagick and have the composite binary installed." msgstr "" -#: ../lib/setup.php:505 +#: ../lib/setup.php:499 msgid "NetPBM not being used in this installation." msgstr "" -#: ../lib/setup.php:510 ../lib/setup.php:605 +#: ../lib/setup.php:504 ../lib/setup.php:599 msgid "Cannot verify this path (it's not in your open_basedir list)." msgstr "" -#: ../lib/setup.php:544 ../lib/setup.php:622 +#: ../lib/setup.php:538 ../lib/setup.php:616 #, php-format msgid "Missing optional binary %s. %s" msgstr "" -#: ../lib/setup.php:547 ../lib/setup.php:625 +#: ../lib/setup.php:541 ../lib/setup.php:619 #, php-format msgid "Can't find %s!" msgstr "" -#: ../lib/setup.php:553 ../lib/setup.php:631 +#: ../lib/setup.php:547 ../lib/setup.php:625 #, php-format msgid "%s is not executable!" msgstr "" -#: ../lib/setup.php:563 ../lib/setup.php:570 +#: ../lib/setup.php:557 ../lib/setup.php:564 #, php-format msgid "%d of %d NetPBM binaries located." msgstr "" -#: ../lib/setup.php:594 +#: ../lib/setup.php:588 msgid "Without composite gallery will not be able to watermark images, except you use NetPBM and have the pnmcomp binary installed." msgstr "" -#: ../lib/setup.php:600 +#: ../lib/setup.php:594 msgid "ImageMagick not being used in this installation." msgstr "" -#: ../lib/setup.php:641 ../lib/setup.php:648 +#: ../lib/setup.php:635 ../lib/setup.php:642 #, php-format msgid "%d of %d ImageMagick binaries located." msgstr "" -#: ../lib/setup.php:670 +#: ../lib/setup.php:664 msgid "Can't find jpegtran!" msgstr "" -#: ../lib/setup.php:672 +#: ../lib/setup.php:666 msgid "jpegtran binary located." msgstr "" -#: ../lib/setup.php:683 +#: ../lib/setup.php:677 msgid "PHP has GNU gettext support." msgstr "" -#: ../lib/setup.php:685 +#: ../lib/setup.php:679 msgid "PHP does not have GNU gettext support." msgstr "" -#: ../lib/setup.php:699 +#: ../lib/setup.php:693 msgid "No languages found." msgstr "" -#: ../lib/setup.php:701 +#: ../lib/setup.php:695 msgid "It seems you didn't download any additional languages. This is not a problem! Gallery will appear just in English. Note: If this is not true, check that all files in locale folder are readable for the webserver, or contact the Gallery Team." msgstr "" -#: ../lib/setup.php:704 +#: ../lib/setup.php:698 #, php-format msgid "%d languages are available. If you are missing a language please visit the %sGallery download page%s." msgstr "" -#: ../lib/setup.php:726 +#: ../lib/setup.php:721 #, php-format msgid "You can check for more recent versions by visiting %s." msgstr "" -#: ../lib/setup.php:727 +#: ../lib/setup.php:722 #, php-format msgid "This version of %s was released on %s." msgstr "" -#: ../lib/setup.php:729 +#: ../lib/setup.php:725 #, php-format msgid "This is a development build of %s that was released on %s." msgstr "" -#: ../lib/setup.php:738 +#: ../lib/setup.php:734 msgid "Please check regularly for updates." msgstr "" -#: ../lib/setup.php:757 +#: ../lib/setup.php:753 msgid "All gallery locales are available on this host." msgstr "" -#: ../lib/setup.php:760 +#: ../lib/setup.php:756 #, php-format msgid "There are %d locales that Gallery was unable to locate. You may need to select manually date formats. " msgstr "" -#: ../lib/setup.php:766 +#: ../lib/setup.php:762 #, php-format msgid "Dates in %d languages may not be formatted properly, because the corresponding locales are missing. You may need to select manually the date formats for these." msgstr "" -#: ../lib/setup.php:771 +#: ../lib/setup.php:767 #, php-format msgid "We were unable to detect any locales. However, your PHP installation is configured with the %s restriction so this may be interfering with the way that we detect locales. Unfortunately this means the date format will not change for different languages. However, it is OK to continue." msgstr "" -#: ../lib/setup.php:775 +#: ../lib/setup.php:771 #, php-format msgid "We were unable to detect any system locales. Multi-language functions will be disabled. Please install the corresponding locales or ask your administrator to do this. This problem is known on %s systems. In this case please have a look at this %sDebian locale HowTo%s." msgstr "" -#: ../lib/setup.php:777 +#: ../lib/setup.php:773 msgid "Only the default locale for this machine is available, so date format will not change for different languages." msgstr "" -#: ../lib/setup.php:936 ../lib/setup.php:1016 +#: ../lib/setup.php:932 ../lib/setup.php:1012 msgid "Advanced" msgstr "" -#: ../lib/setup.php:936 +#: ../lib/setup.php:932 #, php-format msgid "System locale selection required" msgstr "" -#: ../lib/setup.php:937 +#: ../lib/setup.php:933 msgid "There is more than one suitable system locale installed on your machine for the following languages. Please chose the one you think is most suitable." msgstr "" -#: ../lib/setup.php:939 ../lib/setup.php:1019 +#: ../lib/setup.php:935 ../lib/setup.php:1015 msgid "This is only for date & time format. You only need to edit the languages you enabled above" msgstr "" -#: ../lib/setup.php:950 ../lib/setup.php:974 +#: ../lib/setup.php:946 ../lib/setup.php:970 msgid "System locale" msgstr "" -#: ../lib/setup.php:1016 +#: ../lib/setup.php:1012 #, php-format msgid "System locale problems" msgstr "" -#: ../lib/setup.php:1017 +#: ../lib/setup.php:1013 msgid "There are no apparently suitable system locales installed on your machine for the following languages. Please choose the one you think is most suitable." msgstr "" -#: ../lib/setup.php:1060 +#: ../lib/setup.php:1056 msgid "safe_mode is off." msgstr "" -#: ../lib/setup.php:1072 +#: ../lib/setup.php:1068 msgid "magic_quotes are off." msgstr "" -#: ../lib/setup.php:1090 +#: ../lib/setup.php:1086 #, php-format msgid "In %s, missing %s in row %d with %s %s." msgstr "" -#: ../lib/setup.php:1091 ../lib/setup.php:1100 ../lib/setup.php:1105 +#: ../lib/setup.php:1087 ../lib/setup.php:1096 ../lib/setup.php:1101 msgid "Vote words and values" msgstr "" -#: ../lib/setup.php:1099 +#: ../lib/setup.php:1095 #, php-format msgid "In %s, blank in row %d." msgstr "" -#: ../lib/setup.php:1104 +#: ../lib/setup.php:1100 #, php-format msgid "In %s, for name %s (row %d) value %s should be a positive whole number" msgstr "" -#: ../lib/setup.php:1126 +#: ../lib/setup.php:1122 msgid "register_globals is off." msgstr "" -#: ../lib/setup.php:1297 +#: ../lib/setup.php:1292 msgid "Your passwords do not match!" msgstr "" -#: ../lib/setup.php:1308 +#: ../lib/setup.php:1303 msgid "OK" msgstr "" -#: ../lib/setup.php:1313 +#: ../lib/setup.php:1308 msgid "Valid admin email address given." msgstr "" -#: ../lib/setup.php:1320 +#: ../lib/setup.php:1315 msgid "You must specify valid admin email addresses" msgstr "" -#: ../lib/setup.php:1328 +#: ../lib/setup.php:1323 #, php-format msgid "%s is not a valid email address." msgstr "" -#: ../lib/setup.php:1337 +#: ../lib/setup.php:1332 msgid "Valid sender email address given." msgstr "" -#: ../lib/setup.php:1339 +#: ../lib/setup.php:1334 msgid "You must specify a valid sender email address" msgstr "" -#: ../lib/setup.php:1342 +#: ../lib/setup.php:1337 #, php-format msgid "You must include %s in your welcome email" msgstr "" -#: ../lib/setup.php:1347 +#: ../lib/setup.php:1342 #, php-format msgid "You must include %s or %s in your welcome email" msgstr "" -#: ../lib/setup.php:1371 +#: ../lib/setup.php:1366 #, php-format msgid "The following files are out of date, corrupted or missing:
        %s." msgstr "" -#: ../lib/setup.php:1373 +#: ../lib/setup.php:1368 msgid "This should be fixed before proceeding" msgstr "" -#: ../lib/setup.php:1374 ../lib/setup.php:1378 +#: ../lib/setup.php:1369 ../lib/setup.php:1373 #, php-format msgid "Look at %sCheck Versions%s for more details." msgstr "" -#: ../lib/setup.php:1377 +#: ../lib/setup.php:1372 #, php-format -msgid "%d files are more recent than expected. This is OK if you are using pre-release, beta, CVS or modified code." +msgid "%d files are more recent than expected. This is OK if you are using pre-release, beta, SVN or modified code." msgstr "" -#: ../lib/setup.php:1382 +#: ../lib/setup.php:1377 #, php-format msgid "All tested files up-to-date." msgstr "" -#: ../lib/setup.php:1384 +#: ../lib/setup.php:1379 #, php-format msgid "All %d tested files up-to-date." msgstr "" -#: ../lib/setup.php:1393 +#: ../lib/setup.php:1388 #, php-format msgid "this is new in version %s" msgstr "" -#: ../lib/setup.php:1398 +#: ../lib/setup.php:1393 #, php-format msgid "Return to %s." msgstr "" -#: ../lib/setup.php:1399 +#: ../lib/setup.php:1394 msgid "Configuration Wizard" msgstr "" -#: ../lib/setup.php:1448 +#: ../lib/setup.php:1443 #, php-format msgid "You must enter a password for the %s account." msgstr "" -#: ../lib/setup.php:1453 +#: ../lib/setup.php:1448 #, php-format msgid "It seems you've already configured Gallery, because there is one admin account, but its not called %s." msgstr "" -#: ../lib/setup.php:1456 +#: ../lib/setup.php:1451 #, php-format msgid "It seems you've already configured Gallery, because there are %d admin accounts, but no user called %s." msgstr "" -#: ../lib/setup.php:1458 +#: ../lib/setup.php:1453 #, php-format msgid "You don't have to enter a password. But if you do, Gallery will create an administrator account called %s with that password." msgstr "" -#: ../lib/setup.php:1467 +#: ../lib/setup.php:1462 #, php-format msgid "It seems you've already configured Gallery, because the %s user exists. You don't have to enter a password. But if you do, Gallery will change the password for the %s user." msgstr "" -#: ../lib/setup.php:1474 +#: ../lib/setup.php:1469 msgid "Admin password" msgstr "" -#: ../lib/setup.php:1489 ../lib/setup.php:1491 ../lib/setup.php:1493 -#: ../lib/setup.php:1501 +#: ../lib/setup.php:1484 ../lib/setup.php:1486 ../lib/setup.php:1488 +#: ../lib/setup.php:1496 msgid "Full Name" msgstr "" -#: ../lib/setup.php:1497 +#: ../lib/setup.php:1492 msgid "Full name that you can click on to send email (mailto:)" msgstr "" -#: ../lib/setup.php:1499 +#: ../lib/setup.php:1494 msgid "Username that you can click on to send email (mailto:)" msgstr "" -#: ../lib/setup.php:1501 ../lib/setup.php:1503 +#: ../lib/setup.php:1496 ../lib/setup.php:1498 msgid "email address" msgstr "" -#: ../lib/setup.php:1516 +#: ../lib/setup.php:1518 msgid "File missing or unreadable. Please install then re-run this test." msgstr "" -#: ../lib/setup.php:1520 +#: ../lib/setup.php:1522 #, php-format msgid "Please ensure that %s is the latest version." msgstr "" -#: ../lib/setup.php:1525 +#: ../lib/setup.php:1527 #, php-format msgid "Testing status of %d files." msgstr "" -#: ../lib/setup.php:1532 +#: ../lib/setup.php:1534 #, php-format msgid "Cannot read file %s." msgstr "" -#: ../lib/setup.php:1534 +#: ../lib/setup.php:1536 msgid "File missing or unreadable." msgstr "" -#: ../lib/setup.php:1539 +#: ../lib/setup.php:1556 #, php-format msgid "Version information not found in %s. File must be old version or corrupted." msgstr "" -#: ../lib/setup.php:1541 +#: ../lib/setup.php:1558 msgid "Missing version" msgstr "" -#: ../lib/setup.php:1548 +#: ../lib/setup.php:1567 #, php-format msgid "Problem with %s. Expected version %s (or greater) but found %s." msgstr "" -#: ../lib/setup.php:1550 +#: ../lib/setup.php:1569 #, php-format msgid "Expected version %s (or greater) but found %s." msgstr "" -#: ../lib/setup.php:1554 +#: ../lib/setup.php:1573 #, php-format msgid "%s OK. Actual version (%s) more recent than expected version (%s)" msgstr "" -#: ../lib/setup.php:1556 +#: ../lib/setup.php:1575 #, php-format msgid "Expected version %s but found %s." msgstr "" -#: ../lib/setup.php:1560 +#: ../lib/setup.php:1579 #, php-format msgid "%s OK" msgstr "" -#: ../lib/setup.php:1562 +#: ../lib/setup.php:1581 #, php-format msgid "Found expected version %s." msgstr "" -#: ../lib/setup.php:1698 +#: ../lib/setup.php:1711 msgid "This email will be sent when new accounts are created." msgstr "" -#: ../lib/setup.php:1699 +#: ../lib/setup.php:1712 msgid "Leaving this field empty sets Gallery to use the default message (see below) which can be translated, or use your own welcome message." msgstr "" -#: ../lib/setup.php:1700 +#: ../lib/setup.php:1713 msgid "The following placeholder can be used:" msgstr "" -#: ../lib/setup.php:1763 +#: ../lib/setup.php:1776 #, php-format msgid "File %s does not exist." msgstr "" -#: ../lib/setup.php:1772 +#: ../lib/setup.php:1785 #, php-format msgid "Expected status: %s, but actually received status %s." msgstr "" -#: ../lib/setup.php:1785 +#: ../lib/setup.php:1798 msgid "can't detect version on Windows" msgstr "" -#: ../lib/setup.php:1796 +#: ../lib/setup.php:1809 #, php-format msgid "OK! Version: %s" msgstr "" @@ -1376,65 +1376,61 @@ msgstr "" #: ../lib/voting.php:253 -msgid "Total points in brackets" +msgid "(Total points in brackets)" msgstr "" #: ../lib/voting.php:257 -msgid "Average points in brackets" +msgid "(Average points in brackets)" msgstr "" -#: ../lib/voting.php:275 +#: ../lib/voting.php:276 #, php-format msgid "Album: %s" msgstr "" -#: ../lib/voting.php:303 +#: ../lib/voting.php:305 #, php-format msgid "1 voter" msgid_plural "%d voters" msgstr[0] "" msgstr[1] "" -#: ../lib/voting.php:315 +#: ../lib/voting.php:318 #, php-format msgid "Result from one voter" msgid_plural "Result of %d voters" msgstr[0] "" msgstr[1] "" -#: ../lib/voting.php:323 +#: ../lib/voting.php:329 #, php-format msgid "%s: %s points; " msgstr "" -#: ../lib/voting.php:328 +#: ../lib/voting.php:334 #, php-format msgid "Key - %s" msgstr "" -#: ../lib/voting.php:334 -msgid "No votes so far." -msgstr "" - -#: ../lib/voting.php:355 +#: ../lib/voting.php:360 msgid "Poll results:" msgstr "" -#: ../lib/voting.php:358 +#: ../lib/voting.php:363 msgid "No votes" msgstr "" -#: ../lib/voting.php:362 +#: ../lib/voting.php:367 #, php-format msgid "Number %d overall." msgstr "" -#: ../lib/voting.php:366 +#: ../lib/voting.php:371 #, php-format msgid "%s: %s" msgstr "" -#: ../lib/voting.php:367 +#: ../lib/voting.php:372 #, php-format msgid "one vote" msgid_plural "%d votes" diff -Naur gallery-1.5.3/po/gallery-config.pot gallery-1.5.4/po/gallery-config.pot --- gallery-1.5.3/po/gallery-config.pot 2006-04-05 00:32:05.000000000 +0200 +++ gallery-1.5.4/po/gallery-config.pot 2006-08-14 10:05:15.000000000 +0200 @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # -# $Id: gallery-config.pot,v 1.134.2.3 2006/04/04 22:32:05 jenst Exp $ +# $Id: gallery-config.pot 14313 2006-08-14 08:05:15Z jenst $ # # @version # @package Languagepack @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gallery-translations@lists.sourceforge.net\n" -"POT-Creation-Date: 2006-04-05 00:31+0200\n" +"POT-Creation-Date: 2006-08-14 10:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -101,459 +101,459 @@ msgid "A textured wooden frame" msgstr "" -#: ../lib/setup.php:147 +#: ../lib/setup.php:140 msgid "Please retype your password here" msgstr "" -#: ../lib/setup.php:161 ../lib/setup.php:1092 +#: ../lib/setup.php:154 ../lib/setup.php:1088 msgid "Name" msgstr "" -#: ../lib/setup.php:162 ../lib/setup.php:1092 +#: ../lib/setup.php:155 ../lib/setup.php:1088 msgid "Value" msgstr "" -#: ../lib/setup.php:191 ../lib/setup.php:234 +#: ../lib/setup.php:184 ../lib/setup.php:227 msgid "No content" msgstr "" -#: ../lib/setup.php:361 +#: ../lib/setup.php:354 #, php-format msgid "Missing value: %s" msgstr "" -#: ../lib/setup.php:379 +#: ../lib/setup.php:372 msgid "exec() is enabled on this server." msgstr "" -#: ../lib/setup.php:397 +#: ../lib/setup.php:390 msgid "I can read your .htaccess file." msgstr "" -#: ../lib/setup.php:419 +#: ../lib/setup.php:412 #, php-format msgid "PHP v%s is OK." msgstr "" -#: ../lib/setup.php:434 +#: ../lib/setup.php:428 msgid "mod_rewrite is enabled." msgstr "" -#: ../lib/setup.php:457 +#: ../lib/setup.php:451 msgid "Can't find jhead" msgstr "" -#: ../lib/setup.php:459 +#: ../lib/setup.php:453 msgid "jhead binary located." msgstr "" -#: ../lib/setup.php:497 +#: ../lib/setup.php:491 msgid "Without pnmcomp and pamcomp gallery will not be able to watermark images, unless you use ImageMagick and have the composite binary installed." msgstr "" -#: ../lib/setup.php:505 +#: ../lib/setup.php:499 msgid "NetPBM not being used in this installation." msgstr "" -#: ../lib/setup.php:510 ../lib/setup.php:605 +#: ../lib/setup.php:504 ../lib/setup.php:599 msgid "Cannot verify this path (it's not in your open_basedir list)." msgstr "" -#: ../lib/setup.php:544 ../lib/setup.php:622 +#: ../lib/setup.php:538 ../lib/setup.php:616 #, php-format msgid "Missing optional binary %s. %s" msgstr "" -#: ../lib/setup.php:547 ../lib/setup.php:625 +#: ../lib/setup.php:541 ../lib/setup.php:619 #, php-format msgid "Can't find %s!" msgstr "" -#: ../lib/setup.php:553 ../lib/setup.php:631 +#: ../lib/setup.php:547 ../lib/setup.php:625 #, php-format msgid "%s is not executable!" msgstr "" -#: ../lib/setup.php:563 ../lib/setup.php:570 +#: ../lib/setup.php:557 ../lib/setup.php:564 #, php-format msgid "%d of %d NetPBM binaries located." msgstr "" -#: ../lib/setup.php:594 +#: ../lib/setup.php:588 msgid "Without composite gallery will not be able to watermark images, except you use NetPBM and have the pnmcomp binary installed." msgstr "" -#: ../lib/setup.php:600 +#: ../lib/setup.php:594 msgid "ImageMagick not being used in this installation." msgstr "" -#: ../lib/setup.php:641 ../lib/setup.php:648 +#: ../lib/setup.php:635 ../lib/setup.php:642 #, php-format msgid "%d of %d ImageMagick binaries located." msgstr "" -#: ../lib/setup.php:670 +#: ../lib/setup.php:664 msgid "Can't find jpegtran!" msgstr "" -#: ../lib/setup.php:672 +#: ../lib/setup.php:666 msgid "jpegtran binary located." msgstr "" -#: ../lib/setup.php:683 +#: ../lib/setup.php:677 msgid "PHP has GNU gettext support." msgstr "" -#: ../lib/setup.php:685 +#: ../lib/setup.php:679 msgid "PHP does not have GNU gettext support." msgstr "" -#: ../lib/setup.php:699 +#: ../lib/setup.php:693 msgid "No languages found." msgstr "" -#: ../lib/setup.php:701 +#: ../lib/setup.php:695 msgid "It seems you didn't download any additional languages. This is not a problem! Gallery will appear just in English. Note: If this is not true, check that all files in locale folder are readable for the webserver, or contact the Gallery Team." msgstr "" -#: ../lib/setup.php:704 +#: ../lib/setup.php:698 #, php-format msgid "%d languages are available. If you are missing a language please visit the %sGallery download page%s." msgstr "" -#: ../lib/setup.php:726 +#: ../lib/setup.php:721 #, php-format msgid "You can check for more recent versions by visiting %s." msgstr "" -#: ../lib/setup.php:727 +#: ../lib/setup.php:722 #, php-format msgid "This version of %s was released on %s." msgstr "" -#: ../lib/setup.php:729 +#: ../lib/setup.php:725 #, php-format msgid "This is a development build of %s that was released on %s." msgstr "" -#: ../lib/setup.php:738 +#: ../lib/setup.php:734 msgid "Please check regularly for updates." msgstr "" -#: ../lib/setup.php:757 +#: ../lib/setup.php:753 msgid "All gallery locales are available on this host." msgstr "" -#: ../lib/setup.php:760 +#: ../lib/setup.php:756 #, php-format msgid "There are %d locales that Gallery was unable to locate. You may need to select manually date formats. " msgstr "" -#: ../lib/setup.php:766 +#: ../lib/setup.php:762 #, php-format msgid "Dates in %d languages may not be formatted properly, because the corresponding locales are missing. You may need to select manually the date formats for these." msgstr "" -#: ../lib/setup.php:771 +#: ../lib/setup.php:767 #, php-format msgid "We were unable to detect any locales. However, your PHP installation is configured with the %s restriction so this may be interfering with the way that we detect locales. Unfortunately this means the date format will not change for different languages. However, it is OK to continue." msgstr "" -#: ../lib/setup.php:775 +#: ../lib/setup.php:771 #, php-format msgid "We were unable to detect any system locales. Multi-language functions will be disabled. Please install the corresponding locales or ask your administrator to do this. This problem is known on %s systems. In this case please have a look at this %sDebian locale HowTo%s." msgstr "" -#: ../lib/setup.php:777 +#: ../lib/setup.php:773 msgid "Only the default locale for this machine is available, so date format will not change for different languages." msgstr "" -#: ../lib/setup.php:936 ../lib/setup.php:1016 ../setup/config_data.inc:777 +#: ../lib/setup.php:932 ../lib/setup.php:1012 ../setup/config_data.inc:777 #: ../setup/config_data.inc:787 ../setup/config_data.inc:1320 msgid "Advanced" msgstr "" -#: ../lib/setup.php:936 +#: ../lib/setup.php:932 #, php-format msgid "System locale selection required" msgstr "" -#: ../lib/setup.php:937 +#: ../lib/setup.php:933 msgid "There is more than one suitable system locale installed on your machine for the following languages. Please chose the one you think is most suitable." msgstr "" -#: ../lib/setup.php:939 ../lib/setup.php:1019 +#: ../lib/setup.php:935 ../lib/setup.php:1015 msgid "This is only for date & time format. You only need to edit the languages you enabled above" msgstr "" -#: ../lib/setup.php:950 ../lib/setup.php:974 +#: ../lib/setup.php:946 ../lib/setup.php:970 msgid "System locale" msgstr "" -#: ../lib/setup.php:1016 +#: ../lib/setup.php:1012 #, php-format msgid "System locale problems" msgstr "" -#: ../lib/setup.php:1017 +#: ../lib/setup.php:1013 msgid "There are no apparently suitable system locales installed on your machine for the following languages. Please choose the one you think is most suitable." msgstr "" -#: ../lib/setup.php:1060 +#: ../lib/setup.php:1056 msgid "safe_mode is off." msgstr "" -#: ../lib/setup.php:1072 +#: ../lib/setup.php:1068 msgid "magic_quotes are off." msgstr "" -#: ../lib/setup.php:1090 +#: ../lib/setup.php:1086 #, php-format msgid "In %s, missing %s in row %d with %s %s." msgstr "" -#: ../lib/setup.php:1091 ../lib/setup.php:1100 ../lib/setup.php:1105 +#: ../lib/setup.php:1087 ../lib/setup.php:1096 ../lib/setup.php:1101 #: ../setup/config_data.inc:1855 msgid "Vote words and values" msgstr "" -#: ../lib/setup.php:1099 +#: ../lib/setup.php:1095 #, php-format msgid "In %s, blank in row %d." msgstr "" -#: ../lib/setup.php:1104 +#: ../lib/setup.php:1100 #, php-format msgid "In %s, for name %s (row %d) value %s should be a positive whole number" msgstr "" -#: ../lib/setup.php:1126 +#: ../lib/setup.php:1122 msgid "register_globals is off." msgstr "" -#: ../lib/setup.php:1297 +#: ../lib/setup.php:1292 msgid "Your passwords do not match!" msgstr "" -#: ../lib/setup.php:1308 ../setup/check_imagemagick.php:68 +#: ../lib/setup.php:1303 ../setup/check_imagemagick.php:68 #: ../setup/check_netpbm.php:73 msgid "OK" msgstr "" -#: ../lib/setup.php:1313 +#: ../lib/setup.php:1308 msgid "Valid admin email address given." msgstr "" -#: ../lib/setup.php:1320 +#: ../lib/setup.php:1315 msgid "You must specify valid admin email addresses" msgstr "" -#: ../lib/setup.php:1328 +#: ../lib/setup.php:1323 #, php-format msgid "%s is not a valid email address." msgstr "" -#: ../lib/setup.php:1337 +#: ../lib/setup.php:1332 msgid "Valid sender email address given." msgstr "" -#: ../lib/setup.php:1339 +#: ../lib/setup.php:1334 msgid "You must specify a valid sender email address" msgstr "" -#: ../lib/setup.php:1342 +#: ../lib/setup.php:1337 #, php-format msgid "You must include %s in your welcome email" msgstr "" -#: ../lib/setup.php:1347 +#: ../lib/setup.php:1342 #, php-format msgid "You must include %s or %s in your welcome email" msgstr "" -#: ../lib/setup.php:1371 +#: ../lib/setup.php:1366 #, php-format msgid "The following files are out of date, corrupted or missing:
        %s." msgstr "" -#: ../lib/setup.php:1373 +#: ../lib/setup.php:1368 msgid "This should be fixed before proceeding" msgstr "" -#: ../lib/setup.php:1374 ../lib/setup.php:1378 +#: ../lib/setup.php:1369 ../lib/setup.php:1373 #, php-format msgid "Look at %sCheck Versions%s for more details." msgstr "" -#: ../lib/setup.php:1377 +#: ../lib/setup.php:1372 #, php-format -msgid "%d files are more recent than expected. This is OK if you are using pre-release, beta, CVS or modified code." +msgid "%d files are more recent than expected. This is OK if you are using pre-release, beta, SVN or modified code." msgstr "" -#: ../lib/setup.php:1382 +#: ../lib/setup.php:1377 #, php-format msgid "All tested files up-to-date." msgstr "" -#: ../lib/setup.php:1384 +#: ../lib/setup.php:1379 #, php-format msgid "All %d tested files up-to-date." msgstr "" -#: ../lib/setup.php:1393 +#: ../lib/setup.php:1388 #, php-format msgid "this is new in version %s" msgstr "" -#: ../lib/setup.php:1398 +#: ../lib/setup.php:1393 #, php-format msgid "Return to %s." msgstr "" -#: ../lib/setup.php:1399 +#: ../lib/setup.php:1394 msgid "Configuration Wizard" msgstr "" -#: ../lib/setup.php:1448 +#: ../lib/setup.php:1443 #, php-format msgid "You must enter a password for the %s account." msgstr "" -#: ../lib/setup.php:1453 +#: ../lib/setup.php:1448 #, php-format msgid "It seems you've already configured Gallery, because there is one admin account, but its not called %s." msgstr "" -#: ../lib/setup.php:1456 +#: ../lib/setup.php:1451 #, php-format msgid "It seems you've already configured Gallery, because there are %d admin accounts, but no user called %s." msgstr "" -#: ../lib/setup.php:1458 +#: ../lib/setup.php:1453 #, php-format msgid "You don't have to enter a password. But if you do, Gallery will create an administrator account called %s with that password." msgstr "" -#: ../lib/setup.php:1467 +#: ../lib/setup.php:1462 #, php-format msgid "It seems you've already configured Gallery, because the %s user exists. You don't have to enter a password. But if you do, Gallery will change the password for the %s user." msgstr "" -#: ../lib/setup.php:1474 +#: ../lib/setup.php:1469 msgid "Admin password" msgstr "" -#: ../lib/setup.php:1489 ../lib/setup.php:1491 ../lib/setup.php:1493 -#: ../lib/setup.php:1501 +#: ../lib/setup.php:1484 ../lib/setup.php:1486 ../lib/setup.php:1488 +#: ../lib/setup.php:1496 msgid "Full Name" msgstr "" -#: ../lib/setup.php:1489 ../lib/setup.php:1491 ../lib/setup.php:1495 -#: ../lib/setup.php:1503 ../setup/login.inc:93 +#: ../lib/setup.php:1484 ../lib/setup.php:1486 ../lib/setup.php:1490 +#: ../lib/setup.php:1498 ../setup/login.inc:93 msgid "Username" msgstr "" -#: ../lib/setup.php:1497 +#: ../lib/setup.php:1492 msgid "Full name that you can click on to send email (mailto:)" msgstr "" -#: ../lib/setup.php:1499 +#: ../lib/setup.php:1494 msgid "Username that you can click on to send email (mailto:)" msgstr "" -#: ../lib/setup.php:1501 ../lib/setup.php:1503 +#: ../lib/setup.php:1496 ../lib/setup.php:1498 msgid "email address" msgstr "" -#: ../lib/setup.php:1516 +#: ../lib/setup.php:1518 msgid "File missing or unreadable. Please install then re-run this test." msgstr "" -#: ../lib/setup.php:1520 +#: ../lib/setup.php:1522 #, php-format msgid "Please ensure that %s is the latest version." msgstr "" -#: ../lib/setup.php:1525 +#: ../lib/setup.php:1527 #, php-format msgid "Testing status of %d files." msgstr "" -#: ../lib/setup.php:1532 +#: ../lib/setup.php:1534 #, php-format msgid "Cannot read file %s." msgstr "" -#: ../lib/setup.php:1534 +#: ../lib/setup.php:1536 msgid "File missing or unreadable." msgstr "" -#: ../lib/setup.php:1539 +#: ../lib/setup.php:1556 #, php-format msgid "Version information not found in %s. File must be old version or corrupted." msgstr "" -#: ../lib/setup.php:1541 +#: ../lib/setup.php:1558 msgid "Missing version" msgstr "" -#: ../lib/setup.php:1548 +#: ../lib/setup.php:1567 #, php-format msgid "Problem with %s. Expected version %s (or greater) but found %s." msgstr "" -#: ../lib/setup.php:1550 +#: ../lib/setup.php:1569 #, php-format msgid "Expected version %s (or greater) but found %s." msgstr "" -#: ../lib/setup.php:1554 +#: ../lib/setup.php:1573 #, php-format msgid "%s OK. Actual version (%s) more recent than expected version (%s)" msgstr "" -#: ../lib/setup.php:1556 +#: ../lib/setup.php:1575 #, php-format msgid "Expected version %s but found %s." msgstr "" -#: ../lib/setup.php:1560 +#: ../lib/setup.php:1579 #, php-format msgid "%s OK" msgstr "" -#: ../lib/setup.php:1562 +#: ../lib/setup.php:1581 #, php-format msgid "Found expected version %s." msgstr "" -#: ../lib/setup.php:1698 +#: ../lib/setup.php:1711 msgid "This email will be sent when new accounts are created." msgstr "" -#: ../lib/setup.php:1699 +#: ../lib/setup.php:1712 msgid "Leaving this field empty sets Gallery to use the default message (see below) which can be translated, or use your own welcome message." msgstr "" -#: ../lib/setup.php:1700 +#: ../lib/setup.php:1713 msgid "The following placeholder can be used:" msgstr "" -#: ../lib/setup.php:1763 ../setup/check_netpbm.php:250 +#: ../lib/setup.php:1776 ../setup/check_netpbm.php:250 #, php-format msgid "File %s does not exist." msgstr "" -#: ../lib/setup.php:1772 ../setup/check_netpbm.php:261 +#: ../lib/setup.php:1785 ../setup/check_netpbm.php:261 #, php-format msgid "Expected status: %s, but actually received status %s." msgstr "" -#: ../lib/setup.php:1785 ../setup/check_netpbm.php:275 +#: ../lib/setup.php:1798 ../setup/check_netpbm.php:275 msgid "can't detect version on Windows" msgstr "" -#: ../lib/setup.php:1796 ../setup/check_netpbm.php:301 +#: ../lib/setup.php:1809 ../setup/check_netpbm.php:301 #, php-format msgid "OK! Version: %s" msgstr "" @@ -614,7 +614,7 @@ msgid "Failure" msgstr "" -#: ../setup/check.inc:104 ../setup/check_versions.php:75 +#: ../setup/check.inc:104 ../setup/check_versions.php:74 msgid "Show/hide more information" msgstr "" @@ -642,8 +642,8 @@ msgid "Your installation passed with flying colors! Go go go!" msgstr "" -#: ../setup/check.inc:210 ../setup/constants.inc:44 ../setup/constants.inc:187 -#: ../setup/defaults.inc:46 ../setup/defaults.inc:132 +#: ../setup/check.inc:210 ../setup/constants.inc:44 ../setup/constants.inc:188 +#: ../setup/defaults.inc:46 ../setup/defaults.inc:133 msgid "Next Step" msgstr "" @@ -830,59 +830,59 @@ msgid "If you see errors, you should %sclick here%s to see more details" msgstr "" -#: ../setup/check_versions.php:30 ../setup/check_versions.php:41 +#: ../setup/check_versions.php:30 ../setup/check_versions.php:39 msgid "Check Versions" msgstr "" -#: ../setup/check_versions.php:44 +#: ../setup/check_versions.php:43 #, php-format msgid "This page gives you information about the version of each necessary %s file. " msgstr "" -#: ../setup/check_versions.php:46 +#: ../setup/check_versions.php:45 msgid "If you see any error(s), we highly suggest to get the actual version of that file(s)." msgstr "" -#: ../setup/check_versions.php:55 +#: ../setup/check_versions.php:54 #, php-format msgid "One file is missing, corrupt or older than expected." msgid_plural "%d files are missing, corrupt or older than expected." msgstr[0] "" msgstr[1] "" -#: ../setup/check_versions.php:55 ../setup/check_versions.php:60 +#: ../setup/check_versions.php:54 ../setup/check_versions.php:59 msgid "All files okay." msgstr "" -#: ../setup/check_versions.php:57 +#: ../setup/check_versions.php:56 #, php-format msgid "There are problems with the following files. Please correct them before configuring %s." msgstr "" -#: ../setup/check_versions.php:60 +#: ../setup/check_versions.php:59 #, php-format msgid "One file is more recent than expected." msgid_plural "%d files are more recent than expected." msgstr[0] "" msgstr[1] "" -#: ../setup/check_versions.php:62 +#: ../setup/check_versions.php:61 #, php-format msgid "The following files are more up-to-date than expected for this version of %s. If you are using pre-release code, this is OK." msgstr "" -#: ../setup/check_versions.php:65 +#: ../setup/check_versions.php:64 #, php-format msgid "One file is up-to-date." msgid_plural "%d files are up-to-date." msgstr[0] "" msgstr[1] "" -#: ../setup/check_versions.php:65 +#: ../setup/check_versions.php:64 msgid "All files are up-to-date." msgstr "" -#: ../setup/check_versions.php:67 +#: ../setup/check_versions.php:66 msgid "The following files are up-to-date." msgstr "" @@ -1232,7 +1232,7 @@ #: ../setup/config_data.inc:318 #, php-format -msgid "The full path on physical disk to the directory where your photos will be stored. This directory should start off empty—Gallery will fill it. Note that this directory needs to have write access by the user who is running the web server (in your case this user is %s)." +msgid "The full path on physical disk to the directory where your photos will be stored. This directory should start off empty. Gallery will fill it. Note that this directory needs to have write access by the user who is running the web server (in your case this user is %s)." msgstr "" #: ../setup/config_data.inc:329 @@ -2884,7 +2884,7 @@ msgstr "" #: ../setup/config_data.inc:1947 -msgid "Displays previos & next images, with current image between." +msgid "Displays previous & next images, with current image between." msgstr "" #: ../setup/config_data.inc:1956 @@ -2960,19 +2960,19 @@ msgid "This frame will appear around the thumbnail image representing a subalbum." msgstr "" -#: ../setup/config_data.inc:2025 +#: ../setup/config_data.inc:2024 msgid "Frame around thumbs" msgstr "" -#: ../setup/config_data.inc:2026 +#: ../setup/config_data.inc:2025 msgid "This frame will appear around the thumbnail image representing a photo or movie." msgstr "" -#: ../setup/config_data.inc:2031 +#: ../setup/config_data.inc:2030 msgid "Frame around images" msgstr "" -#: ../setup/config_data.inc:2032 +#: ../setup/config_data.inc:2031 msgid "This frame will appear around fulled sized and resized photos." msgstr "" @@ -3133,23 +3133,23 @@ msgid "Switch through the corresponding tab and fill the values you need. Some, but not all values are required. If you have finished this step use the button to go to the next Step." msgstr "" -#: ../setup/constants.inc:41 ../setup/constants.inc:184 -#: ../setup/defaults.inc:43 ../setup/defaults.inc:129 +#: ../setup/constants.inc:41 ../setup/constants.inc:185 +#: ../setup/defaults.inc:43 ../setup/defaults.inc:130 msgid "Previous Step" msgstr "" -#: ../setup/constants.inc:42 ../setup/constants.inc:185 -#: ../setup/defaults.inc:44 ../setup/defaults.inc:130 +#: ../setup/constants.inc:42 ../setup/constants.inc:186 +#: ../setup/defaults.inc:44 ../setup/defaults.inc:131 msgid "Previous Tab" msgstr "" -#: ../setup/constants.inc:43 ../setup/constants.inc:186 -#: ../setup/defaults.inc:45 ../setup/defaults.inc:131 +#: ../setup/constants.inc:43 ../setup/constants.inc:187 +#: ../setup/defaults.inc:45 ../setup/defaults.inc:132 msgid "Next Tab" msgstr "" -#: ../setup/constants.inc:45 ../setup/constants.inc:188 -#: ../setup/defaults.inc:47 ../setup/defaults.inc:133 +#: ../setup/constants.inc:45 ../setup/constants.inc:189 +#: ../setup/defaults.inc:47 ../setup/defaults.inc:134 msgid "Use Defaults" msgstr "" diff -Naur gallery-1.5.3/po/gallery-core.pot gallery-1.5.4/po/gallery-core.pot --- gallery-1.5.3/po/gallery-core.pot 2006-04-05 00:32:05.000000000 +0200 +++ gallery-1.5.4/po/gallery-core.pot 2006-08-14 10:05:15.000000000 +0200 @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # -# $Id: gallery-core.pot,v 1.134.2.3 2006/04/04 22:32:05 jenst Exp $ +# $Id: gallery-core.pot 14313 2006-08-14 08:05:15Z jenst $ # # @version # @package Languagepack @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gallery-translations@lists.sourceforge.net\n" -"POT-Creation-Date: 2006-04-05 00:31+0200\n" +"POT-Creation-Date: 2006-08-14 10:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -63,17 +63,17 @@ msgid "Your Comment contains forbidden words. It will not be added." msgstr "" -#: ../add_comment.php:79 ../add_comment.php:83 +#: ../add_comment.php:80 ../add_comment.php:84 msgid "Add Comment" msgstr "" -#: ../add_comment.php:85 +#: ../add_comment.php:86 msgid "Enter your comment for this picture in the text box below." msgstr "" -#: ../add_comment.php:98 ../copy_photo.php:214 ../delete_album.php:72 +#: ../add_comment.php:99 ../copy_photo.php:214 ../delete_album.php:72 #: ../delete_photo.php:145 ../delete_user.php:85 ../download.php:84 -#: ../ecard_form.php:263 ../edit_caption.php:184 ../edit_watermark.php:121 +#: ../ecard_form.php:259 ../edit_caption.php:184 ../edit_watermark.php:121 #: ../includes/add_photos/add_form.inc:90 #: ../includes/add_photos/add_url.inc:55 ../login.php:96 ../move_album.php:117 #: ../move_album.php:134 ../move_photo.php:264 ../move_photo.php:352 @@ -220,7 +220,7 @@ #: ../administer_startpage.php:99 ../administer_startpage.php:109 #: ../download.php:91 ../edit_field.php:66 ../help/imagemap.php:88 -#: ../user_preferences.php:145 ../view_photo_properties.php:137 +#: ../user_preferences.php:146 ../view_photo_properties.php:137 msgid "Close Window" msgstr "" @@ -264,31 +264,31 @@ msgid "Users who can change album text." msgstr "" -#: ../album_permissions.php:110 ../album_permissions.php:114 +#: ../album_permissions.php:111 ../album_permissions.php:115 msgid "Album Permissions" msgstr "" -#: ../album_permissions.php:116 +#: ../album_permissions.php:117 #, php-format msgid "Changing permissions for %s" msgstr "" -#: ../album_permissions.php:122 +#: ../album_permissions.php:123 msgid "Owner:" msgstr "" -#: ../album_permissions.php:156 +#: ../album_permissions.php:157 msgid "Apply permissions to all sub-albums" msgstr "" -#: ../album_permissions.php:159 ../edit_caption.php:183 ../edit_field.php:55 +#: ../album_permissions.php:160 ../edit_caption.php:183 ../edit_field.php:55 #: ../edit_field.php:65 ../edit_watermark.php:119 ../modify_user.php:163 -#: ../new_password.php:137 ../photo_owner.php:103 ../user_preferences.php:144 +#: ../new_password.php:137 ../photo_owner.php:103 ../user_preferences.php:145 #: ../watermark_album.php:148 msgid "Save" msgstr "" -#: ../album_permissions.php:160 ../manage_users.php:100 ../modify_user.php:165 +#: ../album_permissions.php:161 ../manage_users.php:100 ../modify_user.php:165 #: ../photo_owner.php:104 ../upgrade_album.php:66 ../upgrade_album.php:179 #: ../upgrade_users.php:61 msgid "Done" @@ -461,11 +461,11 @@ msgid "The requested album with index %s is not valid" msgstr "" -#: ../albums.php:333 ../view_album.php:679 +#: ../albums.php:333 ../view_album.php:690 msgid "Highlight for Album:" msgstr "" -#: ../albums.php:353 ../view_album.php:785 +#: ../albums.php:353 ../view_album.php:796 msgid "Download entire album as archive" msgstr "" @@ -513,7 +513,7 @@ msgid "This album has been viewed %s since %s." msgstr "" -#: ../albums.php:446 ../view_album.php:820 +#: ../albums.php:446 ../view_album.php:831 #, php-format msgid "1 time" msgid_plural "%d times" @@ -528,7 +528,7 @@ msgid "reset counter" msgstr "" -#: ../albums.php:497 ../view_album.php:919 +#: ../albums.php:497 ../view_album.php:930 msgid "Comments available for this item." msgstr "" @@ -597,7 +597,7 @@ msgstr "" #: ../captionator.php:262 ../layout/commentboxtop.inc:20 -#: ../layout/commentboxtop.inc:45 ../view_album.php:773 +#: ../layout/commentboxtop.inc:45 ../view_album.php:784 msgid "hidden" msgstr "" @@ -634,7 +634,7 @@ msgstr "" #: ../classes/Album.php:240 ../classes/Album.php:252 -#: ../layout/commentboxtop.inc:18 ../lib/albumItem.php:71 +#: ../layout/commentboxtop.inc:18 ../lib/albumItem.php:72 #: ../upgrade_album.php:84 ../upgrade_album.php:96 msgid "Album" msgstr "" @@ -695,7 +695,7 @@ msgid "Operation was done successfully. Emailing is on, but no email was sent as no valid email address was found" msgstr "" -#: ../classes/Album.php:1143 ../classes/Album.php:1898 +#: ../classes/Album.php:1143 ../classes/Album.php:1909 #, php-format msgid "Entering album %s, processing %d photos" msgstr "" @@ -738,27 +738,27 @@ msgid "No highlight!" msgstr "" -#: ../classes/Album.php:1696 +#: ../classes/Album.php:1700 #, php-format -msgid "Requested index [%d] out of bounds [%d]" +msgid "Requested index [%d] out of bounds [%d]. Gallery could not load the requested album item." msgstr "" -#: ../classes/Album.php:1910 ../do_command.php:105 +#: ../classes/Album.php:1921 ../do_command.php:105 #, php-format msgid "Processing image %d..." msgstr "" -#: ../classes/Album.php:2079 +#: ../classes/Album.php:2090 #, php-format msgid "Error getting EXIF data. Expected Status 0, got %s." msgstr "" -#: ../classes/Album.php:2615 +#: ../classes/Album.php:2626 #, php-format msgid "#%d" msgstr "" -#: ../classes/Album.php:2779 +#: ../classes/Album.php:2790 #, php-format msgid "Email problem: skipping %s (UID %s) because email address %s is not valid." msgstr "" @@ -1007,9 +1007,9 @@ msgstr "" #: ../delete_album.php:71 ../delete_photo.php:144 ../delete_user.php:80 -#: ../js/multifile.js.php:106 ../layout/commentbox.inc:15 -#: ../lib/albumItem.php:251 ../lib/albumItem.php:252 ../lib/albumItem.php:258 -#: ../lib/albumItem.php:259 ../manage_users.php:98 +#: ../js/multifile.js.php:112 ../layout/commentbox.inc:15 +#: ../lib/albumItem.php:252 ../lib/albumItem.php:253 ../lib/albumItem.php:259 +#: ../lib/albumItem.php:260 ../manage_users.php:98 #: ../tools/despam-comments.php:206 ../tools/despam-comments.php:345 msgid "Delete" msgstr "" @@ -1168,115 +1168,115 @@ msgid "This album album is not empty, but contains no photo or movie! Download would'nt make sense." msgstr "" -#: ../ecard_form.php:45 +#: ../ecard_form.php:38 +msgid "Send this photo as eCard" +msgstr "" + +#: ../ecard_form.php:52 msgid "Error processing e-card. Please try later." msgstr "" -#: ../ecard_form.php:46 +#: ../ecard_form.php:53 msgid "Some input fields are not correctly filled out. Please fill out." msgstr "" -#: ../ecard_form.php:47 +#: ../ecard_form.php:54 msgid "You have an e-card as attachment. Click to see." msgstr "" -#: ../ecard_form.php:85 ../ecard_form.php:170 -msgid "Send this photo as eCard" -msgstr "" - -#: ../ecard_form.php:110 +#: ../ecard_form.php:112 msgid "Error: to send an eCard you need to fill out all fields." msgstr "" -#: ../ecard_form.php:111 +#: ../ecard_form.php:113 msgid "Please fill this fields:" msgstr "" -#: ../ecard_form.php:115 +#: ../ecard_form.php:117 msgid "- Your Name" msgstr "" -#: ../ecard_form.php:121 +#: ../ecard_form.php:123 msgid "- Your Email" msgstr "" -#: ../ecard_form.php:126 +#: ../ecard_form.php:128 msgid "- Recipient's Name" msgstr "" -#: ../ecard_form.php:132 +#: ../ecard_form.php:134 msgid "- Recipient's Email" msgstr "" -#: ../ecard_form.php:137 +#: ../ecard_form.php:139 msgid "- Your Message" msgstr "" -#: ../ecard_form.php:141 +#: ../ecard_form.php:143 msgid "Please fill all fields next click >Send<." msgstr "" -#: ../ecard_form.php:154 +#: ../ecard_form.php:156 #, php-format msgid "You have entered more than %d characters" msgstr "" -#: ../ecard_form.php:192 +#: ../ecard_form.php:188 msgid "Your info" msgstr "" -#: ../ecard_form.php:194 +#: ../ecard_form.php:190 msgid "Recipient's info" msgstr "" -#: ../ecard_form.php:197 ../ecard_form.php:208 +#: ../ecard_form.php:193 ../ecard_form.php:204 msgid "Name" msgstr "" -#: ../ecard_form.php:212 ../ecard_form.php:215 +#: ../ecard_form.php:208 ../ecard_form.php:211 msgid "E-Mail" msgstr "" -#: ../ecard_form.php:221 +#: ../ecard_form.php:217 msgid "Choose a Stamp" msgstr "" -#: ../ecard_form.php:226 +#: ../ecard_form.php:222 #, php-format msgid "Stamp #%d" msgstr "" -#: ../ecard_form.php:236 +#: ../ecard_form.php:232 msgid "Subject:" msgstr "" -#: ../ecard_form.php:237 +#: ../ecard_form.php:233 #, php-format msgid "%s sent you an E-C@rd" msgstr "" -#: ../ecard_form.php:241 +#: ../ecard_form.php:237 msgid "Your Message:" msgstr "" -#: ../ecard_form.php:260 ../edit_watermark.php:120 ../watermark_album.php:151 +#: ../ecard_form.php:256 ../edit_watermark.php:120 ../watermark_album.php:151 msgid "Preview" msgstr "" -#: ../ecard_form.php:261 +#: ../ecard_form.php:257 msgid "Reset" msgstr "" -#: ../ecard_form.php:264 +#: ../ecard_form.php:260 msgid "Send eCard" msgstr "" -#: ../ecard_form.php:272 +#: ../ecard_form.php:268 #, php-format msgid "Your E-C@rd with the picture below has been sent to %s <%s>." msgstr "" -#: ../ecard_form.php:276 +#: ../ecard_form.php:272 msgid "Close this window" msgstr "" @@ -1340,7 +1340,7 @@ msgid "Year must be between 1969 and 2070" msgstr "" -#: ../edit_caption.php:73 ../lib/albumItem.php:104 ../lib/albumItem.php:105 +#: ../edit_caption.php:73 ../lib/albumItem.php:105 ../lib/albumItem.php:106 msgid "Edit Text" msgstr "" @@ -1816,7 +1816,7 @@ msgid "Supported file types: %s" msgstr "" -#: ../includes/add_photos/add_form.inc:38 ../view_album.php:565 +#: ../includes/add_photos/add_form.inc:38 ../view_album.php:573 msgid " or " msgstr "" @@ -2299,43 +2299,43 @@ msgid "Filter by day" msgstr "" -#: ../js/multifile.js.php:143 +#: ../js/multifile.js.php:149 msgid "Caption:" msgstr "" -#: ../layout/adminAlbumCommands.inc:6 +#: ../layout/adminAlbumCommands.inc:12 msgid "delete album" msgstr "" -#: ../layout/adminAlbumCommands.inc:11 +#: ../layout/adminAlbumCommands.inc:17 msgid "move album" msgstr "" -#: ../layout/adminAlbumCommands.inc:12 +#: ../layout/adminAlbumCommands.inc:18 msgid "reorder album" msgstr "" -#: ../layout/adminAlbumCommands.inc:13 +#: ../layout/adminAlbumCommands.inc:19 msgid "rename album" msgstr "" -#: ../layout/adminAlbumCommands.inc:20 +#: ../layout/adminAlbumCommands.inc:26 msgid "edit captions" msgstr "" -#: ../layout/adminAlbumCommands.inc:27 +#: ../layout/adminAlbumCommands.inc:33 msgid "permissions" msgstr "" -#: ../layout/adminAlbumCommands.inc:28 +#: ../layout/adminAlbumCommands.inc:34 msgid "properties" msgstr "" -#: ../layout/adminAlbumCommands.inc:35 ../view_album.php:415 +#: ../layout/adminAlbumCommands.inc:41 ../view_album.php:415 msgid "view comments" msgstr "" -#: ../layout/adminAlbumCommands.inc:40 +#: ../layout/adminAlbumCommands.inc:46 msgid "watermark album" msgstr "" @@ -2364,11 +2364,11 @@ msgid "Album contains no comments" msgstr "" -#: ../layout/commentdraw.inc:23 ../lib/albumItem.php:324 +#: ../layout/commentdraw.inc:23 ../lib/albumItem.php:325 msgid "From:" msgstr "" -#: ../layout/commentdraw.inc:48 ../lib/albumItem.php:298 +#: ../layout/commentdraw.inc:48 ../lib/albumItem.php:299 msgid "delete comment" msgstr "" @@ -2504,28 +2504,28 @@ msgid "Only full photos" msgstr "" -#: ../lib/albumItem.php:78 ../rearrange.php:112 +#: ../lib/albumItem.php:79 ../rearrange.php:112 msgid "Movie" msgstr "" -#: ../lib/albumItem.php:81 +#: ../lib/albumItem.php:82 msgid "Photo" msgstr "" -#: ../lib/albumItem.php:109 ../lib/albumItem.php:110 +#: ../lib/albumItem.php:110 ../lib/albumItem.php:111 msgid "Edit Thumbnail" msgstr "" -#: ../lib/albumItem.php:114 ../lib/albumItem.php:115 +#: ../lib/albumItem.php:115 ../lib/albumItem.php:116 #, php-format msgid "Rotate/Flip" msgstr "" -#: ../lib/albumItem.php:119 ../lib/albumItem.php:120 +#: ../lib/albumItem.php:120 ../lib/albumItem.php:121 msgid "Resize" msgstr "" -#: ../lib/albumItem.php:125 ../lib/albumItem.php:126 +#: ../lib/albumItem.php:126 ../lib/albumItem.php:127 msgid "Watermark" msgstr "" @@ -2533,70 +2533,70 @@ msgid "ImageMap" msgstr "" -#: ../lib/albumItem.php:140 ../lib/albumItem.php:141 +#: ../lib/albumItem.php:141 ../lib/albumItem.php:142 msgid "Move" msgstr "" -#: ../lib/albumItem.php:148 ../lib/albumItem.php:149 +#: ../lib/albumItem.php:149 ../lib/albumItem.php:150 msgid "Edit Title" msgstr "" -#: ../lib/albumItem.php:153 ../lib/albumItem.php:154 +#: ../lib/albumItem.php:154 ../lib/albumItem.php:155 msgid "Edit Description" msgstr "" -#: ../lib/albumItem.php:159 ../lib/albumItem.php:160 ../rename_album.php:39 +#: ../lib/albumItem.php:160 ../lib/albumItem.php:161 ../rename_album.php:39 #: ../rename_album.php:43 msgid "Rename Album" msgstr "" -#: ../lib/albumItem.php:165 ../lib/albumItem.php:166 +#: ../lib/albumItem.php:166 ../lib/albumItem.php:167 msgid "Reset Counter" msgstr "" -#: ../lib/albumItem.php:177 ../lib/albumItem.php:178 ../view_album.php:316 +#: ../lib/albumItem.php:178 ../lib/albumItem.php:179 ../view_album.php:316 msgid "Permissions" msgstr "" -#: ../lib/albumItem.php:185 ../lib/albumItem.php:186 +#: ../lib/albumItem.php:186 ../lib/albumItem.php:187 #: ../watermark_album.php:114 ../watermark_album.php:118 msgid "Watermark Album" msgstr "" -#: ../lib/albumItem.php:192 ../lib/albumItem.php:193 +#: ../lib/albumItem.php:193 ../lib/albumItem.php:194 msgid "View Comments" msgstr "" -#: ../lib/albumItem.php:200 ../lib/albumItem.php:201 +#: ../lib/albumItem.php:201 ../lib/albumItem.php:202 msgid "Copy" msgstr "" -#: ../lib/albumItem.php:208 ../lib/albumItem.php:209 +#: ../lib/albumItem.php:209 ../lib/albumItem.php:210 msgid "Show" msgstr "" -#: ../lib/albumItem.php:214 ../lib/albumItem.php:215 +#: ../lib/albumItem.php:215 ../lib/albumItem.php:216 msgid "Hide" msgstr "" -#: ../lib/albumItem.php:223 ../lib/albumItem.php:224 +#: ../lib/albumItem.php:224 ../lib/albumItem.php:225 msgid "Reorder" msgstr "" -#: ../lib/albumItem.php:231 ../lib/albumItem.php:232 +#: ../lib/albumItem.php:232 ../lib/albumItem.php:233 msgid "Set as highlight" msgstr "" -#: ../lib/albumItem.php:240 ../lib/albumItem.php:241 ../photo_owner.php:78 +#: ../lib/albumItem.php:241 ../lib/albumItem.php:242 ../photo_owner.php:78 #: ../photo_owner.php:82 msgid "Change Owner" msgstr "" -#: ../lib/albumItem.php:271 ../lib/albumItem.php:272 +#: ../lib/albumItem.php:272 ../lib/albumItem.php:273 msgid "Photo properties" msgstr "" -#: ../lib/albumItem.php:284 ../lib/albumItem.php:285 +#: ../lib/albumItem.php:285 ../lib/albumItem.php:286 #, php-format msgid "%s actions" msgstr "" @@ -2965,7 +2965,7 @@ msgid "Enter the Gallery" msgstr "" -#: ../new_password.php:120 ../user_preferences.php:130 +#: ../new_password.php:120 ../user_preferences.php:131 msgid "You can change your user information here." msgstr "" @@ -3055,7 +3055,7 @@ msgid "Results Breakdown" msgstr "" -#: ../poll_results.php:148 ../view_album.php:504 ../view_album.php:789 +#: ../poll_results.php:148 ../view_album.php:507 ../view_album.php:800 #, php-format msgid "Album: %s" msgstr "" @@ -4328,11 +4328,11 @@ msgid "User successfully updated." msgstr "" -#: ../user_preferences.php:131 +#: ../user_preferences.php:132 msgid "If you want to change your password, you must provide your old password and then enter the new one twice." msgstr "" -#: ../user_preferences.php:132 +#: ../user_preferences.php:133 msgid "You can change your username to any combination of letters and digits." msgstr "" @@ -4385,152 +4385,152 @@ msgid "Unable to determine image dimensions!" msgstr "" -#: ../util.php:434 +#: ../util.php:435 #, php-format msgid "Can't write to %s." msgstr "" -#: ../util.php:441 +#: ../util.php:442 #, php-format msgid "Can't read %s." msgstr "" -#: ../util.php:663 +#: ../util.php:664 #, php-format msgid "Item Capture Date : %s" msgstr "" -#: ../util.php:708 +#: ../util.php:709 #, php-format msgid "Could not open lock file (%s) for writing!" msgstr "" -#: ../util.php:713 +#: ../util.php:714 #, php-format msgid "Could not acquire lock (%s)!" msgstr "" -#: ../util.php:796 +#: ../util.php:797 #, php-format msgid "extension of file %s is %s" msgstr "" -#: ../util.php:905 +#: ../util.php:906 #, php-format msgid "Extracting: %s with %s" msgstr "" -#: ../util.php:923 +#: ../util.php:924 #, php-format msgid "%s with extension %s is not an supported archive." msgstr "" -#: ../util.php:938 +#: ../util.php:939 msgid "No Support for creating Zips" msgstr "" -#: ../util.php:941 +#: ../util.php:942 #, php-format msgid "Creating Zipfile with %s" msgstr "" -#: ../util.php:955 +#: ../util.php:956 #, php-format msgid "Your tempfolder is not writeable! Please check permissions of this dir: %s" msgstr "" -#: ../util.php:987 +#: ../util.php:988 #, php-format msgid "Processing file: %s" msgstr "" -#: ../util.php:990 +#: ../util.php:991 #, php-format msgid "Processing file '%s' as archive" msgstr "" -#: ../util.php:993 +#: ../util.php:994 #, php-format msgid "Skipping %s (%s support not enabled)" msgstr "" -#: ../util.php:1002 +#: ../util.php:1003 msgid "Getting archive content Filenames" msgstr "" -#: ../util.php:1020 +#: ../util.php:1021 msgid "No Metadata" msgstr "" -#: ../util.php:1024 +#: ../util.php:1025 msgid "Processing files in archive" msgstr "" -#: ../util.php:1030 +#: ../util.php:1031 #, php-format msgid "%d. %s" msgstr "" -#: ../util.php:1033 +#: ../util.php:1034 #, php-format msgid "Could not extract %s" msgstr "" -#: ../util.php:1153 +#: ../util.php:1154 #, php-format msgid "Adding %s" msgstr "" -#: ../util.php:1173 +#: ../util.php:1174 #, php-format msgid "Need help? Look in the %s%s FAQ%s" msgstr "" -#: ../util.php:1178 +#: ../util.php:1179 #, php-format msgid "Skipping %s (can't handle %s format)" msgstr "" -#: ../util.php:1291 +#: ../util.php:1292 #, php-format msgid "Cannot open logfile: %s" msgstr "" -#: ../util.php:1459 +#: ../util.php:1460 #, php-format msgid "Parsing for csv data in file: %s" msgstr "" -#: ../util.php:1475 +#: ../util.php:1476 msgid "csv result:" msgstr "" -#: ../util.php:1649 +#: ../util.php:1650 #, php-format msgid "MIMEtype of file %s is %s" msgstr "" -#: ../util.php:1739 +#: ../util.php:1740 #, php-format msgid "%s sent you an E-C@rd." msgstr "" -#: ../util.php:1837 +#: ../util.php:1838 #, php-format msgid "Gallery was unable to create a tempory subfolder in your tempdir. Please check permissions of this dir: %s" msgstr "" -#: ../util.php:1876 +#: ../util.php:1877 #, php-format msgid "'%s' seems not to be a valid file. Download aborted." msgstr "" -#: ../util.php:1884 +#: ../util.php:1885 #, php-format msgid "The file '%s' seems not inside Gallery tempdir %s, download aborted." msgstr "" -#: ../util.php:1889 +#: ../util.php:1890 msgid "We are trying to download the tempdir itself ?! Download aborted." msgstr "" @@ -4643,111 +4643,102 @@ msgid "Album Actions" msgstr "" -#: ../view_album.php:488 -msgid "You have no votes recorded for this poll." -msgstr "" - -#: ../view_album.php:492 -msgid "Your current choices are" +#: ../view_album.php:491 +msgid "Your votes are :" msgstr "" -#: ../view_album.php:529 -msgid "See full poll results" +#: ../view_album.php:539 +msgid "[ See full poll results ]" msgstr "" -#: ../view_album.php:563 +#: ../view_album.php:571 msgid ", " msgstr "" -#: ../view_album.php:569 +#: ../view_album.php:577 #, php-format msgid "To vote for an image, click on %s." msgstr "" -#: ../view_album.php:570 +#: ../view_album.php:579 #, php-format msgid "You MUST click on %s for your vote to be recorded." msgstr "" -#: ../view_album.php:571 ../view_album.php:587 ../view_album.php:925 +#: ../view_album.php:579 ../view_album.php:596 ../view_album.php:936 msgid "Vote" msgstr "" -#: ../view_album.php:575 -#, php-format -msgid "You have a total of %s and can change them if you wish." -msgstr "" - -#: ../view_album.php:576 +#: ../view_album.php:584 #, php-format -msgid "1 vote" -msgid_plural "%d votes" +msgid "You have a total of %d vote and can change it later if you wish." +msgid_plural "You have a total of %d votes and can change them later if you wish." msgstr[0] "" msgstr[1] "" -#: ../view_album.php:579 -msgid "You can change your choices if you wish." +#: ../view_album.php:588 +msgid "You can change your votes later, if you wish." msgstr "" -#: ../view_album.php:730 ../view_album.php:731 +#: ../view_album.php:741 ../view_album.php:742 #, php-format msgid "%dkB" msgstr "" -#: ../view_album.php:778 +#: ../view_album.php:789 msgid "highlight" msgstr "" -#: ../view_album.php:793 +#: ../view_album.php:804 msgid "No description" msgstr "" -#: ../view_album.php:801 +#: ../view_album.php:812 #, php-format msgid "Last change: %s" msgstr "" -#: ../view_album.php:804 +#: ../view_album.php:815 #, php-format msgid "Contains: %s" msgstr "" -#: ../view_album.php:804 +#: ../view_album.php:815 #, php-format msgid "1 item" msgid_plural "%d items" msgstr[0] "" msgstr[1] "" -#: ../view_album.php:820 +#: ../view_album.php:831 #, php-format msgid "Viewed: %s" msgstr "" -#: ../view_album.php:845 +#: ../view_album.php:856 #, php-format msgid "Viewed: 1 time." msgid_plural "Viewed: %d times." msgstr[0] "" msgstr[1] "" -#: ../view_album.php:903 +#: ../view_album.php:914 msgid "Hey! Add some photos." msgstr "" -#: ../view_album.php:905 +#: ../view_album.php:916 msgid "This album is empty." msgstr "" -#: ../view_album.php:950 +#: ../view_album.php:961 msgid "Email me when one of the following actions are done to this album:" msgstr "" -#: ../view_album.php:955 +#: ../view_album.php:966 msgid "Comments are added" msgstr "" -#: ../view_album.php:958 +#: ../view_album.php:969 msgid "Other changes are made" msgstr "" @@ -4801,7 +4792,7 @@ msgid "Send Photo as eCard" msgstr "" -#: ../view_photo.php:720 +#: ../view_photo.php:725 msgid "Email me when comments are added" msgstr "" diff -Naur gallery-1.5.3/po/make_mo_files.sh gallery-1.5.4/po/make_mo_files.sh --- gallery-1.5.3/po/make_mo_files.sh 2003-12-08 16:20:30.000000000 +0100 +++ gallery-1.5.4/po/make_mo_files.sh 2003-12-08 16:20:30.000000000 +0100 @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: make_mo_files.sh,v 1.9 2003/12/08 15:20:30 jenst Exp $ +# $Id: make_mo_files.sh 4906 2003-12-08 15:20:30Z jenst $ # \033 ascii ESCape # \033[G move to column (linux console, xterm, not vt100) diff -Naur gallery-1.5.3/po/README gallery-1.5.4/po/README --- gallery-1.5.3/po/README 2003-11-03 15:08:59.000000000 +0100 +++ gallery-1.5.4/po/README 2003-11-03 15:08:59.000000000 +0100 @@ -1,4 +1,4 @@ -$Id: README,v 1.5 2003/11/03 14:08:59 jenst Exp $ +$Id: README 4594 2003-11-03 14:08:59Z jenst $ Here's how to create a new GALLERY translation (1.4.1 or newer) diff -Naur gallery-1.5.3/po/transform_fuzzy.pl gallery-1.5.4/po/transform_fuzzy.pl --- gallery-1.5.3/po/transform_fuzzy.pl 2003-07-28 11:49:27.000000000 +0200 +++ gallery-1.5.4/po/transform_fuzzy.pl 2003-07-28 11:49:27.000000000 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/perl -n -# $Id: transform_fuzzy.pl,v 1.2 2003/07/28 09:49:27 jefmcg Exp $ +# $Id: transform_fuzzy.pl 3374 2003-07-28 09:49:27Z jefmcg $ # /^., fuzzy/ and $fuzzy = 1 and next; /^$/ and $fuzzy = 0; diff -Naur gallery-1.5.3/po/update_po_files.sh gallery-1.5.4/po/update_po_files.sh --- gallery-1.5.3/po/update_po_files.sh 2005-12-23 20:20:39.000000000 +0100 +++ gallery-1.5.4/po/update_po_files.sh 2005-12-23 20:20:39.000000000 +0100 @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: update_po_files.sh,v 1.16 2005/12/23 19:20:39 jenst Exp $ +# $Id: update_po_files.sh 12386 2005-12-23 19:20:39Z jenst $ esc=`echo -en "\033"` tab="${esc}[5G" diff -Naur gallery-1.5.3/poll_properties.php gallery-1.5.4/poll_properties.php --- gallery-1.5.3/poll_properties.php 2006-03-27 17:31:25.000000000 +0200 +++ gallery-1.5.4/poll_properties.php 2006-03-27 17:32:14.000000000 +0200 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: poll_properties.php,v 1.28.2.1 2006/03/27 15:31:25 jenst Exp $ + * $Id: poll_properties.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> diff -Naur gallery-1.5.3/setup/check_mail.php gallery-1.5.4/setup/check_mail.php --- gallery-1.5.3/setup/check_mail.php 2006-03-27 17:32:13.000000000 +0200 +++ gallery-1.5.4/setup/check_mail.php 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: check_mail.php,v 1.17.2.1 2006/03/27 15:32:13 jenst Exp $ + * $Id: check_mail.php 13338 2006-03-27 15:32:14Z jenst $ */ ?> - <?php echo _("Check Versions") ?> + <?php echo gTranslate('config', "Check Versions"); ?> - + - - -
    +
    +
    array( - 'text' => gTranslate('config', "One file is missing, corrupt or older than expected.", "%d files are missing, corrupt or older than expected.", count($errors), _("All files okay.")), - 'class' => 'errorpct', + 'text' => gTranslate('config', "One file is missing, corrupt or older than expected.", "%d files are missing, corrupt or older than expected.", count($errors), _("All files okay."), true), + 'class' => 'errorpct', 'hinttext' => sprintf(_("There are problems with the following files. Please correct them before configuring %s."), Gallery()) ), 'warnings' => array( - 'text' => gTranslate('config', "One file is more recent than expected.", "%d files are more recent than expected.", count($warnings), _("All files okay.")), - 'class' => 'warningpct', + 'text' => gTranslate('config', "One file is more recent than expected.", "%d files are more recent than expected.", count($warnings), _("All files okay."), true), + 'class' => 'warningpct', 'hinttext' => sprintf(_("The following files are more up-to-date than expected for this version of %s. If you are using pre-release code, this is OK."), Gallery()) ), 'oks' => array( - 'text' => gTranslate('config', "One file is up-to-date.", "%d files are up-to-date.", count($oks), _("All files are up-to-date.")), - 'class' => 'successpct', + 'text' => gTranslate('config', "One file is up-to-date.", "%d files are up-to-date.", count($oks), _("All files are up-to-date."), true), + 'class' => 'successpct', 'hinttext' => _("The following files are up-to-date.") ) ); diff -Naur gallery-1.5.3/setup/config_data.inc gallery-1.5.4/setup/config_data.inc --- gallery-1.5.3/setup/config_data.inc 2006-03-27 17:32:13.000000000 +0200 +++ gallery-1.5.4/setup/config_data.inc 2006-08-14 09:41:08.000000000 +0200 @@ -2,22 +2,22 @@ /* * Gallery - a web based photo album viewer and editor * Copyright (C) 2000-2006 Bharat Mediratta - * + * * 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. * - * $Id: config_data.inc,v 1.301.2.1 2006/03/27 15:32:13 jenst Exp $ + * $Id: config_data.inc 14310 2006-08-14 07:41:08Z jenst $ */ ?> 'form', ), - + 'group_mandatory_end' => array ( 'type' => 'group_end', ), @@ -315,7 +315,7 @@ 'albumDir' => array( 'prompt' => gTranslate('config',"Album directory"), 'desc' => '(' . gTranslate('config',"REQUIRED") . ') ' . - sprintf(gTranslate('config',"The full path on physical disk to the directory where your photos will be stored. This directory should start off empty—Gallery will fill it. Note that this directory needs to have write access by the user who is running the web server (in your case this user is %s)."), + sprintf(gTranslate('config',"The full path on physical disk to the directory where your photos will be stored. This directory should start off empty. Gallery will fill it. Note that this directory needs to have write access by the user who is running the web server (in your case this user is %s)."), ''. $webserver_user . ''), 'value' => getenv('DOCUMENT_ROOT') . '/albums', 'require-write-dir' => 1, @@ -382,7 +382,7 @@ 'groupLocations_end' => array ( 'type' => 'group_end', ), - + 'groupToolkits' => array ( 'type' => 'group_start', 'name' => 'group_toolkits', @@ -681,7 +681,7 @@ 'use_exif' => array( 'prompt' => "Jhead EXIF Parser", 'desc' => sprintf(gTranslate('config',"The filesystem path to the %s EXIF parser. E.g. %s or %s. This is optional so if you don't have it, don't worry about it too much."), - 'jhead', '/usr/local/bin/jhead', 'c:\\bin\\jhead.exe'), + 'jhead', '/usr/local/bin/jhead', 'c:\\bin\\jhead.exe'), 'value' => locateFile('jhead'), 'must-be-file' => 1, 'must-be-executable' => 1, @@ -1154,7 +1154,7 @@ gTranslate('config',"The expire time in seconds is specified for each cache below."). "\n
    ". gTranslate('config',"If the expire time is set to -1 then the cache will not auto refresh.") ), - + 'stats_foruser' => array( 'prompt' => gTranslate('config',"Available Stats for 'normal' users"), 'desc' => gTranslate('config',"Gallery can give a lot of statistics for admins, however you can enable some of them to normal users.") ."\n
    ". @@ -1325,7 +1325,7 @@ ), 'value' => 'no' ), - + 'devMode' => array( 'prompt' => gTranslate('config',"Developer Mode"), 'desc' => gTranslate('config',"Turn on developer mode to see all PHP warnings and notices. Enabling this is not recommended for users that aren't familiar with PHP."), @@ -1556,7 +1556,7 @@ 'max_size' => array( 'prompt' => gTranslate('config','Maximum image size'), 'desc' => gTranslate('config',"You can optionally limit the dimensions your images on upload to Gallery.") . - '
    '. + '
    '. gTranslate('config',"Warning:") .' '. gTranslate('config',"Enabling this feature will leave you without a full size original image in your Gallery, but allows you to save limited hard drive space. Gallery will attempt to preserve JPEG comments and EXIF data for the shrunken image, but this will require either ImageMagick or the optional jhead programs (see Step 2)."), 'value' => 'off', 'choices' => array( @@ -1654,7 +1654,7 @@ 'mPUSHAccount' => array( 'prompt' => gTranslate('config',"Account for the mPUSH service"), 'desc' => sprintf(gTranslate('config',"If you want to use mPUSH cellular photo service you can either use your own account, or leave this to 'gallery'. Visit this link to %screate your own account%s."), - '', ''), + '', ''), 'value' => 'gallery', 'type' => 'text', ), @@ -1944,7 +1944,7 @@ .'
    '. gTranslate('config',"Fixed") .'
    ' .'
    '. gTranslate('config',"Displays prev+next groups of thumbs, changing only to display next group of thumbs.") . '
    ' .'
    '. gTranslate('config',"Dynamic") . '
    ' - .'
    '. gTranslate('config',"Displays previos & next images, with current image between.") . '
    ' + .'
    '. gTranslate('config',"Displays previous & next images, with current image between.") . '
    ' .'
    ', 'value' => 'fixed', 'choices' => array( @@ -2018,8 +2018,7 @@ 'prompt' => gTranslate('config',"Subalbum frames"), 'desc' => gTranslate('config',"This frame will appear around the thumbnail image representing a subalbum."), 'choices' => available_frames(), - 'value' => - 'simple_book' + 'value' => 'simple_book' ), 'thumb_frame' => array( 'prompt' => gTranslate('config',"Frame around thumbs"), diff -Naur gallery-1.5.3/setup/confirm.inc gallery-1.5.4/setup/confirm.inc --- gallery-1.5.3/setup/confirm.inc 2006-03-27 17:32:13.000000000 +0200 +++ gallery-1.5.4/setup/confirm.inc 2006-03-27 17:32:14.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: confirm.inc,v 1.111.2.1 2006/03/27 15:32:13 jenst Exp $ + * $Id: confirm.inc 13338 2006-03-27 15:32:14Z jenst $ */ ?> diff -Naur gallery-1.5.3/setup/constants.inc gallery-1.5.4/setup/constants.inc --- gallery-1.5.3/setup/constants.inc 2006-03-27 17:32:13.000000000 +0200 +++ gallery-1.5.4/setup/constants.inc 2006-08-15 14:14:12.000000000 +0200 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: constants.inc,v 1.52.2.1 2006/03/27 15:32:13 jenst Exp $ + * $Id: constants.inc 14327 2006-08-15 12:14:12Z jenst $ */ ?>
    -'; echo _("Switch through the corresponding tab and fill the values you need. Some, but not all values are required. If you have finished this step use the button to go to the next Step."); @@ -46,7 +46,9 @@

    '; +echo "
    "; ?> '; } echo _("You can change your user information here."); diff -Naur gallery-1.5.3/util.php gallery-1.5.4/util.php --- gallery-1.5.3/util.php 2006-03-28 12:54:51.000000000 +0200 +++ gallery-1.5.4/util.php 2006-08-14 09:49:09.000000000 +0200 @@ -2,22 +2,22 @@ /* * Gallery - a web based photo album viewer and editor * Copyright (C) 2000-2006 Bharat Mediratta - * + * * 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. * - * $Id: util.php,v 1.569.2.2 2006/03/28 10:54:51 jenst Exp $ + * $Id: util.php 14311 2006-08-14 07:49:09Z jenst $ */ /** @@ -131,7 +131,7 @@ } } } - + return false; } @@ -151,25 +151,25 @@ $debugfile = ''; $status = ''; $results = array(); - + if (isDebugging()) { - debugMessage(sprintf(_("Executing: %s"), $cmd), __FILE__, __LINE__); + debugMessage(sprintf(gTranslate('core', "Executing: %s"), $cmd), __FILE__, __LINE__); $debugfile = tempnam($gallery->app->tmpDir, "dbg"); } fs_exec($cmd, $results, $status, $debugfile); if (isDebugging()) { - print "\n
    ". _("Results:") ."
    ";
+		print "\n
    ". gTranslate('core', "Results:") ."
    ";
 		if ($results) {
 			print join("\n", $results);
 		} else {
-			print "" ._("none") ."";
+			print "" .gTranslate('core', "none") ."";
 		}
 		print "
    ";
 
 		if (file_exists($debugfile)) {
-			print "\n
     ". _("Debug messages:") ." 
    ";
+			print "\n
     ". gTranslate('core', "Debug messages:") ." 
    ";
 			if ($fd = fs_fopen($debugfile, "r")) {
 				while (!feof($fd)) {
 					$buf = fgets($fd, 4096);
@@ -180,7 +180,7 @@
 			unlink($debugfile);
 			print "
    ";
 		}
-		print "\n
     ". sprintf(_("Status: %s (expected %s)"),
+		print "\n
     ". sprintf(gTranslate('core', "Status: %s (expected %s)"),
 				$status, $gallery->app->expectedExecStatus);
 	}
 
@@ -203,38 +203,38 @@
 }
 
 function getDimensions($file) {
-    global $gallery;				
+    global $gallery;
 
-    debugMessage(sprintf(_("Getting Dimension of file: %s"), $file), __FILE__, __LINE__, 2);
+    debugMessage(sprintf(gTranslate('core', "Getting Dimension of file: %s"), $file), __FILE__, __LINE__, 2);
 
     if (! fs_file_exists($file)) {
-        debugMessage(_("The file does not exist ?!"), __FILE__, __LINE__);
+        debugMessage(gTranslate('core', "The file does not exist ?!"), __FILE__, __LINE__);
         return array(0, 0);
     }
-    
+
     list($width, $height) = getimagesize($file);
-    
+
     if ($width > 1 && $height > 1) {
-        debugMessage(sprintf(_("Dimensions: x: %d y: %d"), $width, $height), __FILE__, __LINE__, 3);
-		  
+        debugMessage(sprintf(gTranslate('core', "Dimensions: x: %d y: %d"), $width, $height), __FILE__, __LINE__, 3);
+
         return array($width, $height);
     }
 
-    debugMessage(sprintf(_("PHP's %s function is unable to determine dimensions."), "getimagesize()"), __FILE__, __LINE__);
-		
+    debugMessage(sprintf(gTranslate('core', "PHP's %s function is unable to determine dimensions."), "getimagesize()"), __FILE__, __LINE__);
+
     /* Just in case php can't determine dimensions. */
     switch($gallery->app->graphics) {
         case 'NetPBM':
-            list($lines, $status) = exec_internal(toPnmCmd($file) ." | ". 
+            list($lines, $status) = exec_internal(toPnmCmd($file) ." | ".
                 NetPBM('pnmfile', '--allimages'));
             break;
         case "ImageMagick":
             /* This fails under windows, IM isn't returning parsable status output. */
               list($lines, $status) = exec_internal(ImCmd('identify', '', fs_import_filename($file)));
         break;
-        
+
 	default:
-	    echo debugMessage(_("You have no graphics package configured for use!"));
+	    echo debugMessage(gTranslate('core', "You have no graphics package configured for use!"));
 	    return array(0, 0);
         break;
     }
@@ -247,7 +247,7 @@
                         return array($regs[1], $regs[2]);
                     }
                 break;
-                
+
                 case 'ImageMagick':
                     if (ereg("([0-9]+)x([0-9]+)", $line, $regs)) {
                         return array($regs[1], $regs[2]);
@@ -257,8 +257,8 @@
         }
     }
 
-    debugMessage(_("Unable to determine image dimensions!"), __FILE__, __LINE__);
-    
+    debugMessage(gTranslate('core', "Unable to determine image dimensions!"), __FILE__, __LINE__);
+
     return array(0, 0);
 }
 
@@ -308,7 +308,7 @@
 	} else {
 	    $modes = "rb";
 	}
-	
+
 	if ($fd = fs_fopen($fname, $modes)) {
 		while (!feof($fd)) {
 			$tmp .= fread($fd, 65536);
@@ -367,6 +367,7 @@
 function gallerySanityCheck() {
 	global $gallery;
 	global $GALLERY_OK;
+
        	if (!empty($gallery->backup_mode)) {
 	       	return NULL;
        	}
@@ -399,7 +400,7 @@
 	 *
 	 * 	Content-Type: image/pjpeg\n\n
 	 *
-	 * If so, remove everything up to and including the last 
+	 * If so, remove everything up to and including the last
 	 * newline
 	 */
 
@@ -431,14 +432,14 @@
 					fs_unlink($tempfile);
 				}
 			} else {
-				echo gallery_error(sprintf(_("Can't write to %s."),
+				echo gallery_error(sprintf(gTranslate('core', "Can't write to %s."),
 							$tempfile));
 			}
 			chmod("$dir/$file", 0644);
 		}
 		fclose($fd);
 	} else {
-		echo gallery_error(sprintf(_("Can't read %s."), "$dir/$file"));
+		echo gallery_error(sprintf(gTranslate('core', "Can't read %s."), "$dir/$file"));
 	}
 
 	return 1;
@@ -514,7 +515,7 @@
 			// Owners can always see at least the first level of sub-content
 			return $idx;
 		} elseif ($album->getItemOwnerModify() && $album->isItemOwner($gallery->user->getUid(), $idx)) {
-			// Hidden photo - allow the owner to see it (hidden sub-albums are covered 
+			// Hidden photo - allow the owner to see it (hidden sub-albums are covered
 			// in the album rights block by isOwnerOfAlbum)
 			return $idx;
 		} else {
@@ -586,7 +587,7 @@
             $path = $gallery->app->use_exif;
             list($return, $status) = @exec_internal(fs_import_filename($path, 1) .' '. //. ' -v ' .
             fs_import_filename($file, 1));
-    
+
             $unwantedFields = array('File name');
         break;
 
@@ -660,7 +661,7 @@
 	}
 
 	if (!isDebugging()) {
-		sprintf (_("Item Capture Date : %s"), strftime('%Y', $itemCaptureTimeStamp));
+		sprintf (gTranslate('core', "Item Capture Date : %s"), strftime('%Y', $itemCaptureTimeStamp));
 	}
 
 	return $itemCaptureTimeStamp;
@@ -705,12 +706,12 @@
 		/* Acquire an advisory lock */
 		$lockfd = fs_fopen("$file.lock", "a+");
 		if (!$lockfd) {
-			echo gallery_error(sprintf(_("Could not open lock file (%s) for writing!"),
+			echo gallery_error(sprintf(gTranslate('core', "Could not open lock file (%s) for writing!"),
 						"$file.lock"));
 			return 0;
 		}
 		if (!flock($lockfd, LOCK_EX)) {
-			echo gallery_error(sprintf(_("Could not acquire lock (%s)!"),
+			echo gallery_error(sprintf(gTranslate('core', "Could not acquire lock (%s)!"),
 						"$file.lock"));
 			return 0;
 		}
@@ -718,7 +719,7 @@
 
 	/*
 	 * Don't use tempnam because it may create a file on a different
-	 * partition which would cause rename() to fail.  Instead, create our own 
+	 * partition which would cause rename() to fail.  Instead, create our own
 	 * temporary file.
 	 */
 	$i = 0;
@@ -737,8 +738,8 @@
 			/* Something went wrong! */
 			$success = 0;
 		} else {
-			/* 
-			 * Make the current copy the backup, and then 
+			/*
+			 * Make the current copy the backup, and then
 			 * write the new current copy.  There's a
 			 * potential race condition here if the
 			 * advisory lock (above) fails; two processes
@@ -770,8 +771,8 @@
  * lastCommentDate functions in classes Album and AlbumItem.
  */
 function mostRecentComment($album, $i) {
-        $id = $album->getPhotoId($i); 
-        $index = $album->getPhotoIndex($id); 
+        $id = $album->getPhotoId($i);
+        $index = $album->getPhotoIndex($id);
         $recentcomment = $album->getComment($index, $album->numComments($i));
         return $recentcomment->getDatePosted();
 }
@@ -788,12 +789,12 @@
  * @param  string   $filename
  * @return string   $ext
  * @author Jens Tkotz 
- */ 
+ */
 function getExtension($filename) {
 	$ext = ereg_replace(".*\.([^\.]*)$", "\\1", $filename);
 	$ext = strtolower($ext);
-	
-	echo debugMessage(sprintf(_("extension of file %s is %s"), basename($filename), $ext), __FILE__, __LINE__, 3);
+
+	echo debugMessage(sprintf(gTranslate('core', "extension of file %s is %s"), basename($filename), $ext), __FILE__, __LINE__, 3);
 	return $ext;
 }
 
@@ -809,7 +810,7 @@
 	}
 }
 
-/** 
+/**
  * This function checks wether an archive can be decompressed via Gallery
  * It just uses the filename extension.
  * If the extension is handable the de/compressing tool is returned
@@ -820,7 +821,7 @@
 function canDecompressArchive($ext) {
 	global $gallery;
     $tool = false;
-    
+
 	$ext = strtolower($ext);
 	switch ($ext) {
 	    case 'zip':
@@ -834,7 +835,7 @@
 	            $tool = 'rar';
 	        }
         break;
-        
+
 	    default:
 	        /* Extension not supported, $tool stays fals */
 	        break;
@@ -842,7 +843,7 @@
 	return $tool;
 }
 
-/** 
+/**
  * This function checks wether an archive can be created via Gallery
  * It just uses the filename extension.
  * If the extension is handable the de/compressing tool is returned
@@ -860,7 +861,7 @@
 	elseif ($ext == 'rar' && !empty($gallery->app->rar)) {
 		return 'rar';
 	}
-	else {		
+	else {
 	    /* No suitable tool found */
 	    return false;
 	}
@@ -871,7 +872,7 @@
 
 	$cmd = '';
 	$files = array();
-	
+
 	if ($tool = canDecompressArchive($ext)) {
 	    $filename = fs_import_filename($archive);
 	    switch ($tool) {
@@ -890,7 +891,7 @@
 	        sort($files);
 	    }
 	}
-	
+
 	return $files;
 }
 
@@ -900,9 +901,9 @@
 
 	$cmd_pic_path = str_replace("[", "\[", $file);
 	$cmd_pic_path = str_replace("]", "\]", $cmd_pic_path);
-	
+
 	if($tool = canDecompressArchive($ext)) {
-	    echo debugMessage(sprintf(_("Extracting: %s with %s"), $archive, $tool),__FILE__, __LINE__,3);
+	    echo debugMessage(sprintf(gTranslate('core', "Extracting: %s with %s"), $archive, $tool),__FILE__, __LINE__,3);
 	    switch($tool) {
 	        case 'zip':
 	            $cmd = fs_import_filename($gallery->app->unzip) . " -j -o " .
@@ -916,33 +917,33 @@
 	            fs_import_filename($gallery->app->tmpDir);
 	            break;
 	    }
-	    
+
 	    return exec_wrapper($cmd);
 	}
 	else {
-	    echo debugMessage(sprintf(_("%s with extension %s is not an supported archive.", $archive, $ext)),__FILE__, __LINE__);
+	    echo debugMessage(sprintf(gTranslate('core', "%s with extension %s is not an supported archive.", $archive, $ext)),__FILE__, __LINE__);
 	    return false;
 	}
 }
 
 function createZip($folderName = '', $zipName = '', $deleteSource = true) {
     global $gallery;
-    
+
     if ($folderName == '') {
 	   return false;
     }
 
     $tool = canCreateArchive('zip');
-    
+
     if (! $tool) {
-        debugMessage(_("No Support for creating Zips"), __FILE__, __LINE__, 2);
+        debugMessage(gTranslate('core', "No Support for creating Zips"), __FILE__, __LINE__, 2);
         return false;
     } else {
-        debugMessage(sprintf(_("Creating Zipfile with %s"), $tool), __FILE__, __LINE__, 2);
+        debugMessage(sprintf(gTranslate('core', "Creating Zipfile with %s"), $tool), __FILE__, __LINE__, 2);
     }
-           
+
     $tmpDir = $gallery->app->tmpDir .'/'. uniqid(rand());
-    
+
     if ($zipName == '') {
 	   $fullZipName = 'gallery_zip.zip';
     }
@@ -952,7 +953,7 @@
 
     if(! fs_mkdir($tmpDir)) {
         echo gallery_error(
-          sprintf(_("Your tempfolder is not writeable! Please check permissions of this dir: %s"),
+          sprintf(gTranslate('core', "Your tempfolder is not writeable! Please check permissions of this dir: %s"),
           $gallery->app->tmpDir));
         return false;
     }
@@ -960,9 +961,9 @@
     $currentDir = getcwd();
     /* Switch to the folder that content is going to be zipped */
     chdir($folderName);
-    
+
 			$cmd = fs_import_filename($gallery->app->zip) ." -r $fullZipName *";
-    
+
     if (! exec_wrapper($cmd)) {
 	   echo gallery_error("Zipping failed");
 	   /* Go back */
@@ -975,7 +976,7 @@
 	   if($deleteSource) {
 	       rmdirRecursive($folderName);
 	   }
-	
+
 	return $fullZipName;
     }
 }
@@ -983,14 +984,14 @@
 function processNewImage($file, $ext, $name, $caption, $setCaption = '', $extra_fields=array(), $wmName="", $wmAlign=0, $wmAlignX=0, $wmAlignY=0, $wmSelect=0) {
     global $gallery;
     global $temp_files;
-    
-    echo debugMessage(sprintf(_("Processing file: %s"), $file), __FILE__, __LINE__,3);
+
+    echo debugMessage(sprintf(gTranslate('core', "Processing file: %s"), $file), __FILE__, __LINE__,3);
     /* Begin of code for the case the uploaded file is an archive */
     if (acceptableArchive($ext)) {
-        processingMsg(sprintf(_("Processing file '%s' as archive"), $name));
+        processingMsg(sprintf(gTranslate('core', "Processing file '%s' as archive"), $name));
         $tool = canDecompressArchive($ext);
         if (!$tool) {
-            processingMsg(sprintf(_("Skipping %s (%s support not enabled)"), $name, $ext));
+            processingMsg(sprintf(gTranslate('core', "Skipping %s (%s support not enabled)"), $name, $ext));
             echo "
    ";
             return;
         }
@@ -999,7 +1000,7 @@
          * Figure out what files inside the archive we can handle.
          * Put all Filenames into $files.
         */
-        echo debugMessage(_("Getting archive content Filenames"), __FILE__, __LINE__);
+        echo debugMessage(gTranslate('core', "Getting archive content Filenames"), __FILE__, __LINE__);
         $files = getArchiveFileNames($file, $ext);
 
         /* Get meta data */
@@ -1017,20 +1018,20 @@
             debugMessage(printMetaData($image_info), __FILE__, __LINE__);
         }
         else {
-            echo debugMessage(_("No Metadata"), __FILE__, __LINE__);
+            echo debugMessage(gTranslate('core', "No Metadata"), __FILE__, __LINE__);
         }
 
         /* Now process all valid files we found */
-        echo debugMessage(_("Processing files in archive"), __FILE__, __LINE__);
+        echo debugMessage(gTranslate('core', "Processing files in archive"), __FILE__, __LINE__);
         $loop = 0;
         foreach ($files as $pic_path) {
             $loop++;
             $pic = basename($pic_path);
             $tag = getExtension($pic);
-            echo debugMessage(sprintf(_("%d. %s"), $loop, $pic_path), __FILE__, __LINE__);
+            echo debugMessage(sprintf(gTranslate('core', "%d. %s"), $loop, $pic_path), __FILE__, __LINE__);
             if (acceptableFormat($tag) || acceptableArchive($tag)) {
                 if(!extractFileFromArchive($file, $ext, $pic_path)) {
-                    echo '
    '. gallery_error(sprintf(_("Could not extract %s"), $pic_path));
+                    echo '
    '. gallery_error(sprintf(gTranslate('core', "Could not extract %s"), $pic_path));
                     continue;
                 }
 
@@ -1150,13 +1151,13 @@
                 }
             }
 
-            echo "\n
    ******". sprintf(_("Adding %s"), $name) ."*****
    ";
-            
+            echo "\n
    ******". sprintf(gTranslate('core', "Adding %s"), $name) ."*****
    ";
+
             /* After all the preprocessing, NOW ADD THE element
              * function addPhoto($file, $tag, $originalFilename, $caption, $pathToThumb="", $extraFields=array(), $owner="", $votes=NULL,
              *                   $wmName="", $wmAlign=0, $wmAlignX=0, $wmAlignY=0, $wmSelect=0)
             */
-            $err = $gallery->album->addPhoto( 
+            $err = $gallery->album->addPhoto(
                 $file,
                 $ext,
                 $mangledFilename,
@@ -1167,15 +1168,15 @@
                 NULL,
                 $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect
             );
-            
+
             if ($err) {
                 processingMsg(gallery_error($err));
-                processingMsg("". sprintf(_("Need help?  Look in the  %s%s FAQ%s"),
+                processingMsg("". sprintf(gTranslate('core', "Need help?  Look in the  %s%s FAQ%s"),
                 '', Gallery(), '') .
                 "");
             }
         } else {
-            processingMsg(sprintf(_("Skipping %s (can't handle %s format)"), $name, $ext));
+            processingMsg(sprintf(gTranslate('core', "Skipping %s (can't handle %s format)"), $name, $ext));
         }
     }
 }
@@ -1186,13 +1187,13 @@
 
 function findInPath($program) {
 	$path = explode(':', getenv('PATH'));
-	
+
 	foreach ($path as $dir) {
 		if (fs_file_exists("$dir/$program")) {
 			return "$dir/$program";
 		}
 	}
-	
+
 	return false;
 }
 
@@ -1282,13 +1283,13 @@
 }
 
 function logMessage ($msg, $logfile) {
-	
+
 	if ($fd = fs_fopen($logfile, "a")) {
 		fwrite($fd, strftime("%Y/%m/%d %H:%M.%S: $msg\n"));
 		fclose($fd);
 	}
 	elseif (isDebugging()) {
-		print sprintf(_("Cannot open logfile: %s"), $logfile);
+		print sprintf(gTranslate('core', "Cannot open logfile: %s"), $logfile);
 	}
 }
 
@@ -1371,7 +1372,7 @@
     if ($negativeTest) {
         $result = ! $result;
     }
-    
+
     return $result;
 }
 
@@ -1390,22 +1391,22 @@
     return $location;
 }
 
-// Returns the CVS version as a string, NULL if file can't be read, or "" 
+// Returns the SVN revision  as a string, NULL if file can't be read, or ""
 // if version can't be found.
+function getSVNRevision($file) {
 
-function getCVSVersion($file) {
-
-    $path= dirname(__FILE__) . "/$file";
+    $path = dirname(__FILE__) . "/$file";
     if (!fs_file_exists($path)) {
         return NULL;
     }
     if (!fs_is_readable($path)) {
         return NULL;
     }
-    $contents=file($path);
+
+    $contents = file($path);
     foreach ($contents as $line) {
-        if (ereg("\\\x24\x49\x64: [A-Za-z_.0-9]*,v ([0-9.]*) .*\x24$", trim($line), $matches) ||
-        ereg("\\\x24\x49\x64: [A-Za-z_.0-9]*,v ([0-9.]*) .*\x24 ", trim($line), $matches)) {
+        if (ereg("\\\x24\x49\x64: [A-Za-z_.0-9-]* ([0-9]*) .*\x24$", trim($line), $matches) ||
+        ereg("\\\x24\x49\x64: [A-Za-z_.0-9-]* ([0-9]*) .*\x24 ", trim($line), $matches)) {
             if ($matches[1]) {
                 return $matches[1];
             }
@@ -1415,11 +1416,11 @@
     return '';
 }
 
-/* Return -1 if old version is greater than new version, 0 if they are the 
+/* Return -1 if old version is greater than new version, 0 if they are the
    same and 1 if new version is greater.
  */
 function compareVersions($old_str, $new_str) {
-	if ($old_str === $new_str) { 
+	if ($old_str === $new_str) {
 		return 0;
 	}
 	$old=explode('.', $old_str);
@@ -1447,7 +1448,7 @@
 
 function contextHelp ($link) {
 	global $gallery;
-	
+
 	if ($gallery->app->showContextHelp == 'yes') {
 		return popup_link ('?', 'docs/context-help/' . $link, false, true, 500, 500);
 	} else {
@@ -1456,7 +1457,7 @@
 }
 
 function parse_csv ($filename, $delimiter=";") {
-    echo debugMessage(sprintf(_("Parsing for csv data in file: %s"), $filename), __FILE__, __LINE__);
+    echo debugMessage(sprintf(gTranslate('core', "Parsing for csv data in file: %s"), $filename), __FILE__, __LINE__);
 	$maxLength = 1024;
 	$return_array = array();
 	if ($fd = fs_fopen($filename, "rt")) {
@@ -1472,10 +1473,10 @@
 		fclose($fd);
 	}
 	if(isDebugging()){
-	   echo _("csv result:");
+	   echo gTranslate('core', "csv result:");
 	   print_r($return_array);
 	}
-	return $return_array;	
+	return $return_array;
 }
 
 /**
@@ -1529,7 +1530,7 @@
             $value = $gallery->album->getExtraField($index, $key);
             if (!empty($value)) {
                 /* Might be look strange, but $key could be in translateableFields() */
-                $table[_($key)] = str_replace("\n", "
    ", $value);
+                $table[gTranslate('core', $key)] = str_replace("\n", "
    ", $value);
             }
         }
     }
@@ -1552,9 +1553,9 @@
         if (isset($result)) {
             return $result;
         }
-        
+
         return array();
-    } 
+    }
 }
 
 function genGUID() {
@@ -1570,7 +1571,7 @@
 	if (!($iHeight < $thumbsize && $iWidth < $thumbsize)) {
 	    $thumbsize = max($iHeight, $iWidth);
 	}
-	    
+
 
 	switch ($frame) {
 		// special cases
@@ -1583,16 +1584,16 @@
 			$divCellWidth = $thumbsize + 7;
 			$divCellAdd =  7;
 		break;
-	
+
 		case "solid":
 			$divCellWidth = $thumbsize + $borderwidth +3;
 			$divCellAdd =  $borderwidth +3;
 		break;
-                  
+
 		default: // use frames directory or fallback to none.
 		    if(array_key_exists($frame, available_frames())) {
 			require(dirname(__FILE__) . "/html_wrap/frames/$frame/frame.def");
-                    
+
 			$divCellWidth = $thumbsize + $widthTL + $widthTR;
 			$divCellAdd = $heightTT + $heightBB;
 		    }
@@ -1612,7 +1613,7 @@
 	return array ($divCellWidth, $divCellHeight, $padding);
 }
 
-/* 
+/*
 ** Counts all Elements of an Array, but not the array(s) itself
 ** Code by A. Lindeman
 */
@@ -1638,18 +1639,18 @@
  */
 function getMimeType($filename) {
     static $mime_extension_map;
-    
+
     if (empty($mime_extension_map)) {
         require(dirname(__FILE__) . '/includes/definitions/mime.mapping.php');
     }
-    
+
     $extension = getExtension($filename);
     $mimetype = $mime_extension_map[$extension];
-    
-    echo debugMessage(sprintf(_("MIMEtype of file %s is %s"), basename($filename), $mimetype), __FILE__, __LINE__, 2);
+
+    echo debugMessage(sprintf(gTranslate('core', "MIMEtype of file %s is %s"), basename($filename), $mimetype), __FILE__, __LINE__, 2);
     return $mimetype;
 }
-    
+
 /* Ecard Function begin */
 function get_ecard_template($template_name) {
     global $gallery;
@@ -1700,7 +1701,7 @@
     $ecard_data = preg_replace ("/<%ecard_reciepient_name%>/", $ecard["name_recepient"], $ecard_data);
     $ecard_data = preg_replace ("/<%ecard_stamp%>/", $stampName, $ecard_data);
     $ecard_data = preg_replace ("/<%ecard_width%>/", $widthReplace, $ecard_data);
-	
+
     return $ecard_data;
   }
 
@@ -1736,7 +1737,7 @@
       $ecard_mail->setHtml($ecard_HTML_data, $ecard_PLAIN_data);
       $ecard_mail->setFrom($ecard["name_sender"] .' <'. $ecard["email_sender"] .'>');
       if (empty($ecard['subject'])) {
-          $ecard['subject'] = sprintf(_("%s sent you an E-C@rd."), $ecard["name_sender"]);
+          $ecard['subject'] = sprintf(gTranslate('core', "%s sent you an E-C@rd."), $ecard["name_sender"]);
       }
 
       $ecard_mail->setSubject($ecard['subject']);
@@ -1746,7 +1747,7 @@
 
       return $result;
   }
-  
+
 /**
  * This function is taken from
  * http://www.phpinsider.com/smarty-forum/viewtopic.php?t=1079
@@ -1776,7 +1777,7 @@
 
 	    if ($caseSensitive) {
 			$code = "
-	    if( $a == $b ) { 
+	    if( $a == $b ) {
 	        return 0;
 	    };
 	    if ( $a > $b ) {
@@ -1787,7 +1788,7 @@
 		}
 	    else {
 			$code = "
-	    if(strtoupper($a) == strtoupper($b)) { 
+	    if(strtoupper($a) == strtoupper($b)) {
 	        return 0;
 	    };
 	    if (strtoupper($a) > strtoupper($b)) {
@@ -1796,7 +1797,7 @@
 	        return -1 * $order;
 	    }";
 	    }
-	
+
 	    $sort_func = $sort_funcs[$sortby] = create_function('$a, $b', $code);
 	} else {
 	    $sort_func = $sort_funcs[$sortby];
@@ -1834,7 +1835,7 @@
 
     if(! fs_mkdir($dir)) {
         echo gallery_error(
-          sprintf(_("Gallery was unable to create a tempory subfolder in your tempdir. Please check permissions of this dir: %s"),
+          sprintf(gTranslate('core', "Gallery was unable to create a tempory subfolder in your tempdir. Please check permissions of this dir: %s"),
         $gallery->app->tmpDir));
         return false;
     }
@@ -1870,26 +1871,26 @@
 
 function downloadFile($filename) {
     global $gallery;
-    
+
     /* Verify its really a file */
     if(!fs_is_file($filename) || broken_link($filename)) {
-        echo gallery_error(sprintf(_("'%s' seems not to be a valid file. Download aborted."),
+        echo gallery_error(sprintf(gTranslate('core', "'%s' seems not to be a valid file. Download aborted."),
             $filename));
         return false;
     }
-    
+
     /* Verify $filename is inside the temp dir */
     $validFileName = strncmp($filename, $gallery->app->tmpDir, strlen($filename));
     if($validFileName < 0) {
-        echo gallery_error(sprintf(_("The file '%s' seems not inside Gallery tempdir %s, download aborted."),
+        echo gallery_error(sprintf(gTranslate('core', "The file '%s' seems not inside Gallery tempdir %s, download aborted."),
             $filename,  $gallery->app->tmpDir));
         return false;
     }
     elseif ($validFileName == 0 || dirname($filename) == $gallery->app->tmpDir) {
-        echo gallery_error(_("We are trying to download the tempdir itself ?! Download aborted."));
+        echo gallery_error(gTranslate('core', "We are trying to download the tempdir itself ?! Download aborted."));
         return false;
     }
-    
+
     $contentType = getMimeType($filename);
     $size = fs_filesize($filename);
 
@@ -1908,12 +1909,12 @@
     header('Content-Disposition: attachment; filename="'. basename($filename) .'"');
 
     echo $filedata;
-    
+
     /* As downloadable files are always created in a subfolder of the tempdir,
      * we delete this folder and its content
     */
     rmdirRecursive(dirname($filename));
-    
+
     return true;
 }
 
diff -Naur gallery-1.5.3/Version.php gallery-1.5.4/Version.php
--- gallery-1.5.3/Version.php	2006-04-07 00:38:01.000000000 +0200
+++ gallery-1.5.4/Version.php	2006-08-14 10:33:59.000000000 +0200
@@ -17,19 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * $Id: Version.php,v 1.1566.2.15 2006/04/06 22:38:01 ckdake Exp $
+ * $Id: Version.php 14315 2006-08-14 08:33:59Z jenst $
  */
 ?>
 version = '1.5.3';
+$gallery->version = '1.5.4';
 $gallery->config_version = 96;
 $gallery->album_version = 37;
 $gallery->user_version = 6;
 $gallery->url = "http://gallery.sourceforge.net";
 
-/* do not edit the date!! modified by CVS */
-$gallery->last_change = strtotime(substr('$Date: 2006/04/06 22:38:01 $', 7, -1));
+/* do not edit the date!! modified by SVN */
+$gallery->last_change = strtotime(substr('$Date: 2006-08-14 10:33:59 +0200 (Mon, 14 Aug 2006) $', 7, -20));
 /*
  * PostNuke version info
  */
diff -Naur gallery-1.5.3/view_album.php gallery-1.5.4/view_album.php
--- gallery-1.5.3/view_album.php	2006-04-06 13:21:47.000000000 +0200
+++ gallery-1.5.4/view_album.php	2006-08-14 09:49:09.000000000 +0200
@@ -17,7 +17,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
 *
-* $Id: view_album.php,v 1.327.2.3 2006/04/06 11:21:47 jenst Exp $
+* $Id: view_album.php 14311 2006-08-14 07:49:09Z jenst $
 */
 ?>
 
- 
+
 
   <?php echo $gallery->app->galleryTitle ?> :: <?php echo $gallery->album->fields["title"] ?>
   
   
   
-album->isRoot() && 
+album->isRoot() &&
 (!$gallery->session->offline ||
 	 isset($gallery->session->offlineAlbums["albums.php"]))) { ?>
   
@@ -149,7 +149,7 @@
 	 } else if (!$gallery->session->offline ||
 	 isset($gallery->session->offlineAlbums[$pAlbum->fields['parentAlbumName']])) { ?>
   
-session->offline ||
 	 isset($gallery->session->offlineAlbums["albums.php"])) { ?>
   
@@ -181,7 +181,7 @@
 
 
 
- gTranslate('core', "Delete this (sub)album"),
         'requirements' => array('canDeleteAlbum', '!albumIsRoot'),
         'action' => 'popup',
-        'value' => makeGalleryUrl('delete_photo.php', 
+        'value' => makeGalleryUrl('delete_photo.php',
 			array('set_albumName' => $gallery->album->fields["parentAlbumName"],
-				'type' => 'popup', 
+				'type' => 'popup',
 				'id' => $gallery->album->fields["name"],
 				'albumDelete' => true))),
     'rename_album'    => array(
@@ -310,7 +310,7 @@
         'name' => gTranslate('core', "Rearrange items"),
         'requirements' => array('canWriteToAlbum', 'photosExist'),
         'action' => 'popup',
-        'value' => makeGalleryUrl('rearrange.php', 
+        'value' => makeGalleryUrl('rearrange.php',
             array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'))),
     'permissions'     => array(
         'name' => gTranslate('core', "Permissions"),
@@ -395,7 +395,7 @@
     . "\n\n";
 
     $iconElements[] = "\n\t\n";
 }
@@ -468,8 +468,8 @@
 }
 
 if (($gallery->album->getPollType() == "rank") && canVote()) {
-    echo '
    ';
-    $my_choices=array();
+    $my_choices = array();
+
     if ( $gallery->album->fields["votes"]) {
         foreach ($gallery->album->fields["votes"] as $id => $image_votes) {
             $index=$gallery->album->getIndexByVotingId($id);
@@ -483,52 +483,61 @@
             }
         }
     }
-    if (sizeof($my_choices) == 0
-    && $gallery->album->getVoterClass() ==  "Logged in") {
-        print gTranslate('core', "You have no votes recorded for this poll."). '
    ';
-    }
-    else if (sizeof($my_choices) > 0) {
+
+    if (sizeof($my_choices) > 0) {
         ksort($my_choices);
-        print gTranslate('core', "Your current choices are");
-        print "\n";
-        $nv_pairs=$gallery->album->getVoteNVPairs();
+        $nv_pairs = $gallery->album->getVoteNVPairs();
+
+        $va_poll_box1 = gTranslate('core', "Your votes are :");
+
+        $pollInfoTable = new galleryTable();
         foreach ($my_choices as $key => $id) {
-            print "\n";
             $index = $gallery->album->getIndexByVotingId($id);
+
+            $pollInfoTable->addElement(array('content' => "- ". $nv_pairs[$key]["name"]));
+            $pollInfoTable->addElement(array('content' => ':'));
             if ($gallery->album->isAlbum($index)) {
                 $albumName = $gallery->album->getAlbumName($index);
-                print "\n";
-            } else {
-                print "\n";
+
+                $photoId = str_replace('item.', '', $id);
+                $pollInfoTable->addElement(array('content' =>
+                    galleryLink(makeAlbumUrl($gallery->session->albumName, $photoId), $desc)
+                ));
             }
         }
-        print "
    ". $nv_pairs[$key]["name"] .":\n";
                 $myAlbum = new Album();
                 $myAlbum->load($albumName);
-                print sprintf(gTranslate('core', "Album: %s"), $myAlbum->fields['title']);
-                print "
    session->albumName, $id) . ">\n";
+
+                $pollInfoTable->addElement(array('content' =>
+                galleryLink(
+                    makeAlbumUrl($albumName),
+                    sprintf(gTranslate('core', "Album: %s"), $myAlbum->fields['title']))
+                ));
+            }
+            else {
                 $desc = $gallery->album->getCaption($index);
                 if (trim($desc) == '') {
                     $desc = $gallery->album->getPhotoId($index);
                 }
-                print $desc;
-                print "
    \n";
+        $va_poll_box1 .= $pollInfoTable->render();
+
+        echo "\n
    \n";
+        echo $va_poll_box1;
+        echo "\n
    \n";
     }
-    echo '
    ';
 }
-$results = 1;
+
+list($va_poll_result, $results) = showResultsGraph( $gallery->album->getPollNumResults());
+
 if ($gallery->album->getPollShowResults()) {
-    echo '
    ';
-    list($buf, $results)=showResultsGraph( $gallery->album->getPollNumResults());
-    print $buf;
-    if ($results && testRequirement('isAdminOrAlbumOwner')) {
-        print "\n". ' $gallery->session->albumName)).
-          '">' .gTranslate('core', "See full poll results") . '
    ';
-    }
-    echo '
    ';
+    echo $va_poll_result;
+}
+
+if(!empty($results) && testRequirement('isAdminOrAlbumOwner')) {
+    echo galleryLink(
+        makeGalleryUrl("poll_results.php", array("set_albumName" => $gallery->session->albumName)),
+        gTranslate('core', "[ See full poll results ]"),
+        array('class' => 'admin'));
 }
 
 ?>
@@ -546,49 +555,51 @@
 
 echo makeFormIntro('view_album.php',
     array('name' => 'vote_form', 'style' => 'margin-bottom: 0px;'));
-    
+
 if (canVote()) {
-    echo '
    ';
-    $nv_pairs=$gallery->album->getVoteNVPairs();
-    if ($gallery->album->getPollScale() == 1) {
-        $options = $nv_pairs[0]["name"];
-    }
-    else {
-        /** note to translators:
+	$nv_pairs = $gallery->album->getVoteNVPairs();
+	if ($gallery->album->getPollScale() == 1) {
+		$options = $nv_pairs[0]["name"];
+	}
+	else {
+		/** note to translators:
          * This produces (in English) a list of the form: "a, b, c or d".  Correct translation
          * of ", " and " or  " should produce a version that makes sense in your language.
          */
-        $options = '';
-        for ($count=0; $count < $gallery->album->getPollScale()-2 ; $count++) {
-            $options .= $nv_pairs[$count]["name"] .gTranslate('core', ", ");
-        }
-        $options .= $nv_pairs[$count++]["name"] .gTranslate('core', " or ");
-        $options .= $nv_pairs[$count]["name"];
-    }
-    print '';
-    print sprintf(gTranslate('core', "To vote for an image, click on %s."), $options);
-    print "  ".sprintf(gTranslate('core', "You MUST click on %s for your vote to be recorded."),
-    "".gTranslate('core', "Vote")."");
-    if ($gallery->album->getPollType() == "rank") {
-        $voteCount=$gallery->album->getPollScale();
-        print "  ".
-          sprintf(gTranslate('core', "You have a total of %s and can change them if you wish."),
-            gTranslate('core', "1 vote", "%d votes", $voteCount));
-    }
-    else {
-        print "  ". gTranslate('core', "You can change your choices if you wish.");
-    }
-    echo "";
+		$options = '';
+		for ($count=0; $count < $gallery->album->getPollScale()-2 ; $count++) {
+			$options .= $nv_pairs[$count]["name"] .gTranslate('core', ", ");
+		}
+		$options .= $nv_pairs[$count++]["name"] .gTranslate('core', " or ");
+		$options .= $nv_pairs[$count]["name"];
+	}
+
+	$va_poll_box3 = sprintf(gTranslate('core', "To vote for an image, click on %s."), $options);
+	$va_poll_box3 .= ' ';
+	$va_poll_box3 .= sprintf(gTranslate('core', "You MUST click on %s for your vote to be recorded."), "".gTranslate('core', "Vote")."");
+	$va_poll_box3 .= ' ';
+	if ($gallery->album->getPollType() == 'rank') {
+		$voteCount = $gallery->album->getPollScale();
+		$va_poll_box3 .= gTranslate('core',
+			"You have a total of %d vote and can change it later if you wish.",
+			"You have a total of %d votes and can change them later if you wish.", $voteCount, '', true);
+	}
+	else {
+		$va_poll_box3 .= gTranslate('core', "You can change your votes later, if you wish.");
+	}
+
+	echo "\n
    \n";
+    echo $va_poll_box3;
+    echo "\n
    \n";
 ?>
-   
    
-
-
 	
    
  		">
 	
    
-
+
 
 getRawDimensions();
                     /* display file sizes if dimensions are identical */
                     if ($wr == $wf && $hr == $hf && $viewFull && $photo->isResized()) {
-                        $fsr = ' ' . sprintf(_('%dkB'), (int) $photo->getFileSize(0) >> 10);
-                        $fsf = ' ' . sprintf(_('%dkB'), (int) $photo->getFileSize(1) >> 10);
+                        $fsr = ' ' . sprintf(gTranslate('core', '%dkB'), (int) $photo->getFileSize(0) >> 10);
+                        $fsf = ' ' . sprintf(gTranslate('core', '%dkB'), (int) $photo->getFileSize(1) >> 10);
                     } else {
                         $fsr = '';
                         $fsf = '';
@@ -856,13 +867,13 @@
             }
 
             $albumItemOptions = getItemActions($i, false);
-            if (sizeof($albumItemOptions) > 2 || 
+            if (sizeof($albumItemOptions) > 2 ||
               (sizeof($albumItemOptions) == 2 && !isset($albumItemOptions['showExif']))) {
                 echo drawSelect2("s$i", $albumItemOptions, array(
                     'onChange' => "imageEditChoice(document.vote_form.s$i)",
                     'class' => 'adminform'));
             }
-            
+
             if (canVote()) {
                 print '';
             }
@@ -929,7 +940,7 @@
 
 ?>
 	
-user->isLoggedIn() &&  
+user->isLoggedIn() &&
 $gallery->user->getEmail() &&
 !$gallery->session->offline &&
 $gallery->app->emailOn == "yes") {
@@ -945,7 +956,7 @@
             $gallery->album->unsetEmailMe('other', $gallery->user);
         }
     }
-    echo makeFormIntro("view_album.php", 
+    echo makeFormIntro("view_album.php",
         array("name" => "email_me", "style" => "margin-bottom: 0px;"));
     echo gTranslate('core', "Email me when one of the following actions are done to this album:")."  ";
     $checked_com = ($gallery->album->getEmailMe('comments', $gallery->user)) ? "checked" : "" ;
@@ -963,7 +974,7 @@
 	
- $gallery->album->numPhotos(1)) {
-        $index = $numPhotos;
+        $index = $gallery->album->numPhotos(1);
     }
     $id = $gallery->album->getPhotoId($index);
 }
@@ -109,7 +109,7 @@
 $do_fullOnly = isset($gallery->session->fullOnly) &&
     !strcmp($gallery->session->fullOnly,"on") &&
     strcmp($gallery->album->fields["use_fullOnly"],"yes");
-    
+
 if ($do_fullOnly) {
     $full = $gallery->user->canViewFullImages($gallery->album);
 }
@@ -213,10 +213,10 @@
 
 if (!$GALLERY_EMBEDDED_INSIDE) {
 	doctype(); ?>
- 
+<?php echo $gallery->app->galleryTitle . ' :: '. $gallery->album->fields["title"] . ' :: '. $title ; ?>
-   $metaTags));
 
   /* prefetch/navigation */
@@ -262,7 +262,7 @@
       { color: album->fields['linkcolor'] ?>; }
     A:hover
       { color: #ff6600; }
-album->fields["bgcolor"])) {
     echo "BODY { background-color:" . $gallery->album->fields['bgcolor'] . "; }";
@@ -278,7 +278,7 @@
     }
 }
 ?>
-   
+  
@@ -477,7 +477,7 @@
       $gallery->user->canViewFullImages($gallery->album)) {
         $lparams['set_fullOnly'] = (!isset($gallery->session->fullOnly) || strcmp($gallery->session->fullOnly,"on")) ? "on" : "off";
         $link = makeAlbumURL($gallery->session->albumName, $id, $lparams);
-        $adminTextIconElemens[] = _('View Images:');
+        $adminTextIconElemens[] = gTranslate('core', 'View Images:');
         $iconTextNormal = gTranslate('core', "normal");
         $iconTextFull = gTranslate('core', "full");
 
@@ -582,7 +582,7 @@
 
 
 
-
     
+
    
 
 
    
 
@@ -702,7 +702,7 @@
 
 includeHtmlWrap("inline_photo.footer");
 
-if ($gallery->user->isLoggedIn() &&  
+if ($gallery->user->isLoggedIn() &&
   $gallery->user->getEmail() &&
   !$gallery->session->offline &&
   $gallery->app->emailOn == "yes") {
@@ -772,7 +772,7 @@
 
 
-
    
   
   
diff -Naur gallery-1.5.3/view_photo_properties.php gallery-1.5.4/view_photo_properties.php
--- gallery-1.5.3/view_photo_properties.php	2006-03-27 17:31:25.000000000 +0200
+++ gallery-1.5.4/view_photo_properties.php	2006-03-27 17:32:14.000000000 +0200
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * $Id: view_photo_properties.php,v 1.50.2.1 2006/03/27 15:31:25 jenst Exp $
+ * $Id: view_photo_properties.php 13338 2006-03-27 15:32:14Z jenst $
  */
 ?>