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

Change-Id: I5f252cfd0b8139b027a0059f842fe654c6d24c0a