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

Change-Id: If1c2570b1d7e05a14922f06d5e4e8d81d9ee978a