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

Change-Id: I960e5550b18d08903167759d9893a9744a5e4c77