[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3
-s ours am: 7c609c0cc4
-s ours
am: 08d02150b8
-s ours
am skip reason: subject contains skip directive
Change-Id: I1edca3959658ca296a4acc1261f0b1447b70fc7e
main
commit
134778e573