Fix a gramma error and translate two additional strings
Merge pull request #419 from arpemedia/master

Fix a gramma error and translate two additional strings (German translation)
Revert "Fix a gramma error and translate two additional strings (German translation)"
Merge pull request #420 from gogits/revert-419-master

Revert "Fix a gramma error and translate two additional strings (German ...
Merge branch 'master' of github.com:gogits/gogs into dev