[openstreetmap-website] Localisation updates from http://translatewiki.net. (80dba54)

[John Firebaugh]

Could you please fix the merge conflicts in Gemfile.lock?

---
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/commit/80dba54d5cd66d9e903c882ec598ed28cfba2d87#commitcomment-2921210
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/rails-dev/attachments/20130401/32fc91f7/attachment.html>