[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours
am: 49a60e6b40 -s ours
am skip reason: subject contains skip directive

Change-Id: If902517cdbff58fe1f091e50aa6e9de836af376c