[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours am: 453efcb333 -s ours
am: 75f383fa25 -s ours
am skip reason: subject contains skip directive

Change-Id: I098c9fe51ade0362c6767987ab08a5d6676d174a