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


Trivial merge