am 68599af0: (-s ours) am b148e621: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Sep 2013 03:07:09 +0000 (20:07 -0700)]
* commit '68599af02c7d7b6a022916a6b50c973aaae87a02':
  Import translations. DO NOT MERGE


Trivial merge