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
Fix camera extra settings menu

If the list of settings entries is scrolled, the adapter returns a
reused View instead of creating a new one. This makes the last
entries unusable. This has been broken for ages but only shows up
if the camera has more than a few settings (which the stock camera
doesn't).

Ported from CM10.

Change-Id: I076202bd228b76c82af65a06f94134c46ef7ac59
merge changes from remotes/github/cm-10.1 into master
merge changes from remotes/github/cm-10.1 into master

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml

Change-Id: I636d080c9cc1184c1594ab09b2505f81a2e15a25
Merge "Fix camera extra settings menu" into cm-10.1
Camera: fix scene mode breakage caused by soft-hdr feature

Change-Id: Ic01645afaeb973f799b39dbea7d9ce347d3d59dd
merge changes from remotes/github/cm-10.1 into master