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

Change-Id: I34b735436b57de6b5b3eb93fdf9d511b5e7524df