summaryrefslogtreecommitdiff
path: root/inc/lang/ca/conflict.txt
Commit message (Collapse)AuthorAge
* various language fixesAndreas Gohr2006-08-06
| | | | | | | This patch makes sure all languages files have UNIX style line endings and use correct UTF-8 encoding darcs-hash:20060806143836-7ad00-2d9c48c5be303565ce461ec977c8792df61fbdd1.gz
* catalan language filesCarles Bellver2005-08-27
darcs-hash:20050827113920-cc4ee-a186f2ffe14c835e45506f626efbf745fccc080e.gz