summaryrefslogtreecommitdiff
path: root/inc/lang/ja/conflict.txt
Commit message (Expand)AuthorAge
* various language fixesAndreas Gohr2006-08-06
* japanese language filesDavilin2005-06-18