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

Change-Id: Idee2ee75ce3dc2fa1adf11169c99818a84e1e7ce