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

Change-Id: I2fd01e7f7f8285e1bb9aff7eccf3239d19b40226