[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d6d42f4be1 -s ours
am skip reason: subject contains skip directive

Change-Id: I3eadbc3c2700a7e5d16f3ed63b937e9244ea1e92