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

Change-Id: Ic4be920322d722c35857a2b84bd9da9c7bbd9a7e