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

Change-Id: I2ea91a9db10a7bd0bc7cc6a4e2de0be56b16a54d