adodb/lang/adodb-pt-br.inc.php, branch v5.22.11-lsc adodb PHP Database Abstraction Layer https://git.rdm1.uk/adodb/.git/atom?h=v5.22.11-lsc 2021-08-16T22:48:04Z Redo Merge branch 'hotfix/5.21' Standardized file headers 2021-08-16T22:48:04Z Damien Regad dregad@mantisbt.org 2021-08-16T22:48:04Z urn:sha1:d558d101c514beeb8c91f65ae61d106b201dc472 Try to do it right this time... # Conflicts: # adodb-memcache.lib.inc.php Fixes #751 Revert changes since Standardized file headers merge 2021-08-16T22:30:04Z Damien Regad dregad@mantisbt.org 2021-08-16T22:30:04Z urn:sha1:507466ef798b18a3a8830230cfcd51bb488513cf The conflicts resolution applied when merging the Standardized file headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously messed up, actually overwriting a number of changes in the master branch. Rather than trying to go and fix things one by one which has a high risk of messing things further, it's easier to redo the merge from a clean slate, so this commit reverts the following: - "Merge branch 'hotfix/5.21' Standardized file headers", e9dcce3df24912ad869d0193f0b419f2309101fc - "Merge tag 'v5.21.1'", 5f437df3104159d5d659f60e31bef8d33c34995f - "Reset version to 5.22.0-dev" af9234a525c3255af051a330164486d73be4c63a - "Fix incorrect resolution of merge conflicts" a6733f61b0165b366c8d2c70d9af82edc3881951. - "Fix syntax error in toexport.inc.php" 20b01e83cb61b6b2460f64c7d1277c5f4cc28574. Fixes #751 Standard file header: /lang 2021-08-14T11:09:22Z Damien Regad dregad@mantisbt.org 2021-04-25T10:46:01Z urn:sha1:0707b9da7ae9c413d7f77aa04eb7b1b406a71e99 Codespell assisted typo cleaning 2019-11-12T12:46:19Z Jean-Michel Vourgère nirgal@debian.org 2019-11-04T21:10:48Z urn:sha1:064f2f108c0b9781b61b353442691099f5e79845 Convert files from ISO-8859-1 encoding to UTF-8 2014-08-06T22:43:57Z Damien Regad dregad@mantisbt.org 2014-08-06T22:41:13Z urn:sha1:bc576896e50a481778082d3d53efb5b903cdfb26 Fixes #32 Remove closing php tag 2014-02-24T15:57:38Z Damien Regad dregad@mantisbt.org 2014-02-24T15:21:57Z urn:sha1:8658d9d862cda3cbe153f586f61426b5010cc38b http://php.net/manual/en/language.basic-syntax.phptags.php Reorg: ADOdb5 (master) branch 2013-08-05T11:56:24Z Damien Regad dregad@mantisbt.org 2013-08-05T11:56:24Z urn:sha1:53010b5ceb548968e93c752defec085e7c508f4a - Move all files in adodb5/ to root - Remove adodb-for-php4/ directory