[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 skip reason: subject contains skip directive Change-Id: I8a35bc769b478e6b5c7260d9caf4cffecf22336e
This commit is contained in: