[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 25a43f362a -s ours am: 37caf4810e -s ours
am: 1f87082fdd -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4e9b31a09c3e97f205f03f7b97b18ac2afd1a65