[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours am: 0da8214ae4
-s ours am: 625cd52625
-s ours am: f790e1a0eb
-s ours
am skip reason: subject contains skip directive Change-Id: I9d827c9b946a0724c4e27acd907c71971040dda7
This commit is contained in: