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

Change-Id: I1d0cbda4c87504e483c07fe00330fbff15de4a84