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

Change-Id: I13f0ab2721d9a9c99a7f73f6f2d6dc56ada30d80