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

Change-Id: I1758c28ef1ecc9edbdedb8e2acbbcaf928f8173f