am ac5ba830: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 17 Aug 2014 14:15:58 +0000 (14:15 +0000)]
* commit 'ac5ba83060a7ef55350afc96275cd50764408ae4':
  Import translations. DO NOT MERGE


Trivial merge