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