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

Change-Id: Id7a307fd4fac5f6979f833d105be9b8cadfe6679