Update Russian Translation-Camera-CM10.1
Camera : reorganize and add french translation

Patch set 2 : correction

Change-Id: I3ff2b2056b86b47cb10bd09997b90683c716c40b
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
Merge "Camera : reorganize and add french translation" into cm-10.1
Merge "Update Russian Translation-Camera-CM10.1" into cm-10.1
Camera: add additional picture resolutions

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

Change-Id: I92b8cafdb514de2dc6c99c01a5783540b8c695d6
Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1

Conflicts:
	src/com/android/camera/CameraSettings.java