[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8e7fa0958a
-s ours am: e002abfb6c
-s ours
am skip reason: subject contains skip directive Change-Id: I97d476e4022e9b78e43cd5f07a08fd5b7d3bb796
This commit is contained in: