[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: da2d0d132f -s ours
am: 17fb77b61f -s ours
am skip reason: subject contains skip directive

Change-Id: I38e4ec78f3dd2331a5d6b172f48aa8c30844d3d1