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

Change-Id: I33e98d2228421ed8f42e427b65da4b1027878e3a