More strings translated

Translated some more strings and added the new strings.
(It says that it has merge conflicts, but I don´t know how to resolve them! It is probably because of the Merges that I did, but I don't know how to commit without them.)