am 54fbb3a6: (-s ours) am e8137079: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 22:04:32 +0000 (22:04 +0000)]
* commit '54fbb3a63e7dcb2afa9480e08263d8f0e991daee':
  Import translations. DO NOT MERGE


Trivial merge