Spanish translation update (contrib, part 1)
i18n all the verbose stuff
.gitignore: update example config file name
Merge remote-tracking branch 'upstream/master'