am 9f18f6a7: (-s ours) am 9824f21d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Nov 2013 14:17:56 +0000 (07:17 -0700)]
* commit '9f18f6a7c0e8b8351c9f12f5c6c23bfc37d911d5':
  Import translations. DO NOT MERGE


Trivial merge