am 336e49a0: (-s ours) am 64cb0d20: (-s ours) am 7460b6e0: (-s ours) Import translati...
Baligh Uddin [Sun, 19 Oct 2014 22:24:45 +0000 (22:24 +0000)]
* commit '336e49a0e7dd1a2f2a40b27def83b912c17c6289':
  Import translations. DO NOT MERGE


Trivial merge