New strings for German Webpay translation

There seems to be something wrong here. Things look fine to me in the diff but it says something about not being able to automatically merge these branches? Also I had merge conflicts while trying to get the new strings, I don’t know where that came from.