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

Change-Id: I6c1d62458eb5d1aad5a02877bb4dbc1bf7239bf9