[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 279050c8d6
-s ours am: dbe1a25abd
-s ours
am: d76daeedba
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic2fbc017f4200a63ca7c38b6a60b434072d421f5
This commit is contained in: