Update strings.xml
Merge pull request #114 from liveasx/patch-17

Update strings.xml
Update strings.xml
Merge pull request #116 from Eric850130/patch-28

Update strings.xml
Make color appear correctly on non-standard devices (240x240).

Conflicts:
	res/layout/dialog_color_picker.xml
Merge branch 'jellybean' of https://github.com/GravityBox/GravityBox.git into jellybean
Merge remote-tracking branch 'GravityBox-upstream/jellybean' into jellybean