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

Change-Id: Iec9ba0d674e58981f6fcbf3dc8f70c230dcbe980