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

Change-Id: Ie3bf4f719d40132c44f61ff3c59e16a7becdb847