convert newlines
fixed merge conflict
Merge branch 'master' of git://github.com/cakephp/localized
Merge branch 'master' of git://github.com/cakephp/localized
Merge branch 'master' of git://github.com/cakephp/localized
Merge branch 'master' of git://github.com/cakephp/localized
avoid using bcmod
Merge branch 'master' of git://github.com/cakephp/localized
fixed conflict
Merge branch 'master' of git://github.com/cakephp/localized
Merge branch 'master' of git://github.com/cakephp/localized
update files
german po
Merge pull request #25 from dereuromark/master

update + german translations
minor language adjustments
Merge pull request #26 from dereuromark/master

minor language adjustements
fix plural rule
Merge pull request #27 from dereuromark/master

fix plural rule
Add Persian translation of CakePHP
Merge pull request #24 from atkrad/master

Added Persian translation