[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 69d1c9c037 -s ours
am: 2968a449bc -s ours
am skip reason: subject contains skip directive

Change-Id: I209140d15b2d2b7183a3dcc4b8ec6351ec26d4c4