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

Change-Id: I668961cf0e162db81c0dd55da4052c8c54874c62