Fix picture size tables

Correct 3920x2940's description to 11.5, and add 4208x3120 for 13MPx

Change-Id: Ie88122e6b622baabd3023f1194fa62e1e3c252a2
Updated simplified Chinese translations

Change-Id: I0eddf20e5c3e4937644e85fe16ba8d177098356f
Updated Japanese translations

- Add missing entries

Change-Id: I631da8f2804dce3434a3c3b8862626b4ae6bf906
Signed-off-by: rdgate <rdgate@gmail.com>
Updated simplified Chinese translations

Change-Id: I3a6f6852a0f8dbb32e65fcd040f0db1393f4e6e2
Merge "Updated Japanese translations" into jb-mr1
CameraSettings: fix the filtering of unsupported settings

Color effects were not filtered for the video camera, and
the focus mode filtering logic for the camera was broken.

Change-Id: I85a68ec992b7c6efaed4dddbf836cf00b20a8f89
Camera: add additional picture resolutions

- Adds WGVA, SVGA, XGA, 1.5MP, and 4MP resolutions

Change-Id: I92b8cafdb514de2dc6c99c01a5783540b8c695d6
Merge branch 'jb-mr1' of git://github.com/AOKP/packages_apps_Camera into jb-mr1