[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81
-s ours
am: 793e99ff96
-s ours
am skip reason: subject contains skip directive
Change-Id: I8d283321c5f7f119d5b99d3658929d80fc327e01
This commit is contained in: