am 6de8911d: (-s ours) am 6006439c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 22:03:59 +0000 (22:03 +0000)]
* commit '6de8911d35a912f3f51900a59cf796da925f2609':
  Import translations. DO NOT MERGE


Trivial merge