[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 1daf3587cb -s ours
am: 4a28946f40 -s ours
am skip reason: subject contains skip directive

Change-Id: I0fe48aed1e86bd485daf803e85f5f9d30d5ae06c