am 6006439c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:57:14 +0000 (21:57 +0000)]
* commit '6006439c15528bd8f5a85b20f470037b48a76e59':
  Import translations. DO NOT MERGE


Trivial merge