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

Change-Id: Ifcccedff3162831dfa7c14f16de8fe9b3e1bb9c9