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

Change-Id: I2d9c5e4a863f324c8b8504556a1e85d0e8c777f7