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

Change-Id: Ib7f0f5eadb66cb0389b29d792831d1f546bafc92