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

Change-Id: I83886cd49436235e4549c26fe73c585f7a3b6d52