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

Change-Id: I28610419a0520bf3d832f81edb50a23374e51dfb