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

Change-Id: I9832fc0c27e4ddc2aebeeb41d9cf261a9d0c15e0