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