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

Change-Id: Ib475415eafc87d5cac73f5106d227f1ef19e5f31