mozilla/webpay — pull request #259 by koehlermichael (2013-08-31 09:35:35+00:00)
Title: New German strings for Webpay

Another commit, another merge conflict. My messages.po looks fine as far as I can tell, but apparently there were a couple of other files commited.

Any idea on how I can fix that? Thanks.