summaryrefslogtreecommitdiff
path: root/templates/de/option-conflict.tmpl
Commit message (Expand)AuthorAgeFilesLines
* Improved German translation (added missing translations, corrected wrong word...Robert Scheck2016-07-231-2/+2
* Added German translation (STR #4635)msweet2015-06-011-0/+7
* Merge changes from CUPS 1.6svn-r10267.msweet2012-02-131-7/+0
* Merge changes from CUPS 1.5svn-r8916.msweet2009-12-091-1/+1
* Merge changes from CUPS 1.4svn-r8492.msweet2009-04-081-0/+7
* Import CUPS 1.4svn r7023 into easysw/current.msweet2007-10-171-7/+0
* Load cups into easysw/current.jlovell2006-07-201-0/+7