[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa
-s ours am: 49cc947902
-s ours
am: 7738e588ba
-s ours
am skip reason: subject contains skip directive
Change-Id: If56b51c1bc3ce2a7c5da11eeadab7213414c30c6
This commit is contained in: