am 31475579: (-s ours) am 049a6c9c: (-s ours) am f830b073: (-s ours) am 1ef5cd37...
Baligh Uddin [Thu, 19 Dec 2013 18:29:03 +0000 (18:29 +0000)]
* commit '31475579aef7599b939b051ed927eb085be73dd6':
  Import translations. DO NOT MERGE


Trivial merge