Automatic translation import

Change-Id: If4f6790fd1f73252e96d897328f25b34803094c3
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	src/res/values-ca/strings.xml

Change-Id: Ifb749378d95de888cd2c55ad835bf7e6658da58a