[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736 -s ours
am: 79209927d7 -s ours
am skip reason: subject contains skip directive

Change-Id: Iee460ee20e3b7883819b86b194d6752957406e17