Merge commit '6e0998c9' into gingerbread-plus-aosp * commit '6e0998c9': Import revised translations DO NOT MERGE