Automatic translation import

Change-Id: I79229f7208d13209d6fc2ea9ac1594027279ab0f
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
[1/2] Add option to change size of QS ribbon bar

PS2: Use narrow for 2nd size
PS3: Rebase
PS4: Change narrow to automatic
PS5: Rename small to narrow

Change-Id: Ibdf37b667b54ca598bc133b89ae01a504bfac883
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Proximity Wake-Up : adjust strings

Change-Id: I605a11b5bd7150b2a456d5c355af49fd7047e173
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/androidarmv6/android_packages_apps_Settings into cm-11.0