From ed6bb46a26a523e8bf5e7bfad511c6822caf2ef9 Mon Sep 17 00:00:00 2001 From: Herve Prot Date: Sat, 27 Aug 2011 13:50:41 +0200 Subject: [PATCH] Diff manuel cvs<->git : error Id --- htdocs/conf/.cvsignore | 4 -- .../methode_expedition_colsui.modules.php | 2 +- .../methode_expedition_enl.modules.php | 2 +- .../methode_expedition_lettremax.modules.php | 2 +- .../methode_expedition_trans.modules.php | 2 +- .../modules/mailings/example.modules.php | 2 +- .../modules/mailings/framboise.modules.php | 2 +- .../modules/mailings/thirdparties.modules.php | 2 +- htdocs/includes/modules/modDocument.class.php | 2 +- .../includes/modules/modFicheinter.class.php | 2 +- htdocs/includes/modules/modTax.class.php | 2 +- htdocs/includes/nusoap/lib/Mail/PEAR.php | 2 +- htdocs/includes/nusoap/lib/Mail/RFC822.php | 2 +- htdocs/includes/nusoap/lib/Mail/mail.php | 4 +- htdocs/includes/nusoap/lib/Mail/mime.php | 2 +- .../includes/nusoap/lib/Mail/mimeDecode.php | 2 +- htdocs/includes/nusoap/lib/Mail/mimePart.php | 2 +- htdocs/includes/nusoap/lib/Mail/null.php | 4 +- htdocs/includes/nusoap/lib/Mail/sendmail.php | 2 +- htdocs/includes/nusoap/lib/Mail/smtp.php | 2 +- .../includes/nusoap/lib/class.soap_fault.php | 2 +- .../includes/nusoap/lib/class.soap_parser.php | 2 +- .../includes/nusoap/lib/class.soap_server.php | 2 +- .../nusoap/lib/class.soap_transport_http.php | 2 +- htdocs/includes/nusoap/lib/class.soap_val.php | 2 +- .../includes/nusoap/lib/class.soapclient.php | 2 +- htdocs/includes/nusoap/lib/class.wsdl.php | 2 +- .../includes/nusoap/lib/class.wsdlcache.php | 2 +- .../includes/nusoap/lib/class.xmlschema.php | 2 +- htdocs/includes/odtphp/Segment.php | 6 +- htdocs/includes/odtphp/SegmentIterator.php | 6 +- htdocs/includes/odtphp/zip/PhpZipProxy.php | 6 +- htdocs/includes/odtphp/zip/ZipInterface.php | 6 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 2 - .../includes/odtphp/zip/pclzip/pclzip.lib.php | 2 +- htdocs/includes/odtphp/zip/pclzip/readme.txt | 2 +- .../PHPExcel/Shared/JAMA/examples/Stats.php | 2 +- .../includes/phpexcel/PHPExcel/Shared/OLE.php | 2 +- .../phpexcel/PHPExcel/Shared/OLE/PPS.php | 2 +- .../phpexcel/PHPExcel/Shared/OLE/PPS/File.php | 2 +- .../phpexcel/PHPExcel/Shared/OLE/PPS/Root.php | 2 +- .../PHPExcel/Shared/PCLZip/pclzip.lib.php | 2 +- .../PHPExcel/Shared/PCLZip/readme.txt | 2 +- .../PDF/fonts/dejavu-fonts-ttf-2.30/AUTHORS | 2 +- .../PDF/fonts/dejavu-fonts-ttf-2.30/BUGS | 2 +- .../PDF/fonts/dejavu-fonts-ttf-2.30/LICENSE | 2 +- .../PDF/fonts/dejavu-fonts-ttf-2.30/NEWS | 2 +- .../PDF/fonts/dejavu-fonts-ttf-2.30/README | 2 +- .../fonts/dejavu-fonts-ttf-2.30/langcover.txt | 2 +- .../fonts/dejavu-fonts-ttf-2.30/status.txt | 2 +- .../fonts/dejavu-fonts-ttf-2.30/unicover.txt | 2 +- .../PDF/fonts/freefont-20090104/AUTHORS | 2 +- .../PDF/fonts/freefont-20090104/CREDITS | 2 +- .../PDF/fonts/freefont-20090104/ChangeLog | 2 +- .../PDF/fonts/freefont-20090104/INSTALL | 2 +- .../Shared/PDF/fonts/freefont-20090104/README | 2 +- htdocs/includes/triggers/README | 2 +- htdocs/includes/triggers/README-FR | 2 +- .../install/mysql/migration/2.0.0-2.1.0.sql | 4 +- .../install/mysql/migration/2.1.0-2.2.0.sql | 2 +- .../install/mysql/migration/2.2.0-2.4.0.sql | 2 +- .../install/mysql/migration/2.4.0-2.5.0.sql | 2 +- .../install/mysql/migration/2.5.0-2.6.0.sql | 2 +- .../install/mysql/migration/2.6.0-2.7.0.sql | 2 +- .../install/mysql/migration/2.8.0-2.9.0.sql | 2 +- .../install/mysql/migration/2.9.0-3.0.0.sql | 2 +- htdocs/install/mysql/migration/repair.sql | 2 +- .../mysql/tables/llx_export_model.key.sql | 1 - htdocs/langs/ru_RU/deliveries.lang | 31 ++++---- htdocs/langs/ru_RU/donations.lang | 59 +++++++--------- htdocs/langs/ru_RU/languages.lang | 24 +++++-- htdocs/langs/ru_RU/trips.lang | 66 ++++++++---------- htdocs/lib/lib_head.js | 2 +- htdocs/lib/lib_photosresize.js | 2 +- htdocs/lib/lib_rare.js | 2 +- htdocs/theme/eldy/img/object_sending.png | Bin 312 -> 340 bytes htdocs/theme/yellow/style.css.php | 2 +- 77 files changed, 171 insertions(+), 176 deletions(-) delete mode 100644 htdocs/conf/.cvsignore diff --git a/htdocs/conf/.cvsignore b/htdocs/conf/.cvsignore deleted file mode 100644 index ff44c5dfae444..0000000000000 --- a/htdocs/conf/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -conf.php*.sav -*.php -conf.php.mysql -conf.php.postgres diff --git a/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php b/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php index 4e4165f66f44e..e989a09a7e6d5 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php +++ b/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php @@ -19,7 +19,7 @@ /** * \file htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php * \ingroup expedition - * \version $Id$ + * \version $Id: methode_expedition_colsui.modules.php,v 1.2 2010/10/27 22:53:37 eldy Exp $ */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php b/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php index d03b77ee7b88d..f05427c358bf2 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php +++ b/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php @@ -18,7 +18,7 @@ /** * \file htdocs/includes/modules/expedition/methode_expedition_enl.modules.php * \ingroup expedition - * \version $Id$ + * \version $Id: methode_expedition_enl.modules.php,v 1.3 2010/10/27 22:53:37 eldy Exp $ */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php b/htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php index 19e78218ea6c1..46410c71a1a4d 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php +++ b/htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php @@ -18,7 +18,7 @@ /** * \file htdocs/includes/modules/expedition/methode_expedition_lettremax.modules.php * \ingroup expedition - * \version $Id$ + * \version $Id: methode_expedition_lettremax.modules.php,v 1.1 2011/05/25 16:53:41 hregis Exp $ */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php b/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php index 5c0f008a503cc..6372188ee0491 100644 --- a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php +++ b/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php @@ -18,7 +18,7 @@ /** * \file htdocs/includes/modules/expedition/methode_expedition_trans.modules.php * \ingroup expedition - * \version $Id$ + * \version $Id: methode_expedition_trans.modules.php,v 1.3 2010/10/27 22:53:37 eldy Exp $ */ include_once "methode_expedition.modules.php"; diff --git a/htdocs/includes/modules/mailings/example.modules.php b/htdocs/includes/modules/mailings/example.modules.php index d61873acf7cac..321283b2f6be8 100644 --- a/htdocs/includes/modules/mailings/example.modules.php +++ b/htdocs/includes/modules/mailings/example.modules.php @@ -12,7 +12,7 @@ \file htdocs/includes/modules/mailings/example.modules.php \ingroup mailing \brief Example file to provide a list of recipients for mailing module - \version $Revision$ + \version $Revision: 1.4 $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; diff --git a/htdocs/includes/modules/mailings/framboise.modules.php b/htdocs/includes/modules/mailings/framboise.modules.php index e135bda3b2979..7816ca0917f68 100644 --- a/htdocs/includes/modules/mailings/framboise.modules.php +++ b/htdocs/includes/modules/mailings/framboise.modules.php @@ -13,7 +13,7 @@ * \file htdocs/includes/modules/mailings/framboise.modules.php * \ingroup mailing * \brief Example file to provide a list of recipients for mailing module - * \version $Revision$ + * \version $Revision: 1.5 $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; diff --git a/htdocs/includes/modules/mailings/thirdparties.modules.php b/htdocs/includes/modules/mailings/thirdparties.modules.php index 457396847738d..d09cde2680f53 100755 --- a/htdocs/includes/modules/mailings/thirdparties.modules.php +++ b/htdocs/includes/modules/mailings/thirdparties.modules.php @@ -13,7 +13,7 @@ * \file htdocs/includes/modules/mailings/thirdparties.modules.php * \ingroup mailing * \brief Example file to provide a list of recipients for mailing module - * \version $Revision$ + * \version $Revision: 1.1 $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; diff --git a/htdocs/includes/modules/modDocument.class.php b/htdocs/includes/modules/modDocument.class.php index d532225ac2850..05bd91971da4c 100644 --- a/htdocs/includes/modules/modDocument.class.php +++ b/htdocs/includes/modules/modDocument.class.php @@ -20,7 +20,7 @@ /** * \defgroup document Module mass mailings * \brief Module pour gerer des generations de documents - * \version $Id$ + * \version $Id: modDocument.class.php,v 1.22 2011/01/22 10:40:02 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modFicheinter.class.php b/htdocs/includes/modules/modFicheinter.class.php index 56f1bd1e6591c..87b5666665a4b 100644 --- a/htdocs/includes/modules/modFicheinter.class.php +++ b/htdocs/includes/modules/modFicheinter.class.php @@ -23,7 +23,7 @@ /** * \defgroup ficheinter Module intervention cards * \brief Module to manage intervention cards - * \version $Id$ + * \version $Id: modFicheinter.class.php,v 1.48 2011/05/05 07:25:32 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modTax.class.php b/htdocs/includes/modules/modTax.class.php index 0f279675cbb2d..d214a88db6dd3 100644 --- a/htdocs/includes/modules/modTax.class.php +++ b/htdocs/includes/modules/modTax.class.php @@ -28,7 +28,7 @@ * \file htdocs/includes/modules/modTax.class.php * \ingroup tax * \brief Fichier de description et activation du module Taxe - * \version $Id$ + * \version $Id: modTax.class.php,v 1.21 2011/02/02 20:41:54 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/nusoap/lib/Mail/PEAR.php b/htdocs/includes/nusoap/lib/Mail/PEAR.php index 249a1142af1b6..80ab2fcf317c8 100755 --- a/htdocs/includes/nusoap/lib/Mail/PEAR.php +++ b/htdocs/includes/nusoap/lib/Mail/PEAR.php @@ -20,7 +20,7 @@ * @author Greg Beaver * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id$ + * @version CVS: $Id: PEAR.php,v 1.1 2010/12/01 21:56:37 eldy Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 0.1 */ diff --git a/htdocs/includes/nusoap/lib/Mail/RFC822.php b/htdocs/includes/nusoap/lib/Mail/RFC822.php index 90f4db5af8ba4..35ab4f5bcd943 100755 --- a/htdocs/includes/nusoap/lib/Mail/RFC822.php +++ b/htdocs/includes/nusoap/lib/Mail/RFC822.php @@ -52,7 +52,7 @@ * * @author Richard Heyes * @author Chuck Hagenbuch - * @version $Revision$ + * @version $Revision: 1.1 $ * @license BSD * @package Mail */ diff --git a/htdocs/includes/nusoap/lib/Mail/mail.php b/htdocs/includes/nusoap/lib/Mail/mail.php index 6c06f7918798a..23b1028eb4b5a 100755 --- a/htdocs/includes/nusoap/lib/Mail/mail.php +++ b/htdocs/includes/nusoap/lib/Mail/mail.php @@ -16,12 +16,12 @@ // | Author: Chuck Hagenbuch | // +----------------------------------------------------------------------+ // -// $Id$ +// $Id: mail.php,v 1.1 2010/12/01 21:56:37 eldy Exp $ /** * internal PHP-mail() implementation of the PEAR Mail:: interface. * @package Mail - * @version $Revision$ + * @version $Revision: 1.1 $ */ class Mail_mail extends Mail { diff --git a/htdocs/includes/nusoap/lib/Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php index a7f4070dbde13..cf772bbdcc17d 100755 --- a/htdocs/includes/nusoap/lib/Mail/mime.php +++ b/htdocs/includes/nusoap/lib/Mail/mime.php @@ -35,7 +35,7 @@ // | Tomas V.V.Cox (port to PEAR) | // +-----------------------------------------------------------------------+ // -// $Id$ +// $Id: mime.php,v 1.1 2010/12/01 21:56:37 eldy Exp $ require_once('PEAR.php'); require_once('Mail/mimePart.php'); diff --git a/htdocs/includes/nusoap/lib/Mail/mimeDecode.php b/htdocs/includes/nusoap/lib/Mail/mimeDecode.php index 07fe88f6e25ad..975e6b2575286 100755 --- a/htdocs/includes/nusoap/lib/Mail/mimeDecode.php +++ b/htdocs/includes/nusoap/lib/Mail/mimeDecode.php @@ -87,7 +87,7 @@ * * @author Richard Heyes -* @version $Revision$ +* @version $Revision: 1.1 $ * @package Mail */ class Mail_mimeDecode extends PEAR diff --git a/htdocs/includes/nusoap/lib/Mail/mimePart.php b/htdocs/includes/nusoap/lib/Mail/mimePart.php index b429b905e1d01..b863e9735f964 100755 --- a/htdocs/includes/nusoap/lib/Mail/mimePart.php +++ b/htdocs/includes/nusoap/lib/Mail/mimePart.php @@ -87,7 +87,7 @@ * re-build the message. * * @author Richard Heyes -* @version $Revision$ +* @version $Revision: 1.1 $ * @package Mail */ diff --git a/htdocs/includes/nusoap/lib/Mail/null.php b/htdocs/includes/nusoap/lib/Mail/null.php index 49a033235080d..7189995e0b9b9 100755 --- a/htdocs/includes/nusoap/lib/Mail/null.php +++ b/htdocs/includes/nusoap/lib/Mail/null.php @@ -16,14 +16,14 @@ // | Author: Phil Kernick | // +----------------------------------------------------------------------+ // -// $Id$ +// $Id: null.php,v 1.1 2010/12/01 21:56:37 eldy Exp $ // /** * Null implementation of the PEAR Mail:: interface. * @access public * @package Mail - * @version $Revision$ + * @version $Revision: 1.1 $ */ class Mail_null extends Mail { diff --git a/htdocs/includes/nusoap/lib/Mail/sendmail.php b/htdocs/includes/nusoap/lib/Mail/sendmail.php index 6925be2456311..713ca9d489d96 100755 --- a/htdocs/includes/nusoap/lib/Mail/sendmail.php +++ b/htdocs/includes/nusoap/lib/Mail/sendmail.php @@ -20,7 +20,7 @@ * Sendmail implementation of the PEAR Mail:: interface. * @access public * @package Mail - * @version $Revision$ + * @version $Revision: 1.1 $ */ class Mail_sendmail extends Mail { diff --git a/htdocs/includes/nusoap/lib/Mail/smtp.php b/htdocs/includes/nusoap/lib/Mail/smtp.php index 59a0127f374b8..0b40f84e9e84e 100755 --- a/htdocs/includes/nusoap/lib/Mail/smtp.php +++ b/htdocs/includes/nusoap/lib/Mail/smtp.php @@ -22,7 +22,7 @@ * Net_SMTP:: class. * @access public * @package Mail - * @version $Revision$ + * @version $Revision: 1.1 $ */ class Mail_smtp extends Mail { diff --git a/htdocs/includes/nusoap/lib/class.soap_fault.php b/htdocs/includes/nusoap/lib/class.soap_fault.php index fdd9ebea87ac5..134bf9b0a62c5 100644 --- a/htdocs/includes/nusoap/lib/class.soap_fault.php +++ b/htdocs/includes/nusoap/lib/class.soap_fault.php @@ -8,7 +8,7 @@ * Mainly used for returning faults from deployed functions * in a server instance. * @author Dietrich Ayala -* @version $Id$ +* @version $Id: class.soap_fault.php,v 1.5 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class nusoap_fault extends nusoap_base { diff --git a/htdocs/includes/nusoap/lib/class.soap_parser.php b/htdocs/includes/nusoap/lib/class.soap_parser.php index 2d24587e9c164..ec84b399346e5 100644 --- a/htdocs/includes/nusoap/lib/class.soap_parser.php +++ b/htdocs/includes/nusoap/lib/class.soap_parser.php @@ -9,7 +9,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id$ +* @version $Id: class.soap_parser.php,v 1.6 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class nusoap_parser extends nusoap_base { diff --git a/htdocs/includes/nusoap/lib/class.soap_server.php b/htdocs/includes/nusoap/lib/class.soap_server.php index 521822f02d854..0a12152b6a052 100644 --- a/htdocs/includes/nusoap/lib/class.soap_server.php +++ b/htdocs/includes/nusoap/lib/class.soap_server.php @@ -10,7 +10,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id$ +* @version $Id: class.soap_server.php,v 1.7 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class nusoap_server extends nusoap_base { diff --git a/htdocs/includes/nusoap/lib/class.soap_transport_http.php b/htdocs/includes/nusoap/lib/class.soap_transport_http.php index 1abffa8469451..234914c9520a2 100644 --- a/htdocs/includes/nusoap/lib/class.soap_transport_http.php +++ b/htdocs/includes/nusoap/lib/class.soap_transport_http.php @@ -9,7 +9,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id$ +* @version $Id: class.soap_transport_http.php,v 1.8 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class soap_transport_http extends nusoap_base { diff --git a/htdocs/includes/nusoap/lib/class.soap_val.php b/htdocs/includes/nusoap/lib/class.soap_val.php index f9466a8f5b879..056c8986c5a9b 100644 --- a/htdocs/includes/nusoap/lib/class.soap_val.php +++ b/htdocs/includes/nusoap/lib/class.soap_val.php @@ -11,7 +11,7 @@ * xsd:anyType and user-defined types. * * @author Dietrich Ayala -* @version $Id$ +* @version $Id: class.soap_val.php,v 1.5 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class soapval extends nusoap_base { diff --git a/htdocs/includes/nusoap/lib/class.soapclient.php b/htdocs/includes/nusoap/lib/class.soapclient.php index e6c26f8550092..5ef9ef1734c28 100644 --- a/htdocs/includes/nusoap/lib/class.soapclient.php +++ b/htdocs/includes/nusoap/lib/class.soapclient.php @@ -20,7 +20,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id$ +* @version $Id: class.soapclient.php,v 1.11 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class nusoap_client extends nusoap_base { diff --git a/htdocs/includes/nusoap/lib/class.wsdl.php b/htdocs/includes/nusoap/lib/class.wsdl.php index 3f787dc1d91a1..aa7da5d095e6a 100644 --- a/htdocs/includes/nusoap/lib/class.wsdl.php +++ b/htdocs/includes/nusoap/lib/class.wsdl.php @@ -9,7 +9,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id$ +* @version $Id: class.wsdl.php,v 1.6 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class wsdl extends nusoap_base { diff --git a/htdocs/includes/nusoap/lib/class.wsdlcache.php b/htdocs/includes/nusoap/lib/class.wsdlcache.php index 6aacc8adcfbc6..0c1852da98dba 100644 --- a/htdocs/includes/nusoap/lib/class.wsdlcache.php +++ b/htdocs/includes/nusoap/lib/class.wsdlcache.php @@ -12,7 +12,7 @@ * * @author Scott Nichol * @author Ingo Fischer -* @version $Id$ +* @version $Id: class.wsdlcache.php,v 1.5 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class nusoap_wsdlcache { diff --git a/htdocs/includes/nusoap/lib/class.xmlschema.php b/htdocs/includes/nusoap/lib/class.xmlschema.php index 82c9a6468de5c..f7fbe56b7743c 100644 --- a/htdocs/includes/nusoap/lib/class.xmlschema.php +++ b/htdocs/includes/nusoap/lib/class.xmlschema.php @@ -9,7 +9,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id$ +* @version $Id: class.xmlschema.php,v 1.6 2010/12/12 17:19:03 tiaris Exp $ * @access public */ class nusoap_xmlschema extends nusoap_base { diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php index 765bb15d75bff..3bd386d5dc182 100644 --- a/htdocs/includes/odtphp/Segment.php +++ b/htdocs/includes/odtphp/Segment.php @@ -7,10 +7,10 @@ class SegmentException extends Exception * You need PHP 5.2 at least * You need Zip Extension or PclZip library * Encoding : ISO-8859-1 - * Last commit by $Author$ - * Date - $Date$ + * Last commit by $Author: eldy $ + * Date - $Date: 2010/02/15 22:39:13 $ * SVN Revision - $Rev: 44 $ - * Id : $Id$ + * Id : $Id: Segment.php,v 1.1 2010/02/15 22:39:13 eldy Exp $ * * @copyright GPL License 2008 - Julien Pauli - Cyril PIERRE de GEYER - Anaska (http://www.anaska.com) * @license http://www.gnu.org/copyleft/gpl.html GPL License diff --git a/htdocs/includes/odtphp/SegmentIterator.php b/htdocs/includes/odtphp/SegmentIterator.php index dc99033c08d1e..181caf3ce46ed 100644 --- a/htdocs/includes/odtphp/SegmentIterator.php +++ b/htdocs/includes/odtphp/SegmentIterator.php @@ -4,10 +4,10 @@ * You need PHP 5.2 at least * You need Zip Extension or PclZip library * Encoding : ISO-8859-1 - * Last commit by $Author$ - * Date - $Date$ + * Last commit by $Author: eldy $ + * Date - $Date: 2010/02/15 22:39:13 $ * SVN Revision - $Rev: 42 $ - * Id : $Id$ + * Id : $Id: SegmentIterator.php,v 1.1 2010/02/15 22:39:13 eldy Exp $ * * @copyright GPL License 2008 - Julien Pauli - Cyril PIERRE de GEYER - Anaska (http://www.anaska.com) * @license http://www.gnu.org/copyleft/gpl.html GPL License diff --git a/htdocs/includes/odtphp/zip/PhpZipProxy.php b/htdocs/includes/odtphp/zip/PhpZipProxy.php index 89fc1bf39948b..fc9a94fa17043 100644 --- a/htdocs/includes/odtphp/zip/PhpZipProxy.php +++ b/htdocs/includes/odtphp/zip/PhpZipProxy.php @@ -7,10 +7,10 @@ class PhpZipProxyException extends Exception * You need PHP 5.2 at least * You need Zip Extension or PclZip library * Encoding : ISO-8859-1 - * Last commit by $Author$ - * Date - $Date$ + * Last commit by $Author: eldy $ + * Date - $Date: 2010/03/10 19:44:02 $ * SVN Revision - $Rev: 28 $ - * Id : $Id$ + * Id : $Id: PhpZipProxy.php,v 1.2 2010/03/10 19:44:02 eldy Exp $ * * @copyright GPL License 2008 - Julien Pauli - Cyril PIERRE de GEYER - Anaska (http://www.anaska.com) * @license http://www.gnu.org/copyleft/gpl.html GPL License diff --git a/htdocs/includes/odtphp/zip/ZipInterface.php b/htdocs/includes/odtphp/zip/ZipInterface.php index 05facb5908934..de10f80349393 100644 --- a/htdocs/includes/odtphp/zip/ZipInterface.php +++ b/htdocs/includes/odtphp/zip/ZipInterface.php @@ -4,10 +4,10 @@ * You need PHP 5.2 at least * You need Zip Extension or PclZip library * Encoding : ISO-8859-1 - * Last commit by $Author$ - * Date - $Date$ + * Last commit by $Author: eldy $ + * Date - $Date: 2010/03/10 19:44:02 $ * SVN Revision - $Rev: 28 $ - * Id : $Id$ + * Id : $Id: ZipInterface.php,v 1.2 2010/03/10 19:44:02 eldy Exp $ * * @copyright GPL License 2008 - Julien Pauli - Cyril PIERRE de GEYER - Anaska (http://www.anaska.com) * @license http://www.gnu.org/copyleft/gpl.html GPL License diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 16a850a1fddf0..114524be6d8fb 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -269,8 +269,6 @@ Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or - - 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit diff --git a/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php b/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php index 89e862fbc0967..29592ae2dd993 100644 --- a/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php +++ b/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php @@ -22,7 +22,7 @@ // The use of this software is at the risk of the user. // // -------------------------------------------------------------------------------- -// $Id$ +// $Id: pclzip.lib.php,v 1.3 2010/05/09 17:59:53 eldy Exp $ // -------------------------------------------------------------------------------- // ----- Constants diff --git a/htdocs/includes/odtphp/zip/pclzip/readme.txt b/htdocs/includes/odtphp/zip/pclzip/readme.txt index b5ff3f4a0a8d3..e95f7d7173f55 100644 --- a/htdocs/includes/odtphp/zip/pclzip/readme.txt +++ b/htdocs/includes/odtphp/zip/pclzip/readme.txt @@ -5,7 +5,7 @@ // Vincent Blavet - vincent@phpconcept.net // http://www.phpconcept.net // -------------------------------------------------------------------------------- -// $Id$ +// $Id: readme.txt,v 1.1 2010/05/09 17:59:53 eldy Exp $ // -------------------------------------------------------------------------------- diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php index 377485962d7c4..fb1b3b956b9d7 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php @@ -16,7 +16,7 @@ // | Authors: Jesus M. Castagnetto | // +----------------------------------------------------------------------+ // -// $Id$ +// $Id: Stats.php,v 1.1 2011/03/23 18:15:15 hregis Exp $ // include_once 'PEAR.php'; diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE.php index 0078d27346bf4..f2d120d6303c1 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE.php +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE.php @@ -17,7 +17,7 @@ // | Based on OLE::Storage_Lite by Kawai, Takanori | // +----------------------------------------------------------------------+ // -// $Id$ +// $Id: OLE.php,v 1.1 2011/03/23 18:15:17 hregis Exp $ /** diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS.php index ff74bbb34a4f3..4b21631996b0d 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS.php +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS.php @@ -17,7 +17,7 @@ // | Based on OLE::Storage_Lite by Kawai, Takanori | // +----------------------------------------------------------------------+ // -// $Id$ +// $Id: PPS.php,v 1.1 2011/03/23 18:15:18 hregis Exp $ /** diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/File.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/File.php index 2f59c7aac6a59..213b14a0f4004 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/File.php +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/File.php @@ -17,7 +17,7 @@ // | Based on OLE::Storage_Lite by Kawai, Takanori | // +----------------------------------------------------------------------+ // -// $Id$ +// $Id: File.php,v 1.1 2011/03/23 18:15:14 hregis Exp $ /** diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php index 592392d37a453..c94257eb75df0 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php @@ -17,7 +17,7 @@ // | Based on OLE::Storage_Lite by Kawai, Takanori | // +----------------------------------------------------------------------+ // -// $Id$ +// $Id: Root.php,v 1.1 2011/03/23 18:15:14 hregis Exp $ /** diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php index c3f60ecd377bc..b934502345146 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php @@ -22,7 +22,7 @@ // The use of this software is at the risk of the user. // // -------------------------------------------------------------------------------- -// $Id$ +// $Id: pclzip.lib.php,v 1.1 2011/03/23 18:15:21 hregis Exp $ // -------------------------------------------------------------------------------- // ----- Constants diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/readme.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/readme.txt index 17dd68f619266..14f13cd1ddc67 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/readme.txt +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/readme.txt @@ -5,7 +5,7 @@ // Vincent Blavet - vincent@phpconcept.net // http://www.phpconcept.net // -------------------------------------------------------------------------------- -// $Id$ +// $Id: readme.txt,v 1.1 2011/03/23 18:15:21 hregis Exp $ // -------------------------------------------------------------------------------- diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/AUTHORS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/AUTHORS index 32375b75f7441..a3d2091bf7fd2 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/AUTHORS +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/AUTHORS @@ -43,4 +43,4 @@ Valentin Stoykov Vasek Stodulka Wesley Transue -$Id$ +$Id: AUTHORS,v 1.1 2011/03/23 18:15:11 hregis Exp $ diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/BUGS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/BUGS index 43d1c940138f9..f777a63daf2ca 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/BUGS +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/BUGS @@ -1,3 +1,3 @@ See http://dejavu.sourceforge.net/wiki/index.php/Bugs -$Id$ +$Id: BUGS,v 1.1 2011/03/23 18:15:12 hregis Exp $ diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/LICENSE b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/LICENSE index ac475a84b01d6..72c046378dae6 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/LICENSE +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/LICENSE @@ -96,4 +96,4 @@ dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. -$Id$ +$Id: LICENSE,v 1.1 2011/03/23 18:15:12 hregis Exp $ diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/NEWS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/NEWS index 367475579f7d7..e9ae725273057 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/NEWS +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/NEWS @@ -1212,4 +1212,4 @@ Changes from 0.9 to 0.9.1: - proper caron shape for dcaron and tcaron - minor visual changes -$Id$ +$Id: NEWS,v 1.1 2011/03/23 18:15:11 hregis Exp $ diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/README b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/README index a11e444e2ff86..658440fe826cd 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/README +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/README @@ -56,4 +56,4 @@ U+213C-U+2140, U+2295-U+2298, U+2308-U+230B, U+26A2-U+26B1, U+2701-U+2704, U+2706-U+2709, U+270C-U+274B, U+2758-U+275A, U+2761-U+2775, U+2780-U+2794, U+2798-U+27AF, U+27B1-U+27BE, U+FB05-U+FB06 -$Id$ +$Id: README,v 1.1 2011/03/23 18:15:12 hregis Exp $ diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/langcover.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/langcover.txt index 8289ef485708f..c50597c693778 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/langcover.txt +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/langcover.txt @@ -1,5 +1,5 @@ This is the language coverage file for DejaVu fonts -($Id$) +($Id: langcover.txt,v 1.1 2011/03/23 18:15:11 hregis Exp $) Sans Serif Sans Mono aa Afar 100% (62/62) 100% (62/62) 100% (62/62) diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/status.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/status.txt index 4380db86cd954..e18f3717dd79f 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/status.txt +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/status.txt @@ -1,5 +1,5 @@ This is the status file for DejaVu fonts -($Id$) +($Id: status.txt,v 1.1 2011/03/23 18:15:11 hregis Exp $) original = present in original Bitstream Vera 1.10 = added in DejaVu fonts diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/unicover.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/unicover.txt index bd467ab24aaba..bd6cd67e38f66 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/unicover.txt +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/unicover.txt @@ -1,5 +1,5 @@ This is the Unicode coverage file for DejaVu fonts -($Id$) +($Id: unicover.txt,v 1.1 2011/03/23 18:15:11 hregis Exp $) Control and similar characters are discounted from totals. diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/AUTHORS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/AUTHORS index ee800a48ca638..3c7fa7d5cf90a 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/AUTHORS +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/AUTHORS @@ -205,4 +205,4 @@ Please see the CREDITS file for details on who contributed particular subsets of the glyphs in font files. -------------------------------------------------------------------------- -$Id$ +$Id: AUTHORS,v 1.1 2011/03/23 18:15:19 hregis Exp $ diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/CREDITS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/CREDITS index 67188b03c0abd..e02f0363a82ea 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/CREDITS +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/CREDITS @@ -525,4 +525,4 @@ Notes: this glyph collection. -------------------------------------------------------------------------- -$Id$ +$Id: CREDITS,v 1.1 2011/03/23 18:15:19 hregis Exp $ diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/ChangeLog b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/ChangeLog index 9ab101bd64acc..75ac6238da115 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/ChangeLog +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/ChangeLog @@ -1,4 +1,4 @@ -$Id$ +$Id: ChangeLog,v 1.1 2011/03/23 18:15:19 hregis Exp $ 2009-01-04 Stevan_White * FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd: diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/INSTALL b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/INSTALL index bad7da09b1854..a7ee5912106a4 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/INSTALL +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/INSTALL @@ -83,4 +83,4 @@ depending on whether they should be available to all users on your system or just to yourself. -------------------------------------------------------------------------- -$Id$ +$Id: INSTALL,v 1.1 2011/03/23 18:15:19 hregis Exp $ diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/README b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/README index b8865a25da2ae..99f70765e86cd 100644 --- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/README +++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/README @@ -105,4 +105,4 @@ Primoz Peterlin, Steve White Free UCS scalable fonts: http://savannah.gnu.org/projects/freefont/ -$Id$ +$Id: README,v 1.1 2011/03/23 18:15:19 hregis Exp $ diff --git a/htdocs/includes/triggers/README b/htdocs/includes/triggers/README index fd6c3cd7611a0..58817fc6b8167 100644 --- a/htdocs/includes/triggers/README +++ b/htdocs/includes/triggers/README @@ -14,4 +14,4 @@ where: a trigger with such a name, rename file to remove the -NORUN part. -$Id$ \ No newline at end of file +$Id: README,v 1.4 2010/04/22 06:29:34 hregis Exp $ \ No newline at end of file diff --git a/htdocs/includes/triggers/README-FR b/htdocs/includes/triggers/README-FR index b81b623965f7e..b4a8ca85d4ade 100644 --- a/htdocs/includes/triggers/README-FR +++ b/htdocs/includes/triggers/README-FR @@ -17,4 +17,4 @@ où: d'enlever la partie -NORUN. -$Id$ \ No newline at end of file +$Id: README-FR,v 1.4 2010/04/22 06:29:34 hregis Exp $ \ No newline at end of file diff --git a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql index de0e29d1cfd6e..776dd53ae0d43 100644 --- a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql +++ b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql @@ -1,6 +1,6 @@ -- --- $Id$ --- $Revision$ +-- $Id: 2.0.0-2.1.0.sql,v 1.4 2011/01/16 02:05:18 eldy Exp $ +-- $Revision: 1.4 $ -- -- Attention a l ordre des requetes. -- Ce fichier doit etre charge sur une version 2.0.0 diff --git a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql index b06aaedfe95ea..25327cf11cc0f 100644 --- a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql +++ b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql @@ -1,5 +1,5 @@ -- --- $Id$ +-- $Id: 2.1.0-2.2.0.sql,v 1.10 2011/01/16 02:05:18 eldy Exp $ -- -- Attention a l ordre des requetes. -- Ce fichier doit etre charge sur une version 2.1.0 diff --git a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql b/htdocs/install/mysql/migration/2.2.0-2.4.0.sql index 3d6b44623cbc0..c8baa87ccb5b0 100644 --- a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql +++ b/htdocs/install/mysql/migration/2.2.0-2.4.0.sql @@ -1,5 +1,5 @@ -- --- $Id$ +-- $Id: 2.2.0-2.4.0.sql,v 1.7 2011/05/17 09:00:18 eldy Exp $ -- -- Attention a l ordre des requetes. -- Ce fichier doit etre charge sur une version 2.2.0 diff --git a/htdocs/install/mysql/migration/2.4.0-2.5.0.sql b/htdocs/install/mysql/migration/2.4.0-2.5.0.sql index 01a2d31931cd9..b0e11f497840a 100644 --- a/htdocs/install/mysql/migration/2.4.0-2.5.0.sql +++ b/htdocs/install/mysql/migration/2.4.0-2.5.0.sql @@ -1,5 +1,5 @@ -- --- $Id$ +-- $Id: 2.4.0-2.5.0.sql,v 1.3 2010/10/06 09:40:18 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page diff --git a/htdocs/install/mysql/migration/2.5.0-2.6.0.sql b/htdocs/install/mysql/migration/2.5.0-2.6.0.sql index bddcf2bbb7fc2..ed85bb2201540 100644 --- a/htdocs/install/mysql/migration/2.5.0-2.6.0.sql +++ b/htdocs/install/mysql/migration/2.5.0-2.6.0.sql @@ -1,5 +1,5 @@ -- --- $Id$ +-- $Id: 2.5.0-2.6.0.sql,v 1.2 2010/10/06 09:40:21 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page diff --git a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql index c10195ffd9bb8..23a7c219ea2f2 100644 --- a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql +++ b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql @@ -1,5 +1,5 @@ -- --- $Id$ +-- $Id: 2.6.0-2.7.0.sql,v 1.26 2011/01/16 02:05:18 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql index ead5fd6aebd5d..ab8cb4c2d9da8 100755 --- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql +++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql @@ -1,5 +1,5 @@ -- --- $Id$ +-- $Id: 2.8.0-2.9.0.sql,v 1.77 2011/01/30 23:11:35 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql index 03da0b3bc371f..06c162dfffcc3 100644 --- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql +++ b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql @@ -1,5 +1,5 @@ -- --- $Id$ +-- $Id: 2.9.0-3.0.0.sql,v 1.68 2011/05/30 08:21:40 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index ffd1af7b3d78e..db47a74b612c9 100644 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -1,5 +1,5 @@ -- --- $Id$ +-- $Id: repair.sql,v 1.4 2011/05/25 18:16:58 eldy Exp $ -- -- Script to repair some fatal errors due to database corruption -- when current version is 2.6.0 or higher. diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index c7f9e58d7ec35..8916ace44edba 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -1,7 +1,6 @@ -- =================================================================== -- Copyright (C) 2007-2011 Laurent Destailleur -- Copyright (C) 2007 Regis Houssin --- Copyright (C) 2011 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/htdocs/langs/ru_RU/deliveries.lang b/htdocs/langs/ru_RU/deliveries.lang index 392a391ca89f3..36e2f66268fdb 100644 --- a/htdocs/langs/ru_RU/deliveries.lang +++ b/htdocs/langs/ru_RU/deliveries.lang @@ -10,23 +10,26 @@ // Reference language: en_US CHARSET=UTF-8 Delivery=Доставка -Deliveries=Рассылки -DeliveryCard=Доставка карту -DeliveryOrder=Доставка порядок -DeliveryOrders=Доставка заказов +Deliveries=Доставки +DeliveryCard=Карточка доставки +DeliveryOrder=Заказ на доставку +DeliveryOrders=Заказы на доставку DeliveryDate=Дата доставки -DeliveryDateShort=Доставки. свидание -CreateDeliveryOrder=Генерируйте доставки порядка -QtyDelivered=Количество доставлено -SetDeliveryDate=Установить дату судоходство -ValidateDeliveryReceipt=Подтверждение доставки получения -ValidateDeliveryReceiptConfirm=Вы уверены, что хотите проверить эту доставки получения? +DeliveryDateShort=Дата дост. +CreateDeliveryOrder=Создание заказа на доставку +QtyDelivered=Доставленное кол-во +SetDeliveryDate=Установить дату отправки +ValidateDeliveryReceipt=Подтверждение получения доставки +ValidateDeliveryReceiptConfirm=Вы действительно подтвердаете получение этой доставки? +DeleteDeliveryReceipt=Удалить подтверждение доставки +DeleteDeliveryReceiptConfirm=Вы действительно хотите удалить подтверждение доставки %s? DeliveryMethod=Способ доставки -TrackingNumber=Отслеживание числа +TrackingNumber=Номер отправления +DeliveryNotValidated=Доставка не подтверждена NameAndSignature=Имя и подпись: -ToAndDate=To___________________________________ на ____ / _____ / __________ -GoodStatusDeclaration=Получили товары выше, в хорошем состоянии, -Deliverer=Избавитель: +ToAndDate=Получатель ___________________________________ доставлено ____ / _____ / __________ +GoodStatusDeclaration=Указанные выше товары получены в надлежащем состоянии, +Deliverer=Доставщик: Sender=Отправитель Recipient=Получатель // Date 2009-01-19 21:30:52 diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang index c703e4b95fddb..f971f0c986381 100644 --- a/htdocs/langs/ru_RU/donations.lang +++ b/htdocs/langs/ru_RU/donations.lang @@ -9,41 +9,30 @@ // START - Lines generated via autotranslator.php tool. // Reference language: en_US CHARSET=UTF-8 -Donation=Пожертвования -Donationss=Пожертвования +Donation=Пожертвование +Donations=Пожертвования Donor=Донор Donors=Доноры AddDonation=Добавить пожертвование -NewDonation=Новые пожертвование -DonationPromise=Подарочные обещание -PromisesNotValid=Не подтверждены обещания -PromisesValid=Удостоверенная обещания -DonationsPaid=Пожертвования оплачивается -DonationsReceived=Пожертвования, полученные -PublicDonation=Общественная пожертвование -DonationsNumber=Пожертвования число -DonationsArea=Пожертвования области -DonationStatusPromiseNotValidated=Проект обещают -DonationStatusPromiseValidated=Удостоверенная обещание -DonationStatusPaid=Полученные пожертвования -DonationStatusPromiseNotValidatedShort=Черновик -DonationStatusPromiseValidatedShort=Подтвержденные -DonationStatusPaidShort=Поступило -ValidPromise=Проверить обещания -BuildDonationReceipt=Build получения -DonationsModels=Документы моделей пожертвование квитанции -// Date 2009-01-19 21:30:52 -// STOP - Lines generated via parser - - -// START - Lines generated via autotranslator.php tool (2009-08-13 21:14:36). -// Reference language: en_US -Donations=Пожертвования -// STOP - Lines generated via autotranslator.php tool (2009-08-13 21:14:36). - - - -// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40). -// Reference language: en_US -> ru_RU -ValidPromess=Проверить обещания -// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:40:14). +NewDonation=Новое пожертвование +DonationPromise=Обещание пожертвования +PromisesNotValid=Неподтвержденные обещания +PromisesValid=Подтвержденные обещания +DonationsPaid=Оплаченные пожертвования +DonationsReceived=Полученные пожертвования +PublicDonation=Общественное пожертвование +DonationsNumber=Номер пожертвования +DonationsArea=Пожертвования +DonationStatusPromiseNotValidated=Проект обещания +DonationStatusPromiseValidated=Подтвержденное обещание +DonationStatusPaid=Полученное пожертвование +DonationStatusPromiseNotValidatedShort=Проект +DonationStatusPromiseValidatedShort=Подтверждено +DonationStatusPaidShort=Получено +ValidPromise=Подтвердить обещание +BuildDonationReceipt=Создать подтверждение получения +DonationsModels=Модели документов для подтверждение получения пожертвования +LastModifiedDonations=Последние %s измененных пожертвований +SearchADonation=Поиск пожертвования +ValidPromess=Подтвердить обещание +// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:40:14). diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang index d4ad98259509e..5976f88a835ba 100644 --- a/htdocs/langs/ru_RU/languages.lang +++ b/htdocs/langs/ru_RU/languages.lang @@ -19,26 +19,42 @@ Language_en_IN=Английский (Индия) Language_en_US=Английский (США) Language_es_ES=Испанский Language_es_AR=Испанский (Аргентина) -Language_fi_FI=Ласты +Language_fi_FI=Финский Language_fr_BE=Французский (Бельгия) Language_fr_CA=Французский (Канада) Language_fr_CH=Французский (Швейцария) Language_fr_FR=Французский Language_is_IS=Исландский Language_it_IT=Итальянский -Language_ja_JP=Япо́нский язы́к +Language_ja_JP=Японский Language_nb_NO=Норвежский (букмол) Language_nl_BE=Голландский (Бельгия) Language_nl_NL=Голландский (Нидерланды) Language_pl_PL=Польский Language_pt_BR=Португальский (Бразилия) -Language_pt_PT=Португальский язык +Language_pt_PT=Португальский Language_ro_RO=Румынский Language_ru_RU=Русский -Language_ru_UA=Русский (Ukraine) +Language_ru_UA=Русский (Украина) Language_tr_TR=Турецкий Language_sl_SI=Словенский Language_sv_SV=Шведский Language_zh_CN=Китайский Language_is_IS=Исландский // STOP - Lines generated via autotranslator.php tool (2010-09-04 01:40:27). + + +// START - Lines generated via autotranslator.php tool (2011-08-27 12:37:41). +// Reference language: en_US -> ru_RU +Language_ar_SA=Арабский +Language_da_DK=Датский +Language_de_AT=Немецкий (Австрия) +Language_el_GR=Греческий +Language_en_NZ=Английский (Новая Зеландия) +Language_es_HN=Испанский (Гондурас) +Language_es_MX=Испанский (Мексика) +Language_es_PR=Испанский (Пуэрто-Рико) +Language_fa_IR=Персидский +Language_hu_HU=Венгерский +Language_sv_SE=Шведский +// STOP - Lines generated via autotranslator.php tool (2011-08-27 12:38:15). diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang index ae316141af137..701c8a47b0062 100644 --- a/htdocs/langs/ru_RU/trips.lang +++ b/htdocs/langs/ru_RU/trips.lang @@ -1,36 +1,30 @@ -/* - * Language code: ru_RU - * Automatic generated via autotranslator.php tool - * Generation date 2009-01-19 21:30:52 - */ - - -// Date 2009-01-19 21:30:52 -// START - Lines generated via autotranslator.php tool. -// Reference language: en_US -CHARSET=UTF-8 -Trip=Поездка -Trips=Экскурсии -TripsAndExpenses=Экскурсии и расходы -TripCard=Дорожные карточки -AddTrip=Добавить поездку -ListOfTrips=Перечень экскурсий -ListOfFees=Список сборов -NewTrip=Новое путешествие -CompanyVisited=Компании / Фонд посетил -Kilometers=Километры -FeesKilometersOrAmout=Сумма или километры -DeleteTrip=Удалить путешествие -ConfirmDeleteTrip=Вы уверены, что хотите удалить эту поездку? -TF_OTHER=Другой -TF_LUNCH=Обед -TF_TRIP=Поездка -// Date 2009-01-19 21:30:52 -// STOP - Lines generated via parser - - -// START - Lines generated via autotranslator.php tool (2010-09-04 02:09:13). -// Reference language: en_US -> ru_RU -TripsAndExpensesStatistics=Экскурсии и расходы статистика -ListTripsAndExpenses=Список поездок и расходы -// STOP - Lines generated via autotranslator.php tool (2010-09-04 02:20:13). +/* + * Language code: ru_RU + * Automatic generated via autotranslator.php tool + * Generation date 2009-01-19 21:30:52 + */ + +// Date 2009-01-19 21:30:52 +// START - Lines generated via autotranslator.php tool. +// Reference language: en_US +CHARSET=UTF-8 +Trip=Поездка +Trips=Поездки +TripsAndExpenses=Поездки и расходы +TripCard=Карточка поездки +AddTrip=Добавить поездку +ListOfTrips=Список поездок +ListOfFees=Список сборов +NewTrip=Новая Поездка +CompanyVisited=Посещенная организация +Kilometers=Километры +FeesKilometersOrAmout=Сумма или километры +DeleteTrip=Удалить поездку +ConfirmDeleteTrip=Вы уверены, что хотите удалить эту поездку? +TF_OTHER=Другое +TF_LUNCH=Обед +TF_TRIP=Поездка +TripsAndExpensesStatistics=Статистика поездок и расходов +ListTripsAndExpenses=Список поездок и расходов +ExpensesArea=Область поездок и расходов +SearchATripAndExpense=Поиск поездок и расходов diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js index 5db9ccae4658a..f62920dbf7532 100644 --- a/htdocs/lib/lib_head.js +++ b/htdocs/lib/lib_head.js @@ -7,7 +7,7 @@ // // \file htdocs/lib/lib_head.js // \brief File that include javascript functions (included if option use_javascript activated) -// \version $Id$ +// \version $Id: lib_head.js,v 1.82 2011/06/08 15:26:54 eldy Exp $ // diff --git a/htdocs/lib/lib_photosresize.js b/htdocs/lib/lib_photosresize.js index 969a52964c9b9..5269e8709b8af 100644 --- a/htdocs/lib/lib_photosresize.js +++ b/htdocs/lib/lib_photosresize.js @@ -5,7 +5,7 @@ // // \file htdocs/lib/lib_photoresize.js // \brief File that include javascript functions for croping feature -// \version $Id$ +// \version $Id: lib_photosresize.js,v 1.2 2010/09/06 10:18:31 eldy Exp $ // jQuery(function() { diff --git a/htdocs/lib/lib_rare.js b/htdocs/lib/lib_rare.js index 2ff384548043d..403d19f91558a 100644 --- a/htdocs/lib/lib_rare.js +++ b/htdocs/lib/lib_rare.js @@ -4,7 +4,7 @@ // // \file htdocs/lib/lib_rare.js // \brief File that include javascript functions not frequently used (included if option use_javascript activated) -// \version $Revision$ +// \version $Revision: 1.1 $ // in [-]HH:MM format... diff --git a/htdocs/theme/eldy/img/object_sending.png b/htdocs/theme/eldy/img/object_sending.png index 2a938862d75348b4806c8dffe2100765316b3e82..efda8cc7262c9cf1453e426fa2f79036221b8884 100644 GIT binary patch delta 45 ocmdnNbcJa`2Aj2Fi2&QziFqlK0wqCy!T(VK!vp15$%*GP0sSNykN^Mx delta 19 bcmcb@w1a6v2Ae6DoBk#1iFqj#-=zTnMMMXf diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 49e5657e20d57..33a94aef8f93e 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -1654,4 +1654,4 @@ close(); -?> +?> \ No newline at end of file