Automatic translation import

Change-Id: Idb2353d0fa3ea7302a15a3fd4fcb4a6376f7b22c
Protected Folder Fragment: Add remove Shortcut from list.

Change-Id: I0e9f141bc34bcfa955d7f5f3535d9d437e94b1da
Customizeable Dynamic Grid:

 - Presets
   - Comfortable (+0)
   - Cozy (+1)
   - Condensed (+2)
 - Custom option with min, max

Reordering items in the settings pane for better organization
Modifying Settings Layout for readability

Change-Id: I5c926b6ca4b2ed73c263ef34eeb368caeb7af9b5
Merge "Customizeable Dynamic Grid:" into cm-11.0
Merge "Protected Folder Fragment: Add remove Shortcut from list." into cm-11.0
Update sw600dp allapps icon to kitkat

Somehow these were still using the old look

Change-Id: I8d1c3309802f1af10d343189f30ddf4af00a5003
putting things back the way they were
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD

Conflicts:
	res/values/cm_strings.xml