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

Change-Id: If93766401a8b3afa7b2bd7d21ae6e9f5a3bf25bd