am 06d3867b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:55:42 +0000 (21:55 +0000)]
* commit '06d3867b1d96c3ad73d677e7c04a8d94b9f93c8b':
  Import translations. DO NOT MERGE


Trivial merge