am c478796c: (-s ours) am 8f3c6521: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 17:51:06 +0000 (09:51 -0800)]
* commit 'c478796c0f999a4d91bfe3d605412e93dfa2868f':
  Import translations. DO NOT MERGE


Trivial merge