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

Change-Id: Ic9be380a139d6ad010b3b41f28670841050d01e9