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

Change-Id: I03433dd654288e252cad73f45e90c3198a6ef799