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

Change-Id: I784e358ccc757f56f1ef619103d68b7eb781179b