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

Change-Id: If759a786e858a3249d683ba94ce6eb8eb328b54d