am 08b2636c: (-s ours) am 8f21bd29: (-s ours) am 35a5f7af: (-s ours) Import translati...
Baligh Uddin [Mon, 7 Jul 2014 17:45:25 +0000 (17:45 +0000)]
* commit '08b2636c031a070c4dd4207eed162bff332d785d':
  Import translations. DO NOT MERGE


Trivial merge