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

Change-Id: I67ecd75a9d2048417da9dd0fda82bcd650e2127e