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

Change-Id: I268cf8fe33a70ce556d52b9d3aec0b2bb48e5ad1