[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3d9c7cb356
-s ours
am: 7ff72e6d75
-s ours
am skip reason: subject contains skip directive
Change-Id: I030d28d9dd02264114d8f54739984f608508be5d
This commit is contained in: