<feed xmlns='http://www.w3.org/2005/Atom'>
<title>adodb/lang, branch v5.22.11-lsc</title>
<subtitle>adodb PHP Database Abstraction Layer
</subtitle>
<id>https://git.rdm1.uk/adodb/.git/atom?h=v5.22.11-lsc</id>
<link rel='self' href='https://git.rdm1.uk/adodb/.git/atom?h=v5.22.11-lsc'/>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/'/>
<updated>2024-08-25T10:04:51Z</updated>
<entry>
<title>Add Georgian language (#1042)</title>
<updated>2024-08-25T10:04:51Z</updated>
<author>
<name>NorwayFun</name>
<email>72336380+NorwayFun@users.noreply.github.com</email>
</author>
<published>2024-08-25T10:02:13Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=6eccac80d807b9cf2810061a3e468e199b790d41'/>
<id>urn:sha1:6eccac80d807b9cf2810061a3e468e199b790d41</id>
<content type='text'>
(cherry picked from commit 1e0e602ed72628f7a6665f5c925e93a80bdbd710)
</content>
</entry>
<entry>
<title>Redo Merge branch 'hotfix/5.21' Standardized file headers</title>
<updated>2021-08-16T22:48:04Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2021-08-16T22:48:04Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=d558d101c514beeb8c91f65ae61d106b201dc472'/>
<id>urn:sha1:d558d101c514beeb8c91f65ae61d106b201dc472</id>
<content type='text'>
Try to do it right this time...

# Conflicts:
#	adodb-memcache.lib.inc.php

Fixes #751
</content>
</entry>
<entry>
<title>Revert changes since Standardized file headers merge</title>
<updated>2021-08-16T22:30:04Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2021-08-16T22:30:04Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=507466ef798b18a3a8830230cfcd51bb488513cf'/>
<id>urn:sha1:507466ef798b18a3a8830230cfcd51bb488513cf</id>
<content type='text'>
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
</content>
</entry>
<entry>
<title>Standard file header: /lang</title>
<updated>2021-08-14T11:09:22Z</updated>
<author>
<name>Damien Regad</name>
<email>dregad@mantisbt.org</email>
</author>
<published>2021-04-25T10:46:01Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=0707b9da7ae9c413d7f77aa04eb7b1b406a71e99'/>
<id>urn:sha1:0707b9da7ae9c413d7f77aa04eb7b1b406a71e99</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix typos in german error messages</title>
<updated>2020-01-04T14:53:14Z</updated>
<author>
<name>peterdd</name>
<email>ddpm@liscovius.de</email>
</author>
<published>2020-01-04T14:53:14Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=5385d7d6c5d32de66161adfbab01d45cb2b85c0f'/>
<id>urn:sha1:5385d7d6c5d32de66161adfbab01d45cb2b85c0f</id>
<content type='text'>
Also translated DB_ERROR_CONSTRAINT from 'DEnglish' to real German, as 
most other European language files also real translate 'CONSTRAINT' to their 
local equivalent.

Also fixes indentation.

Fixes #579</content>
</entry>
<entry>
<title>Codespell assisted typo cleaning</title>
<updated>2019-11-12T12:46:19Z</updated>
<author>
<name>Jean-Michel Vourgère</name>
<email>nirgal@debian.org</email>
</author>
<published>2019-11-04T21:10:48Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=064f2f108c0b9781b61b353442691099f5e79845'/>
<id>urn:sha1:064f2f108c0b9781b61b353442691099f5e79845</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Add Indonesian translation (#293)</title>
<updated>2016-12-17T13:32:01Z</updated>
<author>
<name>Bambang Riswanto</name>
<email>bamz3r@gmail.com</email>
</author>
<published>2016-12-17T13:32:01Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=ea9d6117a7014f230322f3ab112abf2dff559a34'/>
<id>urn:sha1:ea9d6117a7014f230322f3ab112abf2dff559a34</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Add Occitan translation</title>
<updated>2016-11-03T15:18:14Z</updated>
<author>
<name>Cedric Valmary</name>
<email>cvalmary@yahoo.fr</email>
</author>
<published>2016-11-03T14:03:16Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=921856dc5166bc88896cc27c42b395ca6b81bbaa'/>
<id>urn:sha1:921856dc5166bc88896cc27c42b395ca6b81bbaa</id>
<content type='text'>
Fixes #285
</content>
</entry>
<entry>
<title>Convert file adodb-th.inc.php from TIS-620 to UTF-8</title>
<updated>2014-08-26T11:56:12Z</updated>
<author>
<name>Marc-Etienne Vargenau</name>
<email>Marc-Etienne.Vargenau@alcatel-lucent.com</email>
</author>
<published>2014-08-26T11:56:12Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=38428cdbcd1ed65410bc205340b4f30215a3a162'/>
<id>urn:sha1:38428cdbcd1ed65410bc205340b4f30215a3a162</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Convert Esperanto file from 'x' convention to UTF-8</title>
<updated>2014-08-26T11:38:52Z</updated>
<author>
<name>Marc-Etienne Vargenau</name>
<email>Marc-Etienne.Vargenau@alcatel-lucent.com</email>
</author>
<published>2014-08-26T11:38:52Z</published>
<link rel='alternate' type='text/html' href='https://git.rdm1.uk/adodb/.git/commit/?id=5bbf85068922c4660d3041ea056358c1cc8dc988'/>
<id>urn:sha1:5bbf85068922c4660d3041ea056358c1cc8dc988</id>
<content type='text'>
</content>
</entry>
</feed>
