am 302eaa74: (-s ours) am ac5ba830: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sun, 17 Aug 2014 14:31:01 +0000 (14:31 +0000)]
* commit '302eaa74157841b5a9119d636f13a66e290c89ad':
  Import translations. DO NOT MERGE


Trivial merge