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

Change-Id: I5e28e6d8bfeb5e2e8510bfb968f3e2aa83ab62a3