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