Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	res/values-az/cm_strings.xml
	res/values-in/cm_strings.xml
	res/values-it/cm_strings.xml
	res/values-iw/cm_strings.xml
	res/values-ku/qcomstrings.xml
	res/values-nb/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-sk/cm_strings.xml
	res/values-th/cm_strings.xml
	res/values/qcomarrays.xml
	res/values/qcomstrings.xml

Change-Id: Ib4294c621052fdd02ba3ab715deda052432d2fd0

114 files changed, 2507 insertions, 2205 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 3154a832b..6f50939f6 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -24,22 +24,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 M pieksels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 M pieksels</string>
   <string name="pref_camera_picturesize_entry_10mp">10 M pieksels</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_9mp">9 M pieksels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 M pieksels</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 M pieksels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 M pieksels</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 M pieksels</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pieksels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 M pieksels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 M pieksels</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 M pieksels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Verminder vervaag beweging</string>
diff --git a/res/values-af/qcomstrings.xml b/res/values-af/qcomstrings.xml
index e6b85fdf0..49c43aff5 100644
--- a/res/values-af/qcomstrings.xml
+++ b/res/values-af/qcomstrings.xml
@@ -35,44 +35,46 @@
   <string name="pref_camera_video_duration_entry_10">10 minute</string>
   <string name="pref_camera_video_duration_entry_30">30 minute</string>
   <string name="pref_camera_skinToneEnhancement_title">Velkleur verbetering</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Aan</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Af</string>
   <string name="pref_camera_selectablezoneaf_title">Instelbare Zone Outo Fokus</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Outo</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Kol Meting</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Geweegdegemiddelde</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Foto raam Gemiddeld</string>
-  <string name="pref_camera_video_hdr_entry_off">Af</string>
-  <string name="pref_camera_video_hdr_entry_on">Aan</string>
   <string name="pref_camera_video_hdr_title">Video (HDR)</string>
   <string name="pref_camera_facedetection_title">Gesig Opsporing</string>
-  <string name="pref_camera_facedetection_entry_off">Af</string>
-  <string name="pref_camera_facedetection_entry_on">Aan</string>
   <string name="pref_camera_redeyereduction_title">Rooi oë Vermindering</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Aan</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Af</string>
   <string name="error_app_unsupported_hfr">HFR word nie ondersteun vir geselekteerde resolusie</string>
   <string name="error_app_unsupported_hfr_codec">Slegs H264 video kodering word ondersteun wanneer HFR AAN is</string>
   <string name="error_app_unsupported">Onondersteunde video resolusie vir hierdie tipe enkodeerder</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto beligting afbakening</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Aan</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Af</string>
   <string name="pref_camera_hfr_title">Stadige aksie (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Af</string>
   <string name="pref_camera_hfr_entry_2x">60 rps</string>
   <string name="pref_camera_hfr_entry_3x">90 rps</string>
   <string name="pref_camera_hfr_entry_4x">120 rps</string>
   <string name="pref_camera_denoise_title">Verminder geraas</string>
-  <string name="pref_camera_denoise_entry_off">Af</string>
-  <string name="pref_camera_denoise_entry_on">Aan</string>
   <string name="pref_camera_iso_title">Kies ISO</string>
   <string name="pref_camera_iso_entry_auto">Outo</string>
   <string name="pref_camera_iso_entry_isodeblur">ISO Outo(HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Teen \'Banding\'</string>
   <string name="pref_camera_antibanding_entry_0">Af</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +97,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Blou tint</string>
   <string name="pref_camera_coloreffect_entry_greentint">Groen tint</string>
   <string name="pref_camera_touchafaec_title">Raak AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Af</string>
-  <string name="pref_camera_touchafaec_entry_on">Aan</string>
   <string name="pref_camera_dis_title">Video stabilisering</string>
-  <string name="pref_camera_dis_entry_off">Af</string>
-  <string name="pref_camera_dis_entry_on">Aan</string>
   <string name="pref_camera_facerc_title">Gesigs erkenning</string>
-  <string name="pref_camera_facerc_entry_off">Af</string>
-  <string name="pref_camera_facerc_entry_on">Aan</string>
+  <string name="pref_camera_sharpness_title">Skerpte</string>
   <string name="pref_camera_sharpness_entry_level0">Vlak 0</string>
   <string name="pref_camera_sharpness_entry_level1">Vlak 1</string>
   <string name="pref_camera_sharpness_entry_level2">Vlak 2(Standaard)</string>
@@ -110,6 +107,7 @@
   <string name="pref_camera_sharpness_entry_level4">Vlak 4</string>
   <string name="pref_camera_sharpness_entry_level5">Vlak 5</string>
   <string name="pref_camera_sharpness_entry_level6">Vlak 6</string>
+  <string name="pref_camera_contrast_title">Kontras</string>
   <string name="pref_camera_contrast_entry_level0">Vlak 0</string>
   <string name="pref_camera_contrast_entry_level1">Vlak 1</string>
   <string name="pref_camera_contrast_entry_level2">Vlak 2</string>
@@ -121,6 +119,7 @@
   <string name="pref_camera_contrast_entry_level8">Vlak 8</string>
   <string name="pref_camera_contrast_entry_level9">Vlak 9</string>
   <string name="pref_camera_contrast_entry_level10">Vlak 10</string>
+  <string name="pref_camera_saturation_title">Versadiging</string>
   <string name="pref_camera_saturation_entry_level0">Vlak 0</string>
   <string name="pref_camera_saturation_entry_level1">Vlak 1</string>
   <string name="pref_camera_saturation_entry_level2">Vlak 2</string>
@@ -132,9 +131,6 @@
   <string name="pref_camera_saturation_entry_level8">Vlak 8</string>
   <string name="pref_camera_saturation_entry_level9">Vlak 9</string>
   <string name="pref_camera_saturation_entry_level10">Vlak 10</string>
-  <string name="pref_camera_sharpness_title">Skerpte</string>
-  <string name="pref_camera_contrast_title">Kontras</string>
-  <string name="pref_camera_saturation_title">Versadiging</string>
   <string name="pref_camera_picture_format_title">Kies foto-formaat</string>
   <string name="pref_camera_jpegquality_title">Foto kwaliteit</string>
   <string name="pref_camera_jpegquality_entry_0">Jpeg 55%</string>
@@ -144,9 +140,5 @@
   <string name="pref_camera_jpegquality_entry_4">Jpeg 95%</string>
   <string name="pref_camera_jpegquality_entry_5">Jpeg 100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">Aan</string>
-  <string name="pref_camera_histogram_entry_disable">Af</string>
   <string name="pref_camera_scenedetect_title">Outomaties toneel bespeuring</string>
-  <string name="pref_camera_scenedetect_entry_on">Aan</string>
-  <string name="pref_camera_scenedetect_entry_off">Af</string>
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 71140ece9..7a109b268 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_10mp">10 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_9mp">9 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_4mp">4 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">الحد من الضبابية</string>
diff --git a/res/values-ar/qcomstrings.xml b/res/values-ar/qcomstrings.xml
index 63ed52ca1..e66eff671 100644
--- a/res/values-ar/qcomstrings.xml
+++ b/res/values-ar/qcomstrings.xml
@@ -35,36 +35,24 @@
   <string name="pref_camera_video_duration_entry_10">10 دقائق</string>
   <string name="pref_camera_video_duration_entry_30">30دقيقه</string>
   <string name="pref_camera_skinToneEnhancement_title">تعزيز لون البشرة</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">يعمل</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">مغلق</string>
   <string name="pref_camera_selectablezoneaf_title">Autofocus منطقة</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">تلقائي</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">بقعة القياس</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">مركز الموازن</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">الإطار المتوسط</string>
-  <string name="pref_camera_video_hdr_entry_off">مغلق</string>
-  <string name="pref_camera_video_hdr_entry_on">يعمل</string>
   <string name="pref_camera_video_hdr_title">فديو HDR</string>
   <string name="pref_camera_facedetection_title">تركيز في الوجه</string>
-  <string name="pref_camera_facedetection_entry_off">مغلق</string>
-  <string name="pref_camera_facedetection_entry_on">يعمل</string>
   <string name="pref_camera_redeyereduction_title">تقليل العين الحمراء</string>
-  <string name="pref_camera_redeyereduction_entry_enable">يعمل</string>
-  <string name="pref_camera_redeyereduction_entry_disable">مغلق</string>
   <string name="error_app_unsupported_hfr">HFR غير معتمد للقرار المحدد</string>
   <string name="error_app_unsupported_hfr_codec">فقط ترميز H.264 الفيديو غير معتمد عند HFR</string>
   <string name="error_app_unsupported">دقة الفيديو غير مدعومة لهذا النوع من الترميز</string>
   <string name="pref_camera_ae_bracket_hdr_title">تلقائي  أقواس التعرض</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">يعمل</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">مغلق</string>
   <string name="pref_camera_hfr_title">حركة بطيئة (HFR)</string>
   <string name="pref_camera_hfr_entry_off">مغلق</string>
   <string name="pref_camera_hfr_entry_2x">60 إطارا في الثانية</string>
   <string name="pref_camera_hfr_entry_3x">90 إطارا في الثانية</string>
   <string name="pref_camera_hfr_entry_4x">120 إطارا في الثانية</string>
   <string name="pref_camera_denoise_title">إزالة الشوش</string>
-  <string name="pref_camera_denoise_entry_off">مغلق</string>
-  <string name="pref_camera_denoise_entry_on">يعمل</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">تلقائي</string>
   <string name="pref_camera_iso_entry_isodeblur">تلقائي (HJR)</string>
@@ -95,14 +83,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">صبغة زرقاء</string>
   <string name="pref_camera_coloreffect_entry_greentint">صبغة خضراء</string>
   <string name="pref_camera_touchafaec_title">لمسة AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">مغلق</string>
-  <string name="pref_camera_touchafaec_entry_on">يعمل</string>
   <string name="pref_camera_dis_title">إستقرار الفديو</string>
-  <string name="pref_camera_dis_entry_off">مغلق</string>
-  <string name="pref_camera_dis_entry_on">يعمل</string>
   <string name="pref_camera_facerc_title">التعرف على الوجه</string>
-  <string name="pref_camera_facerc_entry_off">مغلق</string>
-  <string name="pref_camera_facerc_entry_on">يعمل</string>
+  <string name="pref_camera_sharpness_title">الحدة</string>
   <string name="pref_camera_sharpness_entry_level0">مستوى 0</string>
   <string name="pref_camera_sharpness_entry_level1">المستوى 1</string>
   <string name="pref_camera_sharpness_entry_level2">المستوى 2 (افتراضي)</string>
@@ -110,6 +93,7 @@
   <string name="pref_camera_sharpness_entry_level4">المستوى 4</string>
   <string name="pref_camera_sharpness_entry_level5">المستوى 5</string>
   <string name="pref_camera_sharpness_entry_level6">المستوى 6</string>
+  <string name="pref_camera_contrast_title">التباين</string>
   <string name="pref_camera_contrast_entry_level0">مستوى 0</string>
   <string name="pref_camera_contrast_entry_level1">المستوى 1</string>
   <string name="pref_camera_contrast_entry_level2">المستوى 2</string>
@@ -121,6 +105,7 @@
   <string name="pref_camera_contrast_entry_level8">المستوى 8</string>
   <string name="pref_camera_contrast_entry_level9">المستوى 9</string>
   <string name="pref_camera_contrast_entry_level10">المستوى 10</string>
+  <string name="pref_camera_saturation_title">التشبع</string>
   <string name="pref_camera_saturation_entry_level0">مستوى 0</string>
   <string name="pref_camera_saturation_entry_level1">المستوى 1</string>
   <string name="pref_camera_saturation_entry_level2">المستوى 2</string>
@@ -132,9 +117,6 @@
   <string name="pref_camera_saturation_entry_level8">المستوى 8</string>
   <string name="pref_camera_saturation_entry_level9">المستوى 9</string>
   <string name="pref_camera_saturation_entry_level10">المستوى 10</string>
-  <string name="pref_camera_sharpness_title">الحدة</string>
-  <string name="pref_camera_contrast_title">التباين</string>
-  <string name="pref_camera_saturation_title">التشبع</string>
   <string name="pref_camera_picture_format_title">تنسيق الصورة</string>
   <string name="pref_camera_jpegquality_title">جودة الصورة</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +126,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">الرسم البياني</string>
-  <string name="pref_camera_histogram_entry_enable">يعمل</string>
-  <string name="pref_camera_histogram_entry_disable">مغلق</string>
   <string name="pref_camera_scenedetect_title">الكشف التلقائي للمشهد</string>
-  <string name="pref_camera_scenedetect_entry_on">يعمل</string>
-  <string name="pref_camera_scenedetect_entry_off">مغلق</string>
 </resources>
diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml
index e86af7ce6..c777ebf60 100644
--- a/res/values-az/cm_strings.xml
+++ b/res/values-az/cm_strings.xml
@@ -24,22 +24,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M piksel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M piksel</string>
   <string name="pref_camera_picturesize_entry_10mp">10M piksel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7M piksel</string>
   <string name="pref_camera_picturesize_entry_9mp">9M piksel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M piksel</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M piksel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M piksel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M piksel</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M piksel</string>
   <string name="pref_camera_picturesize_entry_4mp">4M piksel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M piksel</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M piksel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M piksel</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M piksel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Hərəkət bulanıqlığı azaldılması</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index ea897dd7d..ade71003f 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mp</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Mp</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mp</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mp</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mp</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 Mp</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mp</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mp</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mp</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 Mp</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mp</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mp</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mp</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mp</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mp</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mp</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mp</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mp</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mp</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mp</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mp</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reducció del difuminat del moviment</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">FES BONIC</string>
   <string name="camera_menu_asd_label">ESCENA INTEL·LIGENT</string>
   <string name="pref_camera_power_shutter_title">Obturador ràpid</string>
+  <string name="pref_camera_max_brightness_title">Pantalla brillant</string>
   <string name="pref_superzoom_title">Magnifica</string>
 </resources>
diff --git a/res/values-ca/qcomstrings.xml b/res/values-ca/qcomstrings.xml
index bc3bfc53c..10cc65257 100644
--- a/res/values-ca/qcomstrings.xml
+++ b/res/values-ca/qcomstrings.xml
@@ -27,7 +27,7 @@
   <string name="pref_camera_autoexposure_title">Exposició automàtica</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Mitjana de fotogrames</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada al centre</string>
-  <string name="pref_camera_autoexposure_entry_spotmetering">Medició puntual</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Mesura puntual</string>
   <string name="pref_camera_videoencoder_title">Codificador de vídeo</string>
   <string name="pref_camera_audioencoder_title">Codificador de so</string>
   <string name="pref_camera_video_duration_title">Duració del vídeo</string>
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minuts</string>
   <string name="pref_camera_video_duration_entry_30">30 minuts</string>
   <string name="pref_camera_skinToneEnhancement_title">Millora la tonalitat de la pell</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Encès</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desactivat</string>
   <string name="pref_camera_selectablezoneaf_title">Zona d\'Auto Focus</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
-  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Medició puntual</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Mesura puntual</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderada al centre</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Mitjana del marc</string>
-  <string name="pref_camera_video_hdr_entry_off">Desactivat</string>
-  <string name="pref_camera_video_hdr_entry_on">Encès</string>
+  <string name="hdr_enable_message">L\'HDR està habilitat, només està suportat el mode d\'escena Auto</string>
+  <string name="scene_enable_message">L\'HDR no éstà suportat en modes d\'escena diferents d\'Auto</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
   <string name="pref_camera_facedetection_title">Detecció de cares</string>
-  <string name="pref_camera_facedetection_entry_off">Desactivat</string>
-  <string name="pref_camera_facedetection_entry_on">Encès</string>
   <string name="pref_camera_redeyereduction_title">Reducció d\'ulls vermells</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Encès</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desactivat</string>
+  <string name="error_app_unsupported_hfr_selection">L\'HFR no està suportat quan l\'estabilització de vídeo, el time lapse o el vídeo HDR estan activats</string>
   <string name="error_app_unsupported_hfr">L\'HFR no està suportat per a la resolució seleccionada</string>
   <string name="error_app_unsupported_hfr_codec">Quan l\'HFR està activat només està suportada la codificació de vídeo H.264</string>
   <string name="error_app_unsupported">Resolució de vídeo no suportada en aquest tipus de codificador</string>
+  <string name="error_app_unsupported_dis">L\'estabilització de vídeo no està suportada en la resolució seleccionada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing Auto Exposició</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Encès</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Desactivat</string>
   <string name="pref_camera_hfr_title">Càmera lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desactivat</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Antisoroll</string>
-  <string name="pref_camera_denoise_entry_off">Desactivat</string>
-  <string name="pref_camera_denoise_entry_on">Encès</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Anti Bandeig</string>
   <string name="pref_camera_antibanding_entry_0">Desactivat</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tinta blava</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tinta verda</string>
   <string name="pref_camera_touchafaec_title">AF/AEC tàctil</string>
-  <string name="pref_camera_touchafaec_entry_off">No</string>
-  <string name="pref_camera_touchafaec_entry_on">Sí</string>
   <string name="pref_camera_dis_title">Estabilització de vídeo</string>
-  <string name="pref_camera_dis_entry_off">No</string>
-  <string name="pref_camera_dis_entry_on">Sí</string>
   <string name="pref_camera_facerc_title">Reconeixement de cares</string>
-  <string name="pref_camera_facerc_entry_off">No</string>
-  <string name="pref_camera_facerc_entry_on">Sí</string>
+  <string name="pref_camera_sharpness_title">Nitidesa</string>
   <string name="pref_camera_sharpness_entry_level0">Nivell 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivell 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivell 2 (Predefinit)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nivell 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nivell 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nivell 6</string>
+  <string name="pref_camera_contrast_title">Contrast</string>
   <string name="pref_camera_contrast_entry_level0">Nivell 0</string>
   <string name="pref_camera_contrast_entry_level1">Nivell 1</string>
   <string name="pref_camera_contrast_entry_level2">Nivell 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Nivell 8</string>
   <string name="pref_camera_contrast_entry_level9">Nivell 9</string>
   <string name="pref_camera_contrast_entry_level10">Nivell 10</string>
+  <string name="pref_camera_saturation_title">Saturació</string>
   <string name="pref_camera_saturation_entry_level0">Nivell 0</string>
   <string name="pref_camera_saturation_entry_level1">Nivell 1</string>
   <string name="pref_camera_saturation_entry_level2">Nivell 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Nivell 8</string>
   <string name="pref_camera_saturation_entry_level9">Nivell 9</string>
   <string name="pref_camera_saturation_entry_level10">Nivell 10</string>
-  <string name="pref_camera_sharpness_title">Nitidesa</string>
-  <string name="pref_camera_contrast_title">Contrast</string>
-  <string name="pref_camera_saturation_title">Saturació</string>
   <string name="pref_camera_picture_format_title">Selecciona el format d\'imatge</string>
   <string name="pref_camera_jpegquality_title">Qualitat d\'imatge</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Encès</string>
-  <string name="pref_camera_histogram_entry_disable">Desactivat</string>
   <string name="pref_camera_scenedetect_title">Auto Detecció d\'Escenes</string>
-  <string name="pref_camera_scenedetect_entry_on">Encès</string>
-  <string name="pref_camera_scenedetect_entry_off">Desactivat</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 865f173eb..cb09f6ea5 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Mpx</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpx</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mpx</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 Mpx</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpx</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpx</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mpx</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mpx</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpx</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mpx</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpx</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpx</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpx</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukce rozmazání</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ZKRÁŠLENÍ</string>
   <string name="camera_menu_asd_label">CHYTRÁ SCÉNA</string>
   <string name="pref_camera_power_shutter_title">Spoušť tlačítkem vypnutí</string>
+  <string name="pref_camera_max_brightness_title">Plný jas obrazovky</string>
   <string name="pref_superzoom_title">Zvětšit</string>
 </resources>
diff --git a/res/values-cs/qcomstrings.xml b/res/values-cs/qcomstrings.xml
index a43f6f4c9..c84207cdf 100644
--- a/res/values-cs/qcomstrings.xml
+++ b/res/values-cs/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minut</string>
   <string name="pref_camera_video_duration_entry_30">30 minut</string>
   <string name="pref_camera_skinToneEnhancement_title">Vylepšení tónů pleti</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Zapnuto</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Vypnuto</string>
   <string name="pref_camera_selectablezoneaf_title">Zóna automatického ostření</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automaticky</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Bodové měření</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Se zvýrazněným středem</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Průměrové</string>
-  <string name="pref_camera_video_hdr_entry_off">Vyp</string>
-  <string name="pref_camera_video_hdr_entry_on">Zap</string>
+  <string name="hdr_enable_message">HDR je povoleno, je podporován pouze režim Automaticky</string>
+  <string name="scene_enable_message">HDR není podporováno v jiném režimu než Automaticky</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Detekce obličeje</string>
-  <string name="pref_camera_facedetection_entry_off">Vyp</string>
-  <string name="pref_camera_facedetection_entry_on">Zap</string>
   <string name="pref_camera_redeyereduction_title">Redukce červených očí</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Zapnuto</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Vypnuto</string>
+  <string name="error_app_unsupported_hfr_selection">HFR není podporováno při stabilizaci, časosběru nebo při zapnutém režimu HDR</string>
   <string name="error_app_unsupported_hfr">Pro zvolené rozlišení není HFR podporováno</string>
   <string name="error_app_unsupported_hfr_codec">Pokud je zapnuto HFR, je podporován pouze kodek H.264</string>
   <string name="error_app_unsupported">Nepodporované rozlišení videa pro daný kodek</string>
+  <string name="error_app_unsupported_dis">Stabilizace videa není pro dané rozlišení podporována</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatický expoziční bracketing</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Zap</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Vyp</string>
   <string name="pref_camera_hfr_title">Zpomalený záběr (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Vyp</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Odstranění šumu</string>
-  <string name="pref_camera_denoise_entry_off">Vyp</string>
-  <string name="pref_camera_denoise_entry_on">Zap</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automaticky</string>
   <string name="pref_camera_iso_entry_isodeblur">Automaticky (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Odstranění pruhů</string>
   <string name="pref_camera_antibanding_entry_0">Vypnuto</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Odstín modré</string>
   <string name="pref_camera_coloreffect_entry_greentint">Odstín zelené</string>
   <string name="pref_camera_touchafaec_title">AF/AEC dotykem</string>
-  <string name="pref_camera_touchafaec_entry_off">Vyp</string>
-  <string name="pref_camera_touchafaec_entry_on">Zap</string>
   <string name="pref_camera_dis_title">Stabilizace obrazu</string>
-  <string name="pref_camera_dis_entry_off">Vyp</string>
-  <string name="pref_camera_dis_entry_on">Zap</string>
   <string name="pref_camera_facerc_title">Detekce obličeje</string>
-  <string name="pref_camera_facerc_entry_off">Vyp</string>
-  <string name="pref_camera_facerc_entry_on">Zap</string>
+  <string name="pref_camera_sharpness_title">Ostrost</string>
   <string name="pref_camera_sharpness_entry_level0">Úroveň 0</string>
   <string name="pref_camera_sharpness_entry_level1">Úroveň 1</string>
   <string name="pref_camera_sharpness_entry_level2">Úroveň 2 (výchozí)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Úroveň 4</string>
   <string name="pref_camera_sharpness_entry_level5">Úroveň 5</string>
   <string name="pref_camera_sharpness_entry_level6">Úroveň 6</string>
+  <string name="pref_camera_contrast_title">Kontrast</string>
   <string name="pref_camera_contrast_entry_level0">Úroveň 0</string>
   <string name="pref_camera_contrast_entry_level1">Úroveň 1</string>
   <string name="pref_camera_contrast_entry_level2">Úroveň 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Úroveň 8</string>
   <string name="pref_camera_contrast_entry_level9">Úroveň 9</string>
   <string name="pref_camera_contrast_entry_level10">Úroveň 10</string>
+  <string name="pref_camera_saturation_title">Sytost</string>
   <string name="pref_camera_saturation_entry_level0">Úroveň 0</string>
   <string name="pref_camera_saturation_entry_level1">Úroveň 1</string>
   <string name="pref_camera_saturation_entry_level2">Úroveň 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Úroveň 8</string>
   <string name="pref_camera_saturation_entry_level9">Úroveň 9</string>
   <string name="pref_camera_saturation_entry_level10">Úroveň 10</string>
-  <string name="pref_camera_sharpness_title">Ostrost</string>
-  <string name="pref_camera_contrast_title">Kontrast</string>
-  <string name="pref_camera_saturation_title">Sytost</string>
   <string name="pref_camera_picture_format_title">Formát obrázku</string>
   <string name="pref_camera_jpegquality_title">Kvalita obrázku</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">Zapnuto</string>
-  <string name="pref_camera_histogram_entry_disable">Vypnuto</string>
   <string name="pref_camera_scenedetect_title">Automatická detekce scény</string>
-  <string name="pref_camera_scenedetect_entry_on">Zap</string>
-  <string name="pref_camera_scenedetect_entry_off">Vyp</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 1f112c968..692806f27 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapixels</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapixels</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixels</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapixels</string>
   <string name="pref_camera_picturesize_entry_12mp">12 megapixels</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 megapixels</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapixels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixels</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapixels</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 megapixels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapixels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixels</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixels</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reduktion af bevægelsesslør</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">FORSKØN</string>
   <string name="camera_menu_asd_label">SMART SCENE</string>
   <string name="pref_camera_power_shutter_title">Strømudløser</string>
+  <string name="pref_camera_max_brightness_title">Lysstærk skærm</string>
   <string name="pref_superzoom_title">Forstør</string>
 </resources>
diff --git a/res/values-da/qcomstrings.xml b/res/values-da/qcomstrings.xml
index 6fccf15f9..766d9f333 100644
--- a/res/values-da/qcomstrings.xml
+++ b/res/values-da/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minutter</string>
   <string name="pref_camera_video_duration_entry_30">30 minutter</string>
   <string name="pref_camera_skinToneEnhancement_title">Hudfarveforbedring</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Til</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Fra</string>
   <string name="pref_camera_selectablezoneaf_title">Autofokus-zone</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spotmåling</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centervægtet</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Rammegennemsnit</string>
-  <string name="pref_camera_video_hdr_entry_off">Fra</string>
-  <string name="pref_camera_video_hdr_entry_on">Til</string>
+  <string name="hdr_enable_message">HDR er aktiveret, kun automatisk scenetilstand understøttes</string>
+  <string name="scene_enable_message">HDR understøttes ikke i anden scenetilstand end automatisk</string>
   <string name="pref_camera_video_hdr_title">Video-HDR</string>
   <string name="pref_camera_facedetection_title">Ansigtsgenkendelse</string>
-  <string name="pref_camera_facedetection_entry_off">Fra</string>
-  <string name="pref_camera_facedetection_entry_on">Til</string>
   <string name="pref_camera_redeyereduction_title">Røjøjereduktion</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Til</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Fra</string>
+  <string name="error_app_unsupported_hfr_selection">HFR er ikke understøttet når videostabilisering, tidsforkort eller video HDR er slået til</string>
   <string name="error_app_unsupported_hfr">HFR understøttes ikke for den valgte opløsning</string>
   <string name="error_app_unsupported_hfr_codec">Kun H.264-videokodning understøttes med HFR aktiveret</string>
   <string name="error_app_unsupported">Ikke understøttet videoopløsning for denne codectype</string>
+  <string name="error_app_unsupported_dis">Videostabilisering understøttes ikke for valgte opløsning</string>
   <string name="pref_camera_ae_bracket_hdr_title">Autoeksponerings-bracketing</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Til</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Fra</string>
   <string name="pref_camera_hfr_title">Slowmotion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Fra</string>
   <string name="pref_camera_hfr_entry_2x">60 fps</string>
   <string name="pref_camera_hfr_entry_3x">90 fps</string>
   <string name="pref_camera_hfr_entry_4x">120 fps</string>
   <string name="pref_camera_denoise_title">Fjern støj</string>
-  <string name="pref_camera_denoise_entry_off">Fra</string>
-  <string name="pref_camera_denoise_entry_on">Til</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO 50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO 125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO 250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO 320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO 500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO 640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO 1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO 1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO 1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO 2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO 2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO 3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO 6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO 12800</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">Fra</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Blå toning</string>
   <string name="pref_camera_coloreffect_entry_greentint">Grøn toning</string>
   <string name="pref_camera_touchafaec_title">Berøringsfokus/eksponering</string>
-  <string name="pref_camera_touchafaec_entry_off">Fra</string>
-  <string name="pref_camera_touchafaec_entry_on">Til</string>
   <string name="pref_camera_dis_title">Video stabilisering</string>
-  <string name="pref_camera_dis_entry_off">Fra</string>
-  <string name="pref_camera_dis_entry_on">Til</string>
   <string name="pref_camera_facerc_title">Ansigtsgenkendelse</string>
-  <string name="pref_camera_facerc_entry_off">Fra</string>
-  <string name="pref_camera_facerc_entry_on">Til</string>
+  <string name="pref_camera_sharpness_title">Skarphed</string>
   <string name="pref_camera_sharpness_entry_level0">Niveau 0</string>
   <string name="pref_camera_sharpness_entry_level1">Niveau 1</string>
   <string name="pref_camera_sharpness_entry_level2">Niveau 2 (Standard)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Niveau 4</string>
   <string name="pref_camera_sharpness_entry_level5">Niveau 5</string>
   <string name="pref_camera_sharpness_entry_level6">Niveau 6</string>
+  <string name="pref_camera_contrast_title">Kontrast</string>
   <string name="pref_camera_contrast_entry_level0">Niveau 0</string>
   <string name="pref_camera_contrast_entry_level1">Niveau 1</string>
   <string name="pref_camera_contrast_entry_level2">Niveau 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Niveau 8</string>
   <string name="pref_camera_contrast_entry_level9">Niveau 9</string>
   <string name="pref_camera_contrast_entry_level10">Niveau 10</string>
+  <string name="pref_camera_saturation_title">Mætning</string>
   <string name="pref_camera_saturation_entry_level0">Niveau 0</string>
   <string name="pref_camera_saturation_entry_level1">Niveau 1</string>
   <string name="pref_camera_saturation_entry_level2">Niveau 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Niveau 8</string>
   <string name="pref_camera_saturation_entry_level9">Niveau 9</string>
   <string name="pref_camera_saturation_entry_level10">Niveau 10</string>
-  <string name="pref_camera_sharpness_title">Skarphed</string>
-  <string name="pref_camera_contrast_title">Kontrast</string>
-  <string name="pref_camera_saturation_title">Mætning</string>
   <string name="pref_camera_picture_format_title">Billedformat</string>
   <string name="pref_camera_jpegquality_title">Billedkvalitet</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">Til</string>
-  <string name="pref_camera_histogram_entry_disable">Fra</string>
   <string name="pref_camera_scenedetect_title">Automatisk scenegenkendelse</string>
-  <string name="pref_camera_scenedetect_entry_on">Til</string>
-  <string name="pref_camera_scenedetect_entry_off">Fra</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index cd12f3b2a..acfa28329 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
   <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
   <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Bewegungsunschärfe-Reduktion</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">VERSCHÖNERN</string>
   <string name="camera_menu_asd_label">AUTOM. SZENE</string>
   <string name="pref_camera_power_shutter_title">Auslöser</string>
+  <string name="pref_camera_max_brightness_title">Heller Bildschirm</string>
   <string name="pref_superzoom_title">Vergrößern</string>
 </resources>
diff --git a/res/values-de/qcomstrings.xml b/res/values-de/qcomstrings.xml
index 8b9b68681..c5433553c 100644
--- a/res/values-de/qcomstrings.xml
+++ b/res/values-de/qcomstrings.xml
@@ -35,44 +35,49 @@
   <string name="pref_camera_video_duration_entry_10">10 Minuten</string>
   <string name="pref_camera_video_duration_entry_30">30 Minuten</string>
   <string name="pref_camera_skinToneEnhancement_title">Hauttöne verbessern</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">An</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Aus</string>
   <string name="pref_camera_selectablezoneaf_title">Autofokus</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatisch</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spot</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Mittenbetont</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Integral</string>
-  <string name="pref_camera_video_hdr_entry_off">Aus</string>
-  <string name="pref_camera_video_hdr_entry_on">An</string>
+  <string name="scene_enable_message">HDR wird nur im automatischen Szenenmodus unterstützt</string>
   <string name="pref_camera_video_hdr_title">Video (HDR)</string>
   <string name="pref_camera_facedetection_title">Gesichtserkennung</string>
-  <string name="pref_camera_facedetection_entry_off">Aus</string>
-  <string name="pref_camera_facedetection_entry_on">An</string>
   <string name="pref_camera_redeyereduction_title">Rote-Augen</string>
-  <string name="pref_camera_redeyereduction_entry_enable">An</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Aus</string>
+  <string name="error_app_unsupported_hfr_selection">HFR wird nicht unterstützt, wenn Videostabilisierung, Zeitraffer oder Video-HDR aktiviert ist</string>
   <string name="error_app_unsupported_hfr">Bei der gewählten Auflösung wird HFR nicht unterstützt</string>
   <string name="error_app_unsupported_hfr_codec">Im HFR-Modus wird nur die Videokodierung in H264 unterstützt</string>
   <string name="error_app_unsupported">Die gewählte Auflösung wird von diesem Encoder nicht unterstützt</string>
+  <string name="error_app_unsupported_dis">Videostabilisierung wird für die gewählte Auflösung nicht unterstützt</string>
   <string name="pref_camera_ae_bracket_hdr_title">Belichtungsreihe</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">An</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Aus</string>
   <string name="pref_camera_hfr_title">Zeitlupe (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Aus</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Entrauschen</string>
-  <string name="pref_camera_denoise_entry_off">Aus</string>
-  <string name="pref_camera_denoise_entry_on">An</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automatisch</string>
   <string name="pref_camera_iso_entry_isodeblur">Automatisch (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO 50</string>
   <string name="pref_camera_iso_entry_iso100">ISO 100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO 125</string>
   <string name="pref_camera_iso_entry_iso200">ISO 200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO 250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO 320</string>
   <string name="pref_camera_iso_entry_iso400">ISO 400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO 500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO 640</string>
   <string name="pref_camera_iso_entry_iso800">ISO 800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO 1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO 1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO 1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO 1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO 2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO 2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO 3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO 6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO 12800</string>
   <string name="pref_camera_antibanding_title">Anti-Banding</string>
   <string name="pref_camera_antibanding_entry_0">Aus</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +100,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Blaustich</string>
   <string name="pref_camera_coloreffect_entry_greentint">Grünstich</string>
   <string name="pref_camera_touchafaec_title">Berühr-AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Aus</string>
-  <string name="pref_camera_touchafaec_entry_on">An</string>
   <string name="pref_camera_dis_title">Videostabilisierung</string>
-  <string name="pref_camera_dis_entry_off">Aus</string>
-  <string name="pref_camera_dis_entry_on">An</string>
   <string name="pref_camera_facerc_title">Gesichtserkennung</string>
-  <string name="pref_camera_facerc_entry_off">Aus</string>
-  <string name="pref_camera_facerc_entry_on">An</string>
+  <string name="pref_camera_sharpness_title">Schärfe</string>
   <string name="pref_camera_sharpness_entry_level0">Stufe 0</string>
   <string name="pref_camera_sharpness_entry_level1">Stufe 1</string>
   <string name="pref_camera_sharpness_entry_level2">Stufe 2 (Standard)</string>
@@ -110,6 +110,7 @@
   <string name="pref_camera_sharpness_entry_level4">Stufe 4</string>
   <string name="pref_camera_sharpness_entry_level5">Stufe 5</string>
   <string name="pref_camera_sharpness_entry_level6">Stufe 6</string>
+  <string name="pref_camera_contrast_title">Kontrast</string>
   <string name="pref_camera_contrast_entry_level0">Stufe 0</string>
   <string name="pref_camera_contrast_entry_level1">Stufe 1</string>
   <string name="pref_camera_contrast_entry_level2">Stufe 2</string>
@@ -121,6 +122,7 @@
   <string name="pref_camera_contrast_entry_level8">Stufe 8</string>
   <string name="pref_camera_contrast_entry_level9">Stufe 9</string>
   <string name="pref_camera_contrast_entry_level10">Stufe 10</string>
+  <string name="pref_camera_saturation_title">Sättigung</string>
   <string name="pref_camera_saturation_entry_level0">Stufe 0</string>
   <string name="pref_camera_saturation_entry_level1">Stufe 1</string>
   <string name="pref_camera_saturation_entry_level2">Stufe 2</string>
@@ -132,9 +134,6 @@
   <string name="pref_camera_saturation_entry_level8">Stufe 8</string>
   <string name="pref_camera_saturation_entry_level9">Stufe 9</string>
   <string name="pref_camera_saturation_entry_level10">Stufe 10</string>
-  <string name="pref_camera_sharpness_title">Schärfe</string>
-  <string name="pref_camera_contrast_title">Kontrast</string>
-  <string name="pref_camera_saturation_title">Sättigung</string>
   <string name="pref_camera_picture_format_title">Bildformat</string>
   <string name="pref_camera_jpegquality_title">Qualität</string>
   <string name="pref_camera_jpegquality_entry_0">55 %</string>
@@ -144,9 +143,5 @@
   <string name="pref_camera_jpegquality_entry_4">95 %</string>
   <string name="pref_camera_jpegquality_entry_5">100 %</string>
   <string name="pref_camera_histogram_title">Histogramm</string>
-  <string name="pref_camera_histogram_entry_enable">An</string>
-  <string name="pref_camera_histogram_entry_disable">Aus</string>
   <string name="pref_camera_scenedetect_title">Automatische Szenenerkennung</string>
-  <string name="pref_camera_scenedetect_entry_on">An</string>
-  <string name="pref_camera_scenedetect_entry_off">Aus</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index b48617fd0..dd78fecaa 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
   <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
   <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Μείωση motion blur</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ΟΜΟΡΦΙΑ</string>
   <string name="camera_menu_asd_label">ΕΞΥΠΝΗ ΣΚΗΝΗ</string>
   <string name="pref_camera_power_shutter_title">Κλείστρο power</string>
+  <string name="pref_camera_max_brightness_title">Φωτεινή οθόνη</string>
   <string name="pref_superzoom_title">Μεγέθυνση</string>
 </resources>
diff --git a/res/values-el/qcomstrings.xml b/res/values-el/qcomstrings.xml
index 93c13c6d8..7158b9fd4 100644
--- a/res/values-el/qcomstrings.xml
+++ b/res/values-el/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 λεπτά</string>
   <string name="pref_camera_video_duration_entry_30">30 λεπτά</string>
   <string name="pref_camera_skinToneEnhancement_title">Βελτίωση τόνου δέρματος</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Ενεργή</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Ανενεργή</string>
   <string name="pref_camera_selectablezoneaf_title">Ζώνη αυτόματης εστίασης</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Αυτόματη</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Σημειακή μέτρηση</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Βάρος προς το κέντρο</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Μέσος όρος κάδρου</string>
-  <string name="pref_camera_video_hdr_entry_off">Ανενεργό</string>
-  <string name="pref_camera_video_hdr_entry_on">Ενεργό</string>
+  <string name="hdr_enable_message">Το HDR είναι ενεργό, υποστηρίζεται μόνο η αυτόματη λειτουργία σκηνής</string>
+  <string name="scene_enable_message">Το HDR δεν υποστηρίζεται σε λειτουργία σκηνής διαφορετική από την αυτόματη</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Εντοπισμός προσώπου</string>
-  <string name="pref_camera_facedetection_entry_off">Ανενεργός</string>
-  <string name="pref_camera_facedetection_entry_on">Ενεργός</string>
   <string name="pref_camera_redeyereduction_title">Μείωση κόκκινων ματιών</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Ενεργή</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Ανενεργή</string>
+  <string name="error_app_unsupported_hfr_selection">Το HFR δεν υποστηρίζεται όταν είναι ενεργή η σταθεροποίηση βίντεο, η παρέλευση χρόνου ή το video HDR</string>
   <string name="error_app_unsupported_hfr">Δεν υποστηρίζεται βίντεο υψηλού ρυθμού καρέ στην επιλεγμένη ανάλυση</string>
   <string name="error_app_unsupported_hfr_codec">Υποστηρίζεται μόνο η κωδικοποίηση H.264 κατά τη λήψη βίντεο υψηλού ρυθμού καρέ</string>
   <string name="error_app_unsupported">Μη υποστηριζόμενη ανάλυση βίντεο για αυτόν τον τύπο κωδικοποιητή</string>
+  <string name="error_app_unsupported_dis">Η σταθεροποίηση βίντεο δεν υποστηρίζεται στην επιλεγμένη ανάλυση</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing αυτόματης έκθεσης</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Ενεργό</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Ανενεργό</string>
   <string name="pref_camera_hfr_title">Αργή κίνηση (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Ανενεργό</string>
   <string name="pref_camera_hfr_entry_2x">60 fps</string>
   <string name="pref_camera_hfr_entry_3x">90 fps</string>
   <string name="pref_camera_hfr_entry_4x">120 fps</string>
   <string name="pref_camera_denoise_title">Αφαίρεση θορύβου</string>
-  <string name="pref_camera_denoise_entry_off">Ανενεργή</string>
-  <string name="pref_camera_denoise_entry_on">Ενεργή</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Αυτόματο</string>
   <string name="pref_camera_iso_entry_isodeblur">Αυτόματο (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">50 ISO</string>
   <string name="pref_camera_iso_entry_iso100">100 ISO</string>
+  <string name="pref_camera_iso_entry_iso125">125 ISO</string>
   <string name="pref_camera_iso_entry_iso200">200 ISO</string>
+  <string name="pref_camera_iso_entry_iso250">250 ISO</string>
+  <string name="pref_camera_iso_entry_iso320">320 ISO</string>
   <string name="pref_camera_iso_entry_iso400">400 ISO</string>
+  <string name="pref_camera_iso_entry_iso500">500 ISO</string>
+  <string name="pref_camera_iso_entry_iso640">640 ISO</string>
   <string name="pref_camera_iso_entry_iso800">800 ISO</string>
+  <string name="pref_camera_iso_entry_iso1000">1000 ISO</string>
+  <string name="pref_camera_iso_entry_iso1200">1200 ISO</string>
+  <string name="pref_camera_iso_entry_iso1250">1250 ISO</string>
   <string name="pref_camera_iso_entry_iso1600">1600 ISO</string>
+  <string name="pref_camera_iso_entry_iso2000">2000 ISO</string>
+  <string name="pref_camera_iso_entry_iso2500">2500 ISO</string>
+  <string name="pref_camera_iso_entry_iso3200">3200 ISO</string>
+  <string name="pref_camera_iso_entry_iso6400">6400 ISO</string>
+  <string name="pref_camera_iso_entry_iso12800">12800 ISO</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">Ανενεργό</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Μπλε απόχρωση</string>
   <string name="pref_camera_coloreffect_entry_greentint">Πράσινη απόχρωση</string>
   <string name="pref_camera_touchafaec_title">Αυτόματη έκθεση/εστίαση με άγγιγμα</string>
-  <string name="pref_camera_touchafaec_entry_off">Ανενεργό</string>
-  <string name="pref_camera_touchafaec_entry_on">Ενεργό</string>
   <string name="pref_camera_dis_title">Σταθεροποίηση βίντεο</string>
-  <string name="pref_camera_dis_entry_off">Ανενεργή</string>
-  <string name="pref_camera_dis_entry_on">Ενεργή</string>
   <string name="pref_camera_facerc_title">Εντοπισμός προσώπου</string>
-  <string name="pref_camera_facerc_entry_off">Ανενεργός</string>
-  <string name="pref_camera_facerc_entry_on">Ενεργός</string>
+  <string name="pref_camera_sharpness_title">Οξύτητα</string>
   <string name="pref_camera_sharpness_entry_level0">Επίπεδο 0</string>
   <string name="pref_camera_sharpness_entry_level1">Επίπεδο 1</string>
   <string name="pref_camera_sharpness_entry_level2">Επίπεδο 2 (Προεπιλογή)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Επίπεδο 4</string>
   <string name="pref_camera_sharpness_entry_level5">Επίπεδο 5</string>
   <string name="pref_camera_sharpness_entry_level6">Επίπεδο 6</string>
+  <string name="pref_camera_contrast_title">Αντίθεση</string>
   <string name="pref_camera_contrast_entry_level0">Επίπεδο 0</string>
   <string name="pref_camera_contrast_entry_level1">Επίπεδο 1</string>
   <string name="pref_camera_contrast_entry_level2">Επίπεδο 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Επίπεδο 8</string>
   <string name="pref_camera_contrast_entry_level9">Επίπεδο 9</string>
   <string name="pref_camera_contrast_entry_level10">Επίπεδο 10</string>
+  <string name="pref_camera_saturation_title">Κορεσμός</string>
   <string name="pref_camera_saturation_entry_level0">Επίπεδο 0</string>
   <string name="pref_camera_saturation_entry_level1">Επίπεδο 1</string>
   <string name="pref_camera_saturation_entry_level2">Επίπεδο 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Επίπεδο 8</string>
   <string name="pref_camera_saturation_entry_level9">Επίπεδο 9</string>
   <string name="pref_camera_saturation_entry_level10">Επίπεδο 10</string>
-  <string name="pref_camera_sharpness_title">Οξύτητα</string>
-  <string name="pref_camera_contrast_title">Αντίθεση</string>
-  <string name="pref_camera_saturation_title">Κορεσμός</string>
   <string name="pref_camera_picture_format_title">Τύπος εικόνας</string>
   <string name="pref_camera_jpegquality_title">Ποιότητα εικόνας</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Ιστόγραμμα</string>
-  <string name="pref_camera_histogram_entry_enable">Ενεργό</string>
-  <string name="pref_camera_histogram_entry_disable">Ανενεργό</string>
   <string name="pref_camera_scenedetect_title">Αυτόματος εντοπισμός σκηνής</string>
-  <string name="pref_camera_scenedetect_entry_on">Ενεργός</string>
-  <string name="pref_camera_scenedetect_entry_off">Ανενεργός</string>
 </resources>
diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml
index 456cc288c..3aa501749 100644
--- a/res/values-es-rXA/cm_strings.xml
+++ b/res/values-es-rXA/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7M pixels</string>
   <string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8M pixels</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7M pixels</string>
   <string name="pref_camera_picturesize_entry_12mp">12M pixels</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9M pixels</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M pixels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixels</string>
   <string name="pref_camera_picturesize_entry_10mp">10M pixels</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7M pixels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9M pixels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M pixels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M pixels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pixels</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M pixels</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M pixels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M pixels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M pixels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M pixels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reductor de desenfoque</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELLECER</string>
   <string name="camera_menu_asd_label">ESCENA INTELIXENTE</string>
   <string name="pref_camera_power_shutter_title">Disparador c/botón d\'encendíu</string>
+  <string name="pref_camera_max_brightness_title">Pantalla brillante</string>
   <string name="pref_superzoom_title">Ampliar</string>
 </resources>
diff --git a/res/values-es-rXA/qcomstrings.xml b/res/values-es-rXA/qcomstrings.xml
index 3c189e1fb..bb2e84ccb 100644
--- a/res/values-es-rXA/qcomstrings.xml
+++ b/res/values-es-rXA/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minutos</string>
   <string name="pref_camera_video_duration_entry_30">30 minutos</string>
   <string name="pref_camera_skinToneEnhancement_title">Meyora del tonu la piel</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Activada</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desactivada</string>
   <string name="pref_camera_selectablezoneaf_title">Zona d\'enfoque automáticu</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Midición puntual</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderáu al centru</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Media de marcos</string>
-  <string name="pref_camera_video_hdr_entry_off">Desactiváu</string>
-  <string name="pref_camera_video_hdr_entry_on">Activáu</string>
+  <string name="hdr_enable_message">El HDR ta activáu. Namái ta sofitáu\'l mou d\'escena automáticu</string>
+  <string name="scene_enable_message">HDR namái ta sofitáu nel mou d\'escena automáticu</string>
   <string name="pref_camera_video_hdr_title">Videu HDR</string>
   <string name="pref_camera_facedetection_title">Detección de cares</string>
-  <string name="pref_camera_facedetection_entry_off">Desactiváu</string>
-  <string name="pref_camera_facedetection_entry_on">Activáu</string>
   <string name="pref_camera_redeyereduction_title">Amenorgamientu de güeyos bermeyos</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Activada</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desactivada</string>
+  <string name="error_app_unsupported_hfr_selection">HFR nun ta sofitáu cuando tán activaos la estabilización de videu, lapsu de tiempu o videu HDR</string>
   <string name="error_app_unsupported_hfr">El videu d\'alta velocidá nun ta sofitáu pa la resolución esbillada</string>
   <string name="error_app_unsupported_hfr_codec">Cuando\'l HFR ta activáu, namái ta sofitada la codificación de videu H.264</string>
   <string name="error_app_unsupported">Resolución de videu non sofitada nesti tipu de codificador</string>
+  <string name="error_app_unsupported_dis">La estabilización de videu nun ta sofitada pa la resolución esbillada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Esposición HDR automática</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Activada</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Desactivada</string>
   <string name="pref_camera_hfr_title">Cámara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desactiváu</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Amenorgarmientu de ruiu</string>
-  <string name="pref_camera_denoise_entry_off">Desactiváu</string>
-  <string name="pref_camera_denoise_entry_on">Activáu</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Anti-bandéu</string>
   <string name="pref_camera_antibanding_entry_0">Desactiváu</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tinta azul</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tinta verde</string>
   <string name="pref_camera_touchafaec_title">AF/AEC táctil</string>
-  <string name="pref_camera_touchafaec_entry_off">Desactiváu</string>
-  <string name="pref_camera_touchafaec_entry_on">Activáu</string>
   <string name="pref_camera_dis_title">Estabilización de videu</string>
-  <string name="pref_camera_dis_entry_off">Desactiváu</string>
-  <string name="pref_camera_dis_entry_on">Activáu</string>
   <string name="pref_camera_facerc_title">Reconocimientu de cares</string>
-  <string name="pref_camera_facerc_entry_off">Desactiváu</string>
-  <string name="pref_camera_facerc_entry_on">Activáu</string>
+  <string name="pref_camera_sharpness_title">Nitidez</string>
   <string name="pref_camera_sharpness_entry_level0">Nivel 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivel 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivel 2 (por defeutu)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nivel 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nivel 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nivel 6</string>
+  <string name="pref_camera_contrast_title">Contraste</string>
   <string name="pref_camera_contrast_entry_level0">Nivel 0</string>
   <string name="pref_camera_contrast_entry_level1">Nivel 1</string>
   <string name="pref_camera_contrast_entry_level2">Nivel 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Nivel 8</string>
   <string name="pref_camera_contrast_entry_level9">Nivel 9</string>
   <string name="pref_camera_contrast_entry_level10">Nivel 10</string>
+  <string name="pref_camera_saturation_title">Saturación</string>
   <string name="pref_camera_saturation_entry_level0">Nivel 0</string>
   <string name="pref_camera_saturation_entry_level1">Nivel 1</string>
   <string name="pref_camera_saturation_entry_level2">Nivel 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Nivel 8</string>
   <string name="pref_camera_saturation_entry_level9">Nivel 9</string>
   <string name="pref_camera_saturation_entry_level10">Nivel 10</string>
-  <string name="pref_camera_sharpness_title">Nitidez</string>
-  <string name="pref_camera_contrast_title">Contraste</string>
-  <string name="pref_camera_saturation_title">Saturación</string>
   <string name="pref_camera_picture_format_title">Formatu d\'imaxe</string>
   <string name="pref_camera_jpegquality_title">Calidá d\'imaxe</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Activáu</string>
-  <string name="pref_camera_histogram_entry_disable">Desactiváu</string>
   <string name="pref_camera_scenedetect_title">Auto Detección d\'Escenes</string>
-  <string name="pref_camera_scenedetect_entry_on">Activada</string>
-  <string name="pref_camera_scenedetect_entry_off">Desactivada</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 07b11939c..5ace31b44 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
   <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
   <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reductor de desenfoque</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELLECER</string>
   <string name="camera_menu_asd_label">ESCENA INTELIGENTE</string>
   <string name="pref_camera_power_shutter_title">Disparador alternativo</string>
+  <string name="pref_camera_max_brightness_title">Pantalla de brillo máximo</string>
   <string name="pref_superzoom_title">Zoom</string>
 </resources>
diff --git a/res/values-es/qcomstrings.xml b/res/values-es/qcomstrings.xml
index 916e4bc53..4d1393323 100644
--- a/res/values-es/qcomstrings.xml
+++ b/res/values-es/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minutos</string>
   <string name="pref_camera_video_duration_entry_30">30 minutos</string>
   <string name="pref_camera_skinToneEnhancement_title">Mejora tono de piel</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Activada</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desactivada</string>
   <string name="pref_camera_selectablezoneaf_title">Modo de enfoque automático</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automático</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Puntual</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderado al centro</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Matricial</string>
-  <string name="pref_camera_video_hdr_entry_off">Desactivado</string>
-  <string name="pref_camera_video_hdr_entry_on">Activado</string>
+  <string name="hdr_enable_message">El HDR está activado. Solo está soportado el modo de escena automático</string>
+  <string name="scene_enable_message">HDR solo está soportado en el modo de escena automático</string>
   <string name="pref_camera_video_hdr_title">Vídeo de alto rango dinámico</string>
   <string name="pref_camera_facedetection_title">Detección rostro</string>
-  <string name="pref_camera_facedetection_entry_off">Desactivado</string>
-  <string name="pref_camera_facedetection_entry_on">Activado</string>
   <string name="pref_camera_redeyereduction_title">Reducción ojos rojos</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Activada</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desactivada</string>
+  <string name="error_app_unsupported_hfr_selection">HFR no está soportado cuando están activados la estabilización de vídeo, lapso de tiempo o vídeo HDR</string>
   <string name="error_app_unsupported_hfr">El vídeo de alta velocidad no está soportado para la resolución seleccionada</string>
   <string name="error_app_unsupported_hfr_codec">Solamente está soportado el códec H264 con el modo de vídeo de alta velocidad activado</string>
   <string name="error_app_unsupported">Resolución de vídeo no soportada para este tipo de códec</string>
+  <string name="error_app_unsupported_dis">La estabilización de vídeo no está soportada para la resolución seleccionada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Exposición HDR automática</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Activada</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Desactivada</string>
   <string name="pref_camera_hfr_title">Cámara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desactivado</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Reducción de ruido</string>
-  <string name="pref_camera_denoise_entry_off">Desactivado</string>
-  <string name="pref_camera_denoise_entry_on">Activado</string>
   <string name="pref_camera_iso_title">Sensibilidad ISO</string>
   <string name="pref_camera_iso_entry_auto">ISO automático</string>
   <string name="pref_camera_iso_entry_isodeblur">ISO reductor temblor</string>
+  <string name="pref_camera_iso_entry_iso50">ISO 50</string>
   <string name="pref_camera_iso_entry_iso100">ISO 100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO 125</string>
   <string name="pref_camera_iso_entry_iso200">ISO 200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO 250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO 320</string>
   <string name="pref_camera_iso_entry_iso400">ISO 400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO 500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO 640</string>
   <string name="pref_camera_iso_entry_iso800">ISO 800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO 1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO 1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO 1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO 1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO 2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO 2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO 3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO 6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO 12800</string>
   <string name="pref_camera_antibanding_title">Reductor de parpadeo</string>
   <string name="pref_camera_antibanding_entry_0">Desactivado</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tintado en azul</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tintado en verde</string>
   <string name="pref_camera_touchafaec_title">Toque AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Desactivado</string>
-  <string name="pref_camera_touchafaec_entry_on">Activado</string>
   <string name="pref_camera_dis_title">Estabilización de vídeo</string>
-  <string name="pref_camera_dis_entry_off">Desactivado</string>
-  <string name="pref_camera_dis_entry_on">Activado</string>
   <string name="pref_camera_facerc_title">Reconocimiento de caras</string>
-  <string name="pref_camera_facerc_entry_off">Desactivado</string>
-  <string name="pref_camera_facerc_entry_on">Activado</string>
+  <string name="pref_camera_sharpness_title">Nitidez</string>
   <string name="pref_camera_sharpness_entry_level0">Nivel 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivel 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivel 2 (por defecto)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nivel 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nivel 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nivel 6</string>
+  <string name="pref_camera_contrast_title">Contraste</string>
   <string name="pref_camera_contrast_entry_level0">Nivel 0</string>
   <string name="pref_camera_contrast_entry_level1">Nivel 1</string>
   <string name="pref_camera_contrast_entry_level2">Nivel 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Nivel 8</string>
   <string name="pref_camera_contrast_entry_level9">Nivel 9</string>
   <string name="pref_camera_contrast_entry_level10">Nivel 10</string>
+  <string name="pref_camera_saturation_title">Saturación</string>
   <string name="pref_camera_saturation_entry_level0">Nivel 0</string>
   <string name="pref_camera_saturation_entry_level1">Nivel 1</string>
   <string name="pref_camera_saturation_entry_level2">Nivel 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Nivel 8</string>
   <string name="pref_camera_saturation_entry_level9">Nivel 9</string>
   <string name="pref_camera_saturation_entry_level10">Nivel 10</string>
-  <string name="pref_camera_sharpness_title">Nitidez</string>
-  <string name="pref_camera_contrast_title">Contraste</string>
-  <string name="pref_camera_saturation_title">Saturación</string>
   <string name="pref_camera_picture_format_title">Formato de imagen</string>
   <string name="pref_camera_jpegquality_title">Calidad de imagen</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Activado</string>
-  <string name="pref_camera_histogram_entry_disable">Desactivado</string>
   <string name="pref_camera_scenedetect_title">Escena inteligente</string>
-  <string name="pref_camera_scenedetect_entry_on">Activada</string>
-  <string name="pref_camera_scenedetect_entry_off">Desactivada</string>
 </resources>
diff --git a/res/values-et/cm_strings.xml b/res/values-et/cm_strings.xml
index 1f8aff641..d2dc1c593 100644
--- a/res/values-et/cm_strings.xml
+++ b/res/values-et/cm_strings.xml
@@ -24,22 +24,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M pikslit</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M pikslit</string>
   <string name="pref_camera_picturesize_entry_10mp">10M pikslit</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7M pikslit</string>
   <string name="pref_camera_picturesize_entry_9mp">9M pikslit</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M pikslit</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M pikslit</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M pikslit</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pikslit</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M pikslit</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pikslit</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M pikslit</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M pikslit</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M pikslit</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M pikslit</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Liikuva hägu vähendamine</string>
diff --git a/res/values-et/qcomstrings.xml b/res/values-et/qcomstrings.xml
index 5572d3871..19ed3a09f 100644
--- a/res/values-et/qcomstrings.xml
+++ b/res/values-et/qcomstrings.xml
@@ -35,35 +35,23 @@
   <string name="pref_camera_video_duration_entry_10">10 minutit</string>
   <string name="pref_camera_video_duration_entry_30">30 minutit</string>
   <string name="pref_camera_skinToneEnhancement_title">Nahatooni parandus</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Sees</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Väljas</string>
   <string name="pref_camera_selectablezoneaf_title">Autofookus tsoon</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Punktmõõtmine</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Keskele kaalutud</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Keskraam</string>
-  <string name="pref_camera_video_hdr_entry_off">Väljas</string>
-  <string name="pref_camera_video_hdr_entry_on">Sees</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Näotuvastus</string>
-  <string name="pref_camera_facedetection_entry_off">Väljas</string>
-  <string name="pref_camera_facedetection_entry_on">Sees</string>
   <string name="pref_camera_redeyereduction_title">Punasilmsuse vähendus</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Sees</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Väljas</string>
   <string name="error_app_unsupported_hfr">HFR ei ole toetatud sellel resolutsioonil</string>
   <string name="error_app_unsupported_hfr_codec">Ainult H.264 video enkooder on toetatud kui HFR on sees</string>
   <string name="error_app_unsupported">Toetuseta video resolutsioon selle koodeki tüübi jaoks</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automaatse Särituse Nihestamine</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Sees</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Väljas</string>
   <string name="pref_camera_hfr_title">Aegluup (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Väljas</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
-  <string name="pref_camera_denoise_entry_off">Väljas</string>
-  <string name="pref_camera_denoise_entry_on">Sees</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
@@ -94,14 +82,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Sinine toon</string>
   <string name="pref_camera_coloreffect_entry_greentint">Roheline toon</string>
   <string name="pref_camera_touchafaec_title">Puudutusega AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Väljas</string>
-  <string name="pref_camera_touchafaec_entry_on">Sees</string>
   <string name="pref_camera_dis_title">Video stabiliseerimine</string>
-  <string name="pref_camera_dis_entry_off">Väljas</string>
-  <string name="pref_camera_dis_entry_on">Sees</string>
   <string name="pref_camera_facerc_title">Näotuvastus</string>
-  <string name="pref_camera_facerc_entry_off">Väljas</string>
-  <string name="pref_camera_facerc_entry_on">Sees</string>
+  <string name="pref_camera_sharpness_title">Teravus</string>
   <string name="pref_camera_sharpness_entry_level0">Tase 0</string>
   <string name="pref_camera_sharpness_entry_level1">Tase 1</string>
   <string name="pref_camera_sharpness_entry_level2">Tase 2 (Vaikimisi)</string>
@@ -109,6 +92,7 @@
   <string name="pref_camera_sharpness_entry_level4">Tase 4</string>
   <string name="pref_camera_sharpness_entry_level5">Tase 5</string>
   <string name="pref_camera_sharpness_entry_level6">Tase 6</string>
+  <string name="pref_camera_contrast_title">Kontrast</string>
   <string name="pref_camera_contrast_entry_level0">Tase 0</string>
   <string name="pref_camera_contrast_entry_level1">Tase 1</string>
   <string name="pref_camera_contrast_entry_level2">Tase 2</string>
@@ -120,6 +104,7 @@
   <string name="pref_camera_contrast_entry_level8">Tase 8</string>
   <string name="pref_camera_contrast_entry_level9">Tase 9</string>
   <string name="pref_camera_contrast_entry_level10">Tase 10</string>
+  <string name="pref_camera_saturation_title">Küllastus</string>
   <string name="pref_camera_saturation_entry_level0">Tase 0</string>
   <string name="pref_camera_saturation_entry_level1">Tase 1</string>
   <string name="pref_camera_saturation_entry_level2">Tase 2</string>
@@ -131,9 +116,6 @@
   <string name="pref_camera_saturation_entry_level8">Tase 8</string>
   <string name="pref_camera_saturation_entry_level9">Tase 9</string>
   <string name="pref_camera_saturation_entry_level10">Tase 10</string>
-  <string name="pref_camera_sharpness_title">Teravus</string>
-  <string name="pref_camera_contrast_title">Kontrast</string>
-  <string name="pref_camera_saturation_title">Küllastus</string>
   <string name="pref_camera_picture_format_title">Pildi formaat</string>
   <string name="pref_camera_jpegquality_title">Pildikvaliteet</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -143,9 +125,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogramm</string>
-  <string name="pref_camera_histogram_entry_enable">Sees</string>
-  <string name="pref_camera_histogram_entry_disable">Väljas</string>
   <string name="pref_camera_scenedetect_title">Automaatne Stseeni Tuvastus</string>
-  <string name="pref_camera_scenedetect_entry_on">Sees</string>
-  <string name="pref_camera_scenedetect_entry_off">Väljas</string>
 </resources>
diff --git a/res/values-eu/cm_strings.xml b/res/values-eu/cm_strings.xml
index 61691d90e..864b64815 100644
--- a/res/values-eu/cm_strings.xml
+++ b/res/values-eu/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10,4M pixel</string>
   <string name="pref_camera_picturesize_entry_10mp">10M pixel</string>
   <string name="pref_camera_picturesize_entry_9mp">9M pixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2M pixel</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7M pixel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4M pixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pixel</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5M pixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7M pixel</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5M pixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1M pixel</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9M pixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Desenfoke murriztailea</string>
diff --git a/res/values-eu/qcomstrings.xml b/res/values-eu/qcomstrings.xml
index be9755e35..560c5f6c8 100644
--- a/res/values-eu/qcomstrings.xml
+++ b/res/values-eu/qcomstrings.xml
@@ -35,36 +35,24 @@
   <string name="pref_camera_video_duration_entry_10">10 minutu</string>
   <string name="pref_camera_video_duration_entry_30">30 minutu</string>
   <string name="pref_camera_skinToneEnhancement_title">Azal tonuaren hobekuntza</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Gaituta</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Ezgaituta</string>
   <string name="pref_camera_selectablezoneaf_title">Enfoke automatiko modua</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatikoa</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Puntuala</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Erdialdean haztatua</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Matriziala</string>
-  <string name="pref_camera_video_hdr_entry_off">Ezgaituta</string>
-  <string name="pref_camera_video_hdr_entry_on">Gaituta</string>
   <string name="pref_camera_video_hdr_title">Hein dinamiko altuko bideoa</string>
   <string name="pref_camera_facedetection_title">Aurpegien antzematea</string>
-  <string name="pref_camera_facedetection_entry_off">Ezgaituta</string>
-  <string name="pref_camera_facedetection_entry_on">Gaituta</string>
   <string name="pref_camera_redeyereduction_title">Begi gorrien murrizketa</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Gaituta</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Ezgaituta</string>
   <string name="error_app_unsupported_hfr">Abiadura handiko bideoa ez dago baliagarri aukeraturiko erresoluzioan</string>
   <string name="error_app_unsupported_hfr_codec">Abiadura handiko bideo moduan H264 kodek-a bakarrik dago onartuta</string>
   <string name="error_app_unsupported">Kodek honentzako baliagarria ez den bideo erresoluzioa</string>
   <string name="pref_camera_ae_bracket_hdr_title">HDR esposizio automatikoa</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Gaituta</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Ezgaituta</string>
   <string name="pref_camera_hfr_title">Kamera geldoa (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Ezgaituta</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Zarata murrizketa</string>
-  <string name="pref_camera_denoise_entry_off">Ezgaituta</string>
-  <string name="pref_camera_denoise_entry_on">Gaituta</string>
   <string name="pref_camera_iso_title">ISO sentikortasuna</string>
   <string name="pref_camera_iso_entry_auto">ISO automatikoa</string>
   <string name="pref_camera_iso_entry_isodeblur">ISO dardara murriztailea</string>
@@ -95,14 +83,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tintatu urdina</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tintatu berdea</string>
   <string name="pref_camera_touchafaec_title">AF/AEC sakatzea</string>
-  <string name="pref_camera_touchafaec_entry_off">Ezgaituta</string>
-  <string name="pref_camera_touchafaec_entry_on">Gaituta</string>
   <string name="pref_camera_dis_title">Bideo egonkortzea</string>
-  <string name="pref_camera_dis_entry_off">Ezgaituta</string>
-  <string name="pref_camera_dis_entry_on">Gaituta</string>
   <string name="pref_camera_facerc_title">Aurpegi antzematea</string>
-  <string name="pref_camera_facerc_entry_off">Ezgaituta</string>
-  <string name="pref_camera_facerc_entry_on">Gaituta</string>
+  <string name="pref_camera_sharpness_title">Fokatzea</string>
   <string name="pref_camera_sharpness_entry_level0">0. maila</string>
   <string name="pref_camera_sharpness_entry_level1">1. maila</string>
   <string name="pref_camera_sharpness_entry_level2">2. maila (lehenetsia)</string>
@@ -110,6 +93,7 @@
   <string name="pref_camera_sharpness_entry_level4">4. maila</string>
   <string name="pref_camera_sharpness_entry_level5">5. maila</string>
   <string name="pref_camera_sharpness_entry_level6">6. maila</string>
+  <string name="pref_camera_contrast_title">Kontrastea</string>
   <string name="pref_camera_contrast_entry_level0">0. maila</string>
   <string name="pref_camera_contrast_entry_level1">1. maila</string>
   <string name="pref_camera_contrast_entry_level2">2. maila</string>
@@ -121,6 +105,7 @@
   <string name="pref_camera_contrast_entry_level8">8. maila</string>
   <string name="pref_camera_contrast_entry_level9">9. maila</string>
   <string name="pref_camera_contrast_entry_level10">10. maila</string>
+  <string name="pref_camera_saturation_title">Saturazioa</string>
   <string name="pref_camera_saturation_entry_level0">0. maila</string>
   <string name="pref_camera_saturation_entry_level1">1. maila</string>
   <string name="pref_camera_saturation_entry_level2">2. maila</string>
@@ -132,9 +117,6 @@
   <string name="pref_camera_saturation_entry_level8">8. maila</string>
   <string name="pref_camera_saturation_entry_level9">9. maila</string>
   <string name="pref_camera_saturation_entry_level10">10. maila</string>
-  <string name="pref_camera_sharpness_title">Fokatzea</string>
-  <string name="pref_camera_contrast_title">Kontrastea</string>
-  <string name="pref_camera_saturation_title">Saturazioa</string>
   <string name="pref_camera_picture_format_title">Irudiaren formatua</string>
   <string name="pref_camera_jpegquality_title">Irudiaren kalitatea</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +126,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Gaituta</string>
-  <string name="pref_camera_histogram_entry_disable">Ezgaituta</string>
   <string name="pref_camera_scenedetect_title">Eszena adimentsua</string>
-  <string name="pref_camera_scenedetect_entry_on">Gaituta</string>
-  <string name="pref_camera_scenedetect_entry_off">Ezgaituta</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 28a07446b..8cc2683dc 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -21,25 +21,20 @@
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_12mp">18 megapikseliä</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Liikkeen sumennuksen vähentäminen</string>
@@ -131,5 +126,6 @@
   <string name="camera_menu_beauty_mode_label">KAUNISTUS</string>
   <string name="camera_menu_asd_label">ÄLYKÄS KOHTAUS</string>
   <string name="pref_camera_power_shutter_title">Kuvaus virtanäppäimellä</string>
+  <string name="pref_camera_max_brightness_title">Kirkas näyttö</string>
   <string name="pref_superzoom_title">Suurenna</string>
 </resources>
diff --git a/res/values-fi/qcomstrings.xml b/res/values-fi/qcomstrings.xml
index 461a0e6b3..575f7ccda 100644
--- a/res/values-fi/qcomstrings.xml
+++ b/res/values-fi/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minuuttia</string>
   <string name="pref_camera_video_duration_entry_30">30 minuuttia</string>
   <string name="pref_camera_skinToneEnhancement_title">Ihonvärin muutos</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Päällä</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Pois päältä</string>
   <string name="pref_camera_selectablezoneaf_title">Automaattitarkennusalue</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automaattinen</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Pisteeseen kohdistettu</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Keskelle painotettu</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Kehysten keskiarvo</string>
-  <string name="pref_camera_video_hdr_entry_off">Pois käytöstä</string>
-  <string name="pref_camera_video_hdr_entry_on">Päällä</string>
+  <string name="hdr_enable_message">HDR on käytössä, vain automaattinen tila on käytettävissä</string>
+  <string name="scene_enable_message">HDR:ää ei tueta kuin automaattisessa tilassa</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Kasvojentunnistus</string>
-  <string name="pref_camera_facedetection_entry_off">Pois käytöstä</string>
-  <string name="pref_camera_facedetection_entry_on">Päällä</string>
   <string name="pref_camera_redeyereduction_title">Punasilmäisyyden vähentäminen</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Päällä</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Pois päältä</string>
+  <string name="error_app_unsupported_hfr_selection">HFR ei tuettu kun videon vakauttaminen, viivästys tai video HDR on käytössä</string>
   <string name="error_app_unsupported_hfr">HFR:ää ei tueta valitulla resoluutiolla</string>
   <string name="error_app_unsupported_hfr_codec">Vain H.264 videokoodaus on tuettu kun HFR on käytössä</string>
   <string name="error_app_unsupported">Videon resoluutiota ei tueta tällä koodaustyypillä</string>
+  <string name="error_app_unsupported_dis">Videon vakauttamista ei tueta valitulla resoluutiolla</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automaattisen valotuksen kiinnitys</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Päällä</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Pois käytöstä</string>
   <string name="pref_camera_hfr_title">Hidastus (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Pois käytöstä</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Denoise-tila</string>
-  <string name="pref_camera_denoise_entry_off">Pois käytöstä</string>
-  <string name="pref_camera_denoise_entry_on">Päällä</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automaattinen</string>
   <string name="pref_camera_iso_entry_isodeblur">Automaattinen (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">Pois käytöstä</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Sininen sävy</string>
   <string name="pref_camera_coloreffect_entry_greentint">Vihreä sävy</string>
   <string name="pref_camera_touchafaec_title">Kosketa AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Pois käytöstä</string>
-  <string name="pref_camera_touchafaec_entry_on">Päällä</string>
   <string name="pref_camera_dis_title">Videon vakauttaminen</string>
-  <string name="pref_camera_dis_entry_off">Pois käytöstä</string>
-  <string name="pref_camera_dis_entry_on">Päällä</string>
   <string name="pref_camera_facerc_title">Kasvojen tunnistus</string>
-  <string name="pref_camera_facerc_entry_off">Pois päältä</string>
-  <string name="pref_camera_facerc_entry_on">Päällä</string>
+  <string name="pref_camera_sharpness_title">Terävyys</string>
   <string name="pref_camera_sharpness_entry_level0">Taso 0</string>
   <string name="pref_camera_sharpness_entry_level1">Taso 1</string>
   <string name="pref_camera_sharpness_entry_level2">Taso 2 (oletus)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Taso 4</string>
   <string name="pref_camera_sharpness_entry_level5">Taso 5</string>
   <string name="pref_camera_sharpness_entry_level6">Taso 6</string>
+  <string name="pref_camera_contrast_title">Kontrasti</string>
   <string name="pref_camera_contrast_entry_level0">Taso 0</string>
   <string name="pref_camera_contrast_entry_level1">Taso 1</string>
   <string name="pref_camera_contrast_entry_level2">Taso 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Taso 8</string>
   <string name="pref_camera_contrast_entry_level9">Taso 9</string>
   <string name="pref_camera_contrast_entry_level10">Taso 10</string>
+  <string name="pref_camera_saturation_title">Kylläisyys</string>
   <string name="pref_camera_saturation_entry_level0">Taso 0</string>
   <string name="pref_camera_saturation_entry_level1">Taso 1</string>
   <string name="pref_camera_saturation_entry_level2">Taso 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Taso 8</string>
   <string name="pref_camera_saturation_entry_level9">Taso 9</string>
   <string name="pref_camera_saturation_entry_level10">Taso 10</string>
-  <string name="pref_camera_sharpness_title">Terävyys</string>
-  <string name="pref_camera_contrast_title">Kontrasti</string>
-  <string name="pref_camera_saturation_title">Kylläisyys</string>
   <string name="pref_camera_picture_format_title">Kuvan muoto</string>
   <string name="pref_camera_jpegquality_title">Kuvan laatu</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogrammi</string>
-  <string name="pref_camera_histogram_entry_enable">Päällä</string>
-  <string name="pref_camera_histogram_entry_disable">Pois päältä</string>
   <string name="pref_camera_scenedetect_title">Automaattinen kohtauksen tunnistus</string>
-  <string name="pref_camera_scenedetect_entry_on">Päällä</string>
-  <string name="pref_camera_scenedetect_entry_off">Pois käytöstä</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 3a069ff82..a160fd41c 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 mégapixels</string>
   <string name="pref_camera_picturesize_entry_18mp">18 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 mégapixels</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 mégapixels</string>
   <string name="pref_camera_picturesize_entry_12mp">12 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 mégapixels</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 mégapixels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 mégapixels</string>
   <string name="pref_camera_picturesize_entry_10mp">10 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 mégapixels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 mégapixels</string>
   <string name="pref_camera_picturesize_entry_4mp">4 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 mégapixels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Réduction de flou de mouvement</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELLIR</string>
   <string name="camera_menu_asd_label">SCÈNE INTELLIGENTE</string>
   <string name="pref_camera_power_shutter_title">Bouton marche</string>
+  <string name="pref_camera_max_brightness_title">Écran lumineux</string>
   <string name="pref_superzoom_title">Magnifier</string>
 </resources>
diff --git a/res/values-fr/qcomstrings.xml b/res/values-fr/qcomstrings.xml
index f121c7901..a486661b4 100644
--- a/res/values-fr/qcomstrings.xml
+++ b/res/values-fr/qcomstrings.xml
@@ -35,44 +35,46 @@
   <string name="pref_camera_video_duration_entry_10">10 minutes</string>
   <string name="pref_camera_video_duration_entry_30">30 minutes</string>
   <string name="pref_camera_skinToneEnhancement_title">Amélioration de la teinte de peau</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Activer</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Désactiver</string>
   <string name="pref_camera_selectablezoneaf_title">Zone de mise au point automatique</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Mesure de spot</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Pondérée centrale</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Trame moyenne</string>
-  <string name="pref_camera_video_hdr_entry_off">Désactivé</string>
-  <string name="pref_camera_video_hdr_entry_on">Activé</string>
   <string name="pref_camera_video_hdr_title">Vidéo HDR</string>
   <string name="pref_camera_facedetection_title">Détection de visage</string>
-  <string name="pref_camera_facedetection_entry_off">Désactivé</string>
-  <string name="pref_camera_facedetection_entry_on">On</string>
   <string name="pref_camera_redeyereduction_title">Réduction des yeux rouges</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Activer</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Désactiver</string>
   <string name="error_app_unsupported_hfr">HFR n\'est pas supporté pour la résolution choisie</string>
   <string name="error_app_unsupported_hfr_codec">Seul l\'encodage vidéo H.264 est pris en charge lorsque HFR est activé</string>
   <string name="error_app_unsupported">Résolution vidéo non pris en charge pour ce type de codec</string>
   <string name="pref_camera_ae_bracket_hdr_title">Exposition automatique</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Activé</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Désactivé</string>
   <string name="pref_camera_hfr_title">Vidéo au ralenti (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Désactivé</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Antibruit</string>
-  <string name="pref_camera_denoise_entry_off">Désactivé</string>
-  <string name="pref_camera_denoise_entry_on">Activé</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Anti-scintillement</string>
   <string name="pref_camera_antibanding_entry_0">Désactivé</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +97,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Teinte bleu</string>
   <string name="pref_camera_coloreffect_entry_greentint">Teinte verte</string>
   <string name="pref_camera_touchafaec_title">Touche AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Désactivé</string>
-  <string name="pref_camera_touchafaec_entry_on">Activé</string>
   <string name="pref_camera_dis_title">Stabilisation vidéo</string>
-  <string name="pref_camera_dis_entry_off">Désactivé</string>
-  <string name="pref_camera_dis_entry_on">Activé</string>
   <string name="pref_camera_facerc_title">Reconnaissance des visages</string>
-  <string name="pref_camera_facerc_entry_off">Désactivé</string>
-  <string name="pref_camera_facerc_entry_on">Activé</string>
+  <string name="pref_camera_sharpness_title">Netteté</string>
   <string name="pref_camera_sharpness_entry_level0">Niveau 0</string>
   <string name="pref_camera_sharpness_entry_level1">Niveau 1</string>
   <string name="pref_camera_sharpness_entry_level2">Niveau 2 (par défaut)</string>
@@ -110,6 +107,7 @@
   <string name="pref_camera_sharpness_entry_level4">Niveau 4</string>
   <string name="pref_camera_sharpness_entry_level5">Niveau 5</string>
   <string name="pref_camera_sharpness_entry_level6">Niveau 6</string>
+  <string name="pref_camera_contrast_title">Contraste</string>
   <string name="pref_camera_contrast_entry_level0">Niveau 0</string>
   <string name="pref_camera_contrast_entry_level1">Niveau 1</string>
   <string name="pref_camera_contrast_entry_level2">Niveau 2</string>
@@ -121,6 +119,7 @@
   <string name="pref_camera_contrast_entry_level8">Niveau 8</string>
   <string name="pref_camera_contrast_entry_level9">Niveau 9</string>
   <string name="pref_camera_contrast_entry_level10">Niveau 10</string>
+  <string name="pref_camera_saturation_title">Saturation</string>
   <string name="pref_camera_saturation_entry_level0">Niveau 0</string>
   <string name="pref_camera_saturation_entry_level1">Niveau 1</string>
   <string name="pref_camera_saturation_entry_level2">Niveau 2</string>
@@ -132,9 +131,6 @@
   <string name="pref_camera_saturation_entry_level8">Niveau 8</string>
   <string name="pref_camera_saturation_entry_level9">Niveau 9</string>
   <string name="pref_camera_saturation_entry_level10">Niveau 10</string>
-  <string name="pref_camera_sharpness_title">Netteté</string>
-  <string name="pref_camera_contrast_title">Contraste</string>
-  <string name="pref_camera_saturation_title">Saturation</string>
   <string name="pref_camera_picture_format_title">Format d\'image</string>
   <string name="pref_camera_jpegquality_title">Qualité d\'image</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +140,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogramme</string>
-  <string name="pref_camera_histogram_entry_enable">Activer</string>
-  <string name="pref_camera_histogram_entry_disable">Désactiver</string>
   <string name="pref_camera_scenedetect_title">Détection de scène automatique</string>
-  <string name="pref_camera_scenedetect_entry_on">Activé</string>
-  <string name="pref_camera_scenedetect_entry_off">Désactivé</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 787ef7dba..68f408fc8 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapixel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixel</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_12mp">12 megapixel</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 megapixel</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixel</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapixel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 megapixel</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Elmosódás csökkentés</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EFFEKTEK</string>
   <string name="camera_menu_asd_label">OKOS KÉP</string>
   <string name="pref_camera_power_shutter_title">Bekapcsoló gombbal exponálás</string>
+  <string name="pref_camera_max_brightness_title">Világos képernyő</string>
   <string name="pref_superzoom_title">Nagyítás</string>
 </resources>
diff --git a/res/values-hu/qcomstrings.xml b/res/values-hu/qcomstrings.xml
index adb010d31..26321c937 100644
--- a/res/values-hu/qcomstrings.xml
+++ b/res/values-hu/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 perc</string>
   <string name="pref_camera_video_duration_entry_30">30 perc</string>
   <string name="pref_camera_skinToneEnhancement_title">Bőrszín fokozás</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Be</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Ki</string>
   <string name="pref_camera_selectablezoneaf_title">Választható fókusz módok</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatikus</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spot mérés</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Középre súlyozott</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Átlagoló</string>
-  <string name="pref_camera_video_hdr_entry_off">Ki</string>
-  <string name="pref_camera_video_hdr_entry_on">Be</string>
+  <string name="hdr_enable_message">HDR engedélyezve, csak az automatikus jelenet mód támogatott</string>
+  <string name="scene_enable_message">A HDR csak automatikus módban támogatott</string>
   <string name="pref_camera_video_hdr_title">Videó HDR</string>
   <string name="pref_camera_facedetection_title">Arckeresés</string>
-  <string name="pref_camera_facedetection_entry_off">Ki</string>
-  <string name="pref_camera_facedetection_entry_on">Be</string>
   <string name="pref_camera_redeyereduction_title">Vörösszem csökkentés</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Be</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Ki</string>
+  <string name="error_app_unsupported_hfr_selection">A HFR nem támogatott videó stabilizációnál, time lapse videónál vagy bekapcsolt HDR-nél</string>
   <string name="error_app_unsupported_hfr">A HFR nem támogatott a kiválasztott felbontásnál</string>
   <string name="error_app_unsupported_hfr_codec">Bekapcsolt HFR esetén csak a H264 videó kódolás támogatott</string>
   <string name="error_app_unsupported">Nem támogatott videófelbontás ehhez a tömörítőhöz</string>
+  <string name="error_app_unsupported_dis">A videó stabilizáció nem támogatott ennél a felbontásnál</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatikus expozíció sorozat</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Be</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Ki</string>
   <string name="pref_camera_hfr_title">Lassú mozgás (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Ki</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Zajcsökkentés</string>
-  <string name="pref_camera_denoise_entry_off">Ki</string>
-  <string name="pref_camera_denoise_entry_on">Be</string>
   <string name="pref_camera_iso_title">Válasszon ISO értéket</string>
   <string name="pref_camera_iso_entry_auto">Automatikus</string>
   <string name="pref_camera_iso_entry_isodeblur">ISO Automatikus (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Csikozódáscsökkentés</string>
   <string name="pref_camera_antibanding_entry_0">Ki</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Kék árnyalat</string>
   <string name="pref_camera_coloreffect_entry_greentint">Zöld árnyalat</string>
   <string name="pref_camera_touchafaec_title">Érintő AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Ki</string>
-  <string name="pref_camera_touchafaec_entry_on">Be</string>
   <string name="pref_camera_dis_title">Videó stabilizáció</string>
-  <string name="pref_camera_dis_entry_off">Ki</string>
-  <string name="pref_camera_dis_entry_on">Be</string>
   <string name="pref_camera_facerc_title">Arcfelismerés</string>
-  <string name="pref_camera_facerc_entry_off">Ki</string>
-  <string name="pref_camera_facerc_entry_on">Be</string>
+  <string name="pref_camera_sharpness_title">Élesség</string>
   <string name="pref_camera_sharpness_entry_level0">Szint 0</string>
   <string name="pref_camera_sharpness_entry_level1">Szint 1</string>
   <string name="pref_camera_sharpness_entry_level2">Szint 2 (Alapértelmezés)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Szint 4</string>
   <string name="pref_camera_sharpness_entry_level5">Szint 5</string>
   <string name="pref_camera_sharpness_entry_level6">Szint 6</string>
+  <string name="pref_camera_contrast_title">Kontraszt</string>
   <string name="pref_camera_contrast_entry_level0">Szint 0</string>
   <string name="pref_camera_contrast_entry_level1">Szint 1</string>
   <string name="pref_camera_contrast_entry_level2">Szint 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Szint 8</string>
   <string name="pref_camera_contrast_entry_level9">Szint 9</string>
   <string name="pref_camera_contrast_entry_level10">Szint 10</string>
+  <string name="pref_camera_saturation_title">Telítettség</string>
   <string name="pref_camera_saturation_entry_level0">Szint 0</string>
   <string name="pref_camera_saturation_entry_level1">Szint 1</string>
   <string name="pref_camera_saturation_entry_level2">Szint 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Szint 8</string>
   <string name="pref_camera_saturation_entry_level9">Szint 9</string>
   <string name="pref_camera_saturation_entry_level10">Szint 10</string>
-  <string name="pref_camera_sharpness_title">Élesség</string>
-  <string name="pref_camera_contrast_title">Kontraszt</string>
-  <string name="pref_camera_saturation_title">Telítettség</string>
   <string name="pref_camera_picture_format_title">Válasszon kép formátumot</string>
   <string name="pref_camera_jpegquality_title">Képminőség</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Hisztogram</string>
-  <string name="pref_camera_histogram_entry_enable">Be</string>
-  <string name="pref_camera_histogram_entry_disable">Ki</string>
   <string name="pref_camera_scenedetect_title">Automatikus fotóüzemmód</string>
-  <string name="pref_camera_scenedetect_entry_on">Be</string>
-  <string name="pref_camera_scenedetect_entry_off">Ki</string>
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 062272038..f085fb227 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -16,29 +16,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 M piksel</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 M piksel</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 M piksel</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 M piksel</string>
+  <string name="pref_camera_picturesize_entry_20_7mp">20,7M piksel</string>
+  <string name="pref_camera_picturesize_entry_18mp">18M piksel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_12_8mp">12,8M piksel</string>
+  <string name="pref_camera_picturesize_entry_12_7mp">12,7M piksel</string>
   <string name="pref_camera_picturesize_entry_12mp">12M piksel</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 M piksel</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 M piksel</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 M piksel</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 M piksel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 M piksel</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 M piksel</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 M piksel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 M piksel</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 M piksel</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9M piksel</string>
+  <string name="pref_camera_picturesize_entry_11_5mp">11,5M piksel</string>
+  <string name="pref_camera_picturesize_entry_10_4mp">10,4M piksel</string>
+  <string name="pref_camera_picturesize_entry_10mp">10M piksel</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_9mp">9M piksel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7,7M piksel</string>
+  <string name="pref_camera_picturesize_entry_6_4mp">6,4M piksel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_4_5mp">4,5M piksel</string>
   <string name="pref_camera_picturesize_entry_4mp">4M piksel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 M piksel</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 M piksel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 M piksel</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 M piksel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_2_5mp">2,5M piksel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_1_9mp">1,9M piksel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reduksi gerakan kabur</string>
@@ -83,12 +86,14 @@
   <string name="pref_camera_scenemode_entry_text">Teks</string>
   <string name="pref_camera_scenemode_entry_theatre">Teater</string>
   <string name="pref_camera_scenemode_entry_whiteboard">Papan tulis putih</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">Terus-menerus</string>
   <string name="pref_camera_focusmode_entry_extended">Diperluas</string>
   <string name="pref_camera_focusmode_entry_facedetect">Deteksi wajah</string>
   <string name="pref_camera_focusmode_entry_facepriority">Prioritas wajah</string>
   <string name="pref_camera_focusmode_entry_fixed">Tetap</string>
   <string name="pref_camera_focusmode_entry_portrait">Potret</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
+  <string name="pref_camera_focusmode_entry_manual">Manual</string>
   <string name="pref_camera_coloreffect_entry_washed">Washed</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage warm</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage cold</string>
@@ -128,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">PERCANTIK</string>
   <string name="camera_menu_asd_label">ADEGAN PINTAR</string>
   <string name="pref_camera_power_shutter_title">Bidik tombol power</string>
+  <string name="pref_camera_max_brightness_title">Layar cerah</string>
   <string name="pref_superzoom_title">Memperbesar</string>
 </resources>
diff --git a/res/values-in/qcomstrings.xml b/res/values-in/qcomstrings.xml
index 1693f7ae5..466cc8ac8 100644
--- a/res/values-in/qcomstrings.xml
+++ b/res/values-in/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 menit</string>
   <string name="pref_camera_video_duration_entry_30">30 menit</string>
   <string name="pref_camera_skinToneEnhancement_title">Peningkatan warna kulit</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Aktif</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Nonaktif</string>
   <string name="pref_camera_selectablezoneaf_title">Zona fokus-otomatis</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Otomatis</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Pengukuran titik</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Pusat tertimbang</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame rata-rata</string>
-  <string name="pref_camera_video_hdr_entry_off">Nonaktif</string>
-  <string name="pref_camera_video_hdr_entry_on">Aktif</string>
+  <string name="hdr_enable_message">HDR diaktifkan, hanya mode adegan Auto yang didukung</string>
+  <string name="scene_enable_message">HDR tidak didukung pada mode adegan selain Auto</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Deteksi wajah</string>
-  <string name="pref_camera_facedetection_entry_off">Nonaktif</string>
-  <string name="pref_camera_facedetection_entry_on">Aktif</string>
   <string name="pref_camera_redeyereduction_title">Reduksi mata merah</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Aktif</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Nonaktif</string>
+  <string name="error_app_unsupported_hfr_selection">HFR tidak didukung ketika stabilisasi video, video selang waktu atau video HDR aktif</string>
   <string name="error_app_unsupported_hfr">HFR tidak didukung untuk resolusi yang dipilih</string>
   <string name="error_app_unsupported_hfr_codec">Hanya enkoding video H.264 yang didukung ketika HFR</string>
   <string name="error_app_unsupported">Resolusi video tidak didukung untuk jenis codec ini</string>
+  <string name="error_app_unsupported_dis">Stabilisasi video tidak didukung untuk resolusi yang dipilih</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Aktif</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Nonaktif</string>
   <string name="pref_camera_hfr_title">Gerakan lambat (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Nonaktif</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Denoise</string>
-  <string name="pref_camera_denoise_entry_off">Nonaktif</string>
-  <string name="pref_camera_denoise_entry_on">Aktif</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Otomatis</string>
   <string name="pref_camera_iso_entry_isodeblur">Otomatis (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">IS02000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">IS03200</string>
+  <string name="pref_camera_iso_entry_iso6400">IS06400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">Nonaktif</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Warna biru</string>
   <string name="pref_camera_coloreffect_entry_greentint">Warna hijau</string>
   <string name="pref_camera_touchafaec_title">AF/AEC sentuh</string>
-  <string name="pref_camera_touchafaec_entry_off">Nonaktif</string>
-  <string name="pref_camera_touchafaec_entry_on">Aktif</string>
   <string name="pref_camera_dis_title">Stabilisasi video</string>
-  <string name="pref_camera_dis_entry_off">Nonaktif</string>
-  <string name="pref_camera_dis_entry_on">Aktif</string>
   <string name="pref_camera_facerc_title">Pengenalan wajah</string>
-  <string name="pref_camera_facerc_entry_off">Nonaktif</string>
-  <string name="pref_camera_facerc_entry_on">Aktif</string>
+  <string name="pref_camera_sharpness_title">Ketajaman</string>
   <string name="pref_camera_sharpness_entry_level0">Tingkat 0</string>
   <string name="pref_camera_sharpness_entry_level1">Tingkat 1</string>
   <string name="pref_camera_sharpness_entry_level2">Tingkat 2 (Baku)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Tingkat 4</string>
   <string name="pref_camera_sharpness_entry_level5">Tingkat 5</string>
   <string name="pref_camera_sharpness_entry_level6">Tingkat 6</string>
+  <string name="pref_camera_contrast_title">Kontras</string>
   <string name="pref_camera_contrast_entry_level0">Tingkat 0</string>
   <string name="pref_camera_contrast_entry_level1">Tingkat 1</string>
   <string name="pref_camera_contrast_entry_level2">Tingkat 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Tingkat 8</string>
   <string name="pref_camera_contrast_entry_level9">Tingkat 9</string>
   <string name="pref_camera_contrast_entry_level10">Tingkat 10</string>
+  <string name="pref_camera_saturation_title">Saturasi</string>
   <string name="pref_camera_saturation_entry_level0">Tingkat 0</string>
   <string name="pref_camera_saturation_entry_level1">Tingkat 1</string>
   <string name="pref_camera_saturation_entry_level2">Tingkat 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Tingkat 8</string>
   <string name="pref_camera_saturation_entry_level9">Tingkat 9</string>
   <string name="pref_camera_saturation_entry_level10">Tingkat 10</string>
-  <string name="pref_camera_sharpness_title">Ketajaman</string>
-  <string name="pref_camera_contrast_title">Kontras</string>
-  <string name="pref_camera_saturation_title">Saturasi</string>
   <string name="pref_camera_picture_format_title">Format gambar</string>
   <string name="pref_camera_jpegquality_title">Kualitas gambar</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">Aktif</string>
-  <string name="pref_camera_histogram_entry_disable">Nonaktif</string>
   <string name="pref_camera_scenedetect_title">Deteksi Adegan Otomatis</string>
-  <string name="pref_camera_scenedetect_entry_on">Aktif</string>
-  <string name="pref_camera_scenedetect_entry_off">Nonaktif</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index d470de0e7..949c0f191 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mpixel</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpixel</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpixel</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 Mpixel</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpixel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpixel</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 Mpixels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpixel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Riduzione sfocatura da movimento</string>
@@ -84,12 +86,14 @@
   <string name="pref_camera_scenemode_entry_text">Testo</string>
   <string name="pref_camera_scenemode_entry_theatre">Teatro</string>
   <string name="pref_camera_scenemode_entry_whiteboard">Lavagna bianca</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">Continuo</string>
   <string name="pref_camera_focusmode_entry_extended">Esteso</string>
   <string name="pref_camera_focusmode_entry_facedetect">Rilevamento viso</string>
   <string name="pref_camera_focusmode_entry_facepriority">Priorità viso</string>
   <string name="pref_camera_focusmode_entry_fixed">Fisso</string>
   <string name="pref_camera_focusmode_entry_portrait">Ritratto</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Iperfocale</string>
+  <string name="pref_camera_focusmode_entry_manual">Manuale</string>
   <string name="pref_camera_coloreffect_entry_washed">Lavato</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage, caldo</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage, freddo</string>
@@ -129,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ABBELLISCI</string>
   <string name="camera_menu_asd_label">SCENA AUTOMATICA</string>
   <string name="pref_camera_power_shutter_title">Scatta tasto On/Off</string>
+  <string name="pref_camera_max_brightness_title">Schermo luminoso</string>
   <string name="pref_superzoom_title">Ingrandimento</string>
 </resources>
diff --git a/res/values-it/qcomstrings.xml b/res/values-it/qcomstrings.xml
index 191bd96d6..f3f2bbff9 100644
--- a/res/values-it/qcomstrings.xml
+++ b/res/values-it/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minuti</string>
   <string name="pref_camera_video_duration_entry_30">30 minuti</string>
   <string name="pref_camera_skinToneEnhancement_title">Esaltazione toni della pelle</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">On</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Off</string>
   <string name="pref_camera_selectablezoneaf_title">Regione autofocus</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatico</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Punto singolo</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Pesata al centro</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Media immagine</string>
-  <string name="pref_camera_video_hdr_entry_off">OFF</string>
-  <string name="pref_camera_video_hdr_entry_on">ON</string>
+  <string name="hdr_enable_message">HDR é attivo, solo la modalità scena automatica é supportata</string>
+  <string name="scene_enable_message">HDR non è supportato in nessuna modalità scena ad esclusione di quella automatica</string>
   <string name="pref_camera_video_hdr_title">HDR video</string>
   <string name="pref_camera_facedetection_title">Rilevamento volti</string>
-  <string name="pref_camera_facedetection_entry_off">OFF</string>
-  <string name="pref_camera_facedetection_entry_on">ON</string>
   <string name="pref_camera_redeyereduction_title">Riduzione occhi rossi</string>
-  <string name="pref_camera_redeyereduction_entry_enable">On</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Off</string>
+  <string name="error_app_unsupported_hfr_selection">HFR non è supportato quando sono attivi stabilizzazione del video, time lapse o HDR</string>
   <string name="error_app_unsupported_hfr">HFR non è supportato per la risoluzione selezionata</string>
   <string name="error_app_unsupported_hfr_codec">Quando HFR è attivo è consentita solo la codifica H.264 per il video</string>
   <string name="error_app_unsupported">Risoluzione non supportata per questo codec video</string>
+  <string name="error_app_unsupported_dis">La stabilizzazione video non è supportata con la risoluzione selezionata</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">ON</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">OFF</string>
   <string name="pref_camera_hfr_title">Rallentatore (HFR)</string>
   <string name="pref_camera_hfr_entry_off">OFF</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Riduci rumore</string>
-  <string name="pref_camera_denoise_entry_off">OFF</string>
-  <string name="pref_camera_denoise_entry_on">ON</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automatico</string>
   <string name="pref_camera_iso_entry_isodeblur">Automatico (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO 3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">OFF</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tinta blu</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tinta verde</string>
   <string name="pref_camera_touchafaec_title">Tocca per autofocus/autoesposizione</string>
-  <string name="pref_camera_touchafaec_entry_off">OFF</string>
-  <string name="pref_camera_touchafaec_entry_on">ON</string>
   <string name="pref_camera_dis_title">Stabilizzazione video</string>
-  <string name="pref_camera_dis_entry_off">OFF</string>
-  <string name="pref_camera_dis_entry_on">ON</string>
   <string name="pref_camera_facerc_title">Riconoscimento volti</string>
-  <string name="pref_camera_facerc_entry_off">OFF</string>
-  <string name="pref_camera_facerc_entry_on">ON</string>
+  <string name="pref_camera_sharpness_title">Definizione</string>
   <string name="pref_camera_sharpness_entry_level0">Livello 0</string>
   <string name="pref_camera_sharpness_entry_level1">Livello 1</string>
   <string name="pref_camera_sharpness_entry_level2">Livello 2 (predefinito)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Livello 4</string>
   <string name="pref_camera_sharpness_entry_level5">Livello 5</string>
   <string name="pref_camera_sharpness_entry_level6">Livello 6</string>
+  <string name="pref_camera_contrast_title">Contrasto</string>
   <string name="pref_camera_contrast_entry_level0">Livello 0</string>
   <string name="pref_camera_contrast_entry_level1">Livello 1</string>
   <string name="pref_camera_contrast_entry_level2">Livello 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Livello 8</string>
   <string name="pref_camera_contrast_entry_level9">Livello 9</string>
   <string name="pref_camera_contrast_entry_level10">Livello 10</string>
+  <string name="pref_camera_saturation_title">Saturazione</string>
   <string name="pref_camera_saturation_entry_level0">Livello 0</string>
   <string name="pref_camera_saturation_entry_level1">Livello 1</string>
   <string name="pref_camera_saturation_entry_level2">Livello 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Livello 8</string>
   <string name="pref_camera_saturation_entry_level9">Livello 9</string>
   <string name="pref_camera_saturation_entry_level10">Livello 10</string>
-  <string name="pref_camera_sharpness_title">Definizione</string>
-  <string name="pref_camera_contrast_title">Contrasto</string>
-  <string name="pref_camera_saturation_title">Saturazione</string>
   <string name="pref_camera_picture_format_title">Formato immagine</string>
   <string name="pref_camera_jpegquality_title">Qualità dell\'immagine</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Istogramma</string>
-  <string name="pref_camera_histogram_entry_enable">On</string>
-  <string name="pref_camera_histogram_entry_disable">Off</string>
   <string name="pref_camera_scenedetect_title">Modalità automatica</string>
-  <string name="pref_camera_scenedetect_entry_on">ON</string>
-  <string name="pref_camera_scenedetect_entry_off">OFF</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index b14d4baf7..e34bdbdff 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -20,24 +20,20 @@
   <string name="pref_camera_picturesize_entry_18mp">18 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 מגה פיקסל</string>
+  <string name="pref_camera_picturesize_entry_12mp">12 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_10mp">10 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_9mp">9 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_4mp">4 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">הפחתת טשטוש תנועה</string>
@@ -82,12 +78,14 @@
   <string name="pref_camera_scenemode_entry_text">טקסט</string>
   <string name="pref_camera_scenemode_entry_theatre">תיאטרון</string>
   <string name="pref_camera_scenemode_entry_whiteboard">לוח ציור</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">רציף</string>
   <string name="pref_camera_focusmode_entry_extended">מורחב</string>
   <string name="pref_camera_focusmode_entry_facedetect">זיהוי פנים</string>
   <string name="pref_camera_focusmode_entry_facepriority">עדיפות לפנים</string>
   <string name="pref_camera_focusmode_entry_fixed">קבוע</string>
   <string name="pref_camera_focusmode_entry_portrait">דיוקן</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">מיקוד יתר</string>
+  <string name="pref_camera_focusmode_entry_manual">ידני</string>
   <string name="pref_camera_coloreffect_entry_washed">שטוף</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">וינטאיג\' חם</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">וינטאיג\' קר</string>
@@ -119,6 +117,9 @@
   <string name="pref_camera_slow_shutter_entry_2s">2 שניות</string>
   <string name="pref_camera_slow_shutter_entry_4s">4 שניות</string>
   <string name="pref_camera_slow_shutter_entry_8s">8 שניות</string>
+  <string name="pref_camera_slow_shutter_entry_16s">16 שניות</string>
+  <string name="pref_camera_slow_shutter_entry_32s">32 שניות</string>
+  <string name="pref_camera_slow_shutter_entry_64s">64 שניות</string>
   <string name="pref_camera_storage_title">זיכרון</string>
   <string name="camera_menu_enhance_label">שפר</string>
   <string name="camera_menu_beauty_mode_label">יפייף</string>
diff --git a/res/values-iw/qcomstrings.xml b/res/values-iw/qcomstrings.xml
index 66c96e4d2..412d93e57 100644
--- a/res/values-iw/qcomstrings.xml
+++ b/res/values-iw/qcomstrings.xml
@@ -35,36 +35,24 @@
   <string name="pref_camera_video_duration_entry_10">10 דקות</string>
   <string name="pref_camera_video_duration_entry_30">30 דקות</string>
   <string name="pref_camera_skinToneEnhancement_title">שיפור גוון</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">פועל</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">כבוי</string>
   <string name="pref_camera_selectablezoneaf_title">אשור פוקוס אוטומטי</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">אוטומטי</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">אזור מדידה</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">ממורכז</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">ממוצע מסגרת</string>
-  <string name="pref_camera_video_hdr_entry_off">כבוי</string>
-  <string name="pref_camera_video_hdr_entry_on">פועל</string>
   <string name="pref_camera_video_hdr_title">HDR וידאו</string>
   <string name="pref_camera_facedetection_title">זיהוי פנים</string>
-  <string name="pref_camera_facedetection_entry_off">כבוי</string>
-  <string name="pref_camera_facedetection_entry_on">פועל</string>
   <string name="pref_camera_redeyereduction_title">הפחתת עיניים אדומות</string>
-  <string name="pref_camera_redeyereduction_entry_enable">פועל</string>
-  <string name="pref_camera_redeyereduction_entry_disable">כבוי</string>
   <string name="error_app_unsupported_hfr">HFR לא נתמך ברזולוציה שנבחרה</string>
   <string name="error_app_unsupported_hfr_codec">רק קידוד וידאו H.264 נתמך כש-HFR מופעל</string>
   <string name="error_app_unsupported">רזולוצייה לא נתמכת עבור קידוד וידאו זה</string>
   <string name="pref_camera_ae_bracket_hdr_title">תיחום חשיפה אוטומטי</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">פועל</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">כבוי</string>
   <string name="pref_camera_hfr_title">הילוך איטי (HFR)</string>
   <string name="pref_camera_hfr_entry_off">כבוי</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">הסר רעש</string>
-  <string name="pref_camera_denoise_entry_off">כבוי</string>
-  <string name="pref_camera_denoise_entry_on">פועל</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">אוטומטי</string>
   <string name="pref_camera_iso_entry_isodeblur">אוטומטי (HJR)</string>
@@ -95,14 +83,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">גוון כחול</string>
   <string name="pref_camera_coloreffect_entry_greentint">גוון ירוק</string>
   <string name="pref_camera_touchafaec_title">מגע AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">כבוי</string>
-  <string name="pref_camera_touchafaec_entry_on">דלוק</string>
   <string name="pref_camera_dis_title">ייצוב וידאו</string>
-  <string name="pref_camera_dis_entry_off">כבוי</string>
-  <string name="pref_camera_dis_entry_on">פועל</string>
   <string name="pref_camera_facerc_title">זיהוי פנים</string>
-  <string name="pref_camera_facerc_entry_off">כבוי</string>
-  <string name="pref_camera_facerc_entry_on">פועל</string>
+  <string name="pref_camera_sharpness_title">חדות</string>
   <string name="pref_camera_sharpness_entry_level0">רמה 0</string>
   <string name="pref_camera_sharpness_entry_level1">רמה 1</string>
   <string name="pref_camera_sharpness_entry_level2">רמה 2 (ברירת מחדל)</string>
@@ -110,6 +93,7 @@
   <string name="pref_camera_sharpness_entry_level4">רמה 4</string>
   <string name="pref_camera_sharpness_entry_level5">רמה 5</string>
   <string name="pref_camera_sharpness_entry_level6">רמה 6</string>
+  <string name="pref_camera_contrast_title">ניגודיות</string>
   <string name="pref_camera_contrast_entry_level0">רמה 0</string>
   <string name="pref_camera_contrast_entry_level1">רמה 1</string>
   <string name="pref_camera_contrast_entry_level2">רמה 2</string>
@@ -121,6 +105,7 @@
   <string name="pref_camera_contrast_entry_level8">רמה 8</string>
   <string name="pref_camera_contrast_entry_level9">רמה 9</string>
   <string name="pref_camera_contrast_entry_level10">רמה 10</string>
+  <string name="pref_camera_saturation_title">רוויה</string>
   <string name="pref_camera_saturation_entry_level0">רמה 0</string>
   <string name="pref_camera_saturation_entry_level1">רמה 1</string>
   <string name="pref_camera_saturation_entry_level2">רמה 2</string>
@@ -132,9 +117,6 @@
   <string name="pref_camera_saturation_entry_level8">רמה 8</string>
   <string name="pref_camera_saturation_entry_level9">רמה 9</string>
   <string name="pref_camera_saturation_entry_level10">רמה 10</string>
-  <string name="pref_camera_sharpness_title">חדות</string>
-  <string name="pref_camera_contrast_title">ניגודיות</string>
-  <string name="pref_camera_saturation_title">רוויה</string>
   <string name="pref_camera_picture_format_title">פורמט התמונה</string>
   <string name="pref_camera_jpegquality_title">איכות התמונה</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +126,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">היסטוגרמה</string>
-  <string name="pref_camera_histogram_entry_enable">פועל</string>
-  <string name="pref_camera_histogram_entry_disable">כבוי</string>
   <string name="pref_camera_scenedetect_title">זיהוי סצינה אוטומטי</string>
-  <string name="pref_camera_scenedetect_entry_on">פועל</string>
-  <string name="pref_camera_scenedetect_entry_off">כבוי</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 4873fe398..63c9ed21b 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7メガピクセル</string>
   <string name="pref_camera_picturesize_entry_18mp">18メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8メガピクセル</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7メガピクセル</string>
   <string name="pref_camera_picturesize_entry_12mp">12メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9メガピクセル</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5メガピクセル</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4メガピクセル</string>
   <string name="pref_camera_picturesize_entry_10mp">10メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_9mp">9メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7メガピクセル</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_6mp">6メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5メガピクセル</string>
   <string name="pref_camera_picturesize_entry_4mp">4メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9メガピクセル</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD（16:9）</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">被写体ブレ軽減</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ビューティー化</string>
   <string name="camera_menu_asd_label">スマートシーン</string>
   <string name="pref_camera_power_shutter_title">電源シャッター</string>
+  <string name="pref_camera_max_brightness_title">明るい画面</string>
   <string name="pref_superzoom_title">拡大</string>
 </resources>
diff --git a/res/values-ja/qcomstrings.xml b/res/values-ja/qcomstrings.xml
index 531b66a29..3b451c97e 100644
--- a/res/values-ja/qcomstrings.xml
+++ b/res/values-ja/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10分</string>
   <string name="pref_camera_video_duration_entry_30">30 分</string>
   <string name="pref_camera_skinToneEnhancement_title">肌の色合いの強調</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">ON</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">OFF</string>
   <string name="pref_camera_selectablezoneaf_title">オートフォーカスゾーン</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">オート</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">スポット測光</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">中央部重点測光</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">フレームアベレージ</string>
-  <string name="pref_camera_video_hdr_entry_off">OFF</string>
-  <string name="pref_camera_video_hdr_entry_on">ON</string>
-  <string name="pref_camera_video_hdr_title">ビデオHDR</string>
+  <string name="hdr_enable_message">HDRが有効です、オートシーンモードのみサポートされています</string>
+  <string name="scene_enable_message">オート以外のシーンモードではHDRはサポートされていません</string>
+  <string name="pref_camera_video_hdr_title">HDR動画</string>
   <string name="pref_camera_facedetection_title">顔検出</string>
-  <string name="pref_camera_facedetection_entry_off">OFF</string>
-  <string name="pref_camera_facedetection_entry_on">ON</string>
-  <string name="pref_camera_redeyereduction_title">赤目の軽減</string>
-  <string name="pref_camera_redeyereduction_entry_enable">ON</string>
-  <string name="pref_camera_redeyereduction_entry_disable">OFF</string>
+  <string name="pref_camera_redeyereduction_title">赤目軽減</string>
+  <string name="error_app_unsupported_hfr_selection">動画安定化、低速度撮影またはHDR動画がONになっているときはHFRはサポートされていません。</string>
   <string name="error_app_unsupported_hfr">選択された解像度ではHFRはサポートされていません</string>
   <string name="error_app_unsupported_hfr_codec">HFRがONのときはH.264ビデオエンコードのみサポートされています</string>
   <string name="error_app_unsupported">このコーデックの種類ではサポートされていない動画の解像度です</string>
-  <string name="pref_camera_ae_bracket_hdr_title">自動露出ブラケット</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">ON</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">OFF</string>
+  <string name="error_app_unsupported_dis">選択した解像度では動画安定化はサポートされていません</string>
+  <string name="pref_camera_ae_bracket_hdr_title">自動段階露出</string>
   <string name="pref_camera_hfr_title">スローモーション（HFR）</string>
   <string name="pref_camera_hfr_entry_off">OFF</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">ノイズ除去</string>
-  <string name="pref_camera_denoise_entry_off">OFF</string>
-  <string name="pref_camera_denoise_entry_on">ON</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">オート</string>
   <string name="pref_camera_iso_entry_isodeblur">オート（HJR）</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">アンチバンディング</string>
   <string name="pref_camera_antibanding_entry_0">OFF</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">淡い青色</string>
   <string name="pref_camera_coloreffect_entry_greentint">淡い緑色</string>
   <string name="pref_camera_touchafaec_title">タッチAF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">OFF</string>
-  <string name="pref_camera_touchafaec_entry_on">ON</string>
   <string name="pref_camera_dis_title">動画安定化</string>
-  <string name="pref_camera_dis_entry_off">OFF</string>
-  <string name="pref_camera_dis_entry_on">ON</string>
   <string name="pref_camera_facerc_title">顔認識</string>
-  <string name="pref_camera_facerc_entry_off">OFF</string>
-  <string name="pref_camera_facerc_entry_on">ON</string>
+  <string name="pref_camera_sharpness_title">シャープネス</string>
   <string name="pref_camera_sharpness_entry_level0">レベル0</string>
   <string name="pref_camera_sharpness_entry_level1">レベル1</string>
   <string name="pref_camera_sharpness_entry_level2">レベル2（デフォルト）</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">レベル4</string>
   <string name="pref_camera_sharpness_entry_level5">レベル5</string>
   <string name="pref_camera_sharpness_entry_level6">レベル6</string>
+  <string name="pref_camera_contrast_title">コントラスト</string>
   <string name="pref_camera_contrast_entry_level0">レベル0</string>
   <string name="pref_camera_contrast_entry_level1">レベル1</string>
   <string name="pref_camera_contrast_entry_level2">レベル2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">レベル8</string>
   <string name="pref_camera_contrast_entry_level9">レベル9</string>
   <string name="pref_camera_contrast_entry_level10">レベル10</string>
+  <string name="pref_camera_saturation_title">彩度</string>
   <string name="pref_camera_saturation_entry_level0">レベル0</string>
   <string name="pref_camera_saturation_entry_level1">レベル1</string>
   <string name="pref_camera_saturation_entry_level2">レベル2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">レベル8</string>
   <string name="pref_camera_saturation_entry_level9">レベル9</string>
   <string name="pref_camera_saturation_entry_level10">レベル10</string>
-  <string name="pref_camera_sharpness_title">シャープネス</string>
-  <string name="pref_camera_contrast_title">コントラスト</string>
-  <string name="pref_camera_saturation_title">彩度</string>
   <string name="pref_camera_picture_format_title">写真の形式</string>
   <string name="pref_camera_jpegquality_title">写真の画質</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">ヒストグラム</string>
-  <string name="pref_camera_histogram_entry_enable">ON</string>
-  <string name="pref_camera_histogram_entry_disable">OFF</string>
   <string name="pref_camera_scenedetect_title">自動シーン検出</string>
-  <string name="pref_camera_scenedetect_entry_on">ON</string>
-  <string name="pref_camera_scenedetect_entry_off">OFF</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index a26554205..441b2878f 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">2070만 화소</string>
   <string name="pref_camera_picturesize_entry_18mp">1800만 화소</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">1590만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">1280만 화소</string>
   <string name="pref_camera_picturesize_entry_12_7mp">1270만 화소</string>
   <string name="pref_camera_picturesize_entry_12mp">1200만 화소</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">1190만 화소</string>
   <string name="pref_camera_picturesize_entry_11_5mp">1150만 화소</string>
   <string name="pref_camera_picturesize_entry_10_4mp">1040만 화소</string>
   <string name="pref_camera_picturesize_entry_10mp">1000만 화소</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">970만 화소</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">970만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">900만 화소</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">820만 화소</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">820만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770만 화소</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640만 화소</string>
-  <string name="pref_camera_picturesize_entry_6mp">600만 화소</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">600만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450만 화소</string>
   <string name="pref_camera_picturesize_entry_4mp">400만 화소</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">370만 화소</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">370만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250만 화소</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">210만 화소</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">210만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190만 화소</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">모션 블러 감소</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">피부 보정</string>
   <string name="camera_menu_asd_label">스마트 씬</string>
   <string name="pref_camera_power_shutter_title">전원 셔터</string>
+  <string name="pref_camera_max_brightness_title">밝은 화면</string>
   <string name="pref_superzoom_title">확대</string>
 </resources>
diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml
index 3fcf21eb4..1ba29b295 100644
--- a/res/values-ko/qcomstrings.xml
+++ b/res/values-ko/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10분</string>
   <string name="pref_camera_video_duration_entry_30">30분</string>
   <string name="pref_camera_skinToneEnhancement_title">피부 색 개선</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">켜기</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">끄기</string>
   <string name="pref_camera_selectablezoneaf_title">자동 초점 영역</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">자동</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">스팟 측광</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">중앙 중점 측광</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">프레임 평균</string>
-  <string name="pref_camera_video_hdr_entry_off">끔</string>
-  <string name="pref_camera_video_hdr_entry_on">켬</string>
+  <string name="hdr_enable_message">HDR이 켜져 있을 때에는 자동 모드만 사용할 수 있습니다</string>
+  <string name="scene_enable_message">HDR은 자동 모드에서만 사용 가능합니다</string>
   <string name="pref_camera_video_hdr_title">비디오 HDR</string>
   <string name="pref_camera_facedetection_title">얼굴 인식</string>
-  <string name="pref_camera_facedetection_entry_off">끔</string>
-  <string name="pref_camera_facedetection_entry_on">켬</string>
   <string name="pref_camera_redeyereduction_title">적목현상 제거</string>
-  <string name="pref_camera_redeyereduction_entry_enable">켜기</string>
-  <string name="pref_camera_redeyereduction_entry_disable">끄기</string>
+  <string name="error_app_unsupported_hfr_selection">HFR은 비디오 안정화, 타임 랩스, 또는 비디오 HDR과 함께 사용될 수 없습니다</string>
   <string name="error_app_unsupported_hfr">선택된 해상도에서 HFR은 지원되지 않습니다</string>
   <string name="error_app_unsupported_hfr_codec">HFR이 켜져 있어야 H.264 인코딩이 가능합니다</string>
   <string name="error_app_unsupported">이 코덱이 지원하지 않는 해상도입니다</string>
+  <string name="error_app_unsupported_dis">선택된 해상도에서는 비디오 안정화가 지원되지 않습니다</string>
   <string name="pref_camera_ae_bracket_hdr_title">자동 노출 브래킷</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">켜짐</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">꺼짐</string>
   <string name="pref_camera_hfr_title">슬로우 모션 (HFR)</string>
   <string name="pref_camera_hfr_entry_off">꺼짐</string>
   <string name="pref_camera_hfr_entry_2x">초당 60 프레임</string>
   <string name="pref_camera_hfr_entry_3x">초당 90 프레임</string>
   <string name="pref_camera_hfr_entry_4x">초당 120 프레임</string>
   <string name="pref_camera_denoise_title">노이즈 감쇄</string>
-  <string name="pref_camera_denoise_entry_off">꺼짐</string>
-  <string name="pref_camera_denoise_entry_on">켜짐</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">자동</string>
   <string name="pref_camera_iso_entry_isodeblur">자동 (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">밴딩 방지</string>
   <string name="pref_camera_antibanding_entry_0">꺼짐</string>
   <string name="pref_camera_antibanding_entry_1">50Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">파란색</string>
   <string name="pref_camera_coloreffect_entry_greentint">초록색</string>
   <string name="pref_camera_touchafaec_title">터치 AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">꺼짐</string>
-  <string name="pref_camera_touchafaec_entry_on">켜짐</string>
   <string name="pref_camera_dis_title">비디오 안정화</string>
-  <string name="pref_camera_dis_entry_off">꺼짐</string>
-  <string name="pref_camera_dis_entry_on">켜짐</string>
   <string name="pref_camera_facerc_title">얼굴 인식</string>
-  <string name="pref_camera_facerc_entry_off">꺼짐</string>
-  <string name="pref_camera_facerc_entry_on">켜짐</string>
+  <string name="pref_camera_sharpness_title">선명도</string>
   <string name="pref_camera_sharpness_entry_level0">레벨 0</string>
   <string name="pref_camera_sharpness_entry_level1">레벨 1</string>
   <string name="pref_camera_sharpness_entry_level2">레벨 2 (기본값)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">레벨 4</string>
   <string name="pref_camera_sharpness_entry_level5">레벨 5</string>
   <string name="pref_camera_sharpness_entry_level6">레벨 6</string>
+  <string name="pref_camera_contrast_title">대비</string>
   <string name="pref_camera_contrast_entry_level0">레벨 0</string>
   <string name="pref_camera_contrast_entry_level1">레벨 1</string>
   <string name="pref_camera_contrast_entry_level2">레벨 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">레벨 8</string>
   <string name="pref_camera_contrast_entry_level9">레벨 9</string>
   <string name="pref_camera_contrast_entry_level10">레벨 10</string>
+  <string name="pref_camera_saturation_title">채도</string>
   <string name="pref_camera_saturation_entry_level0">레벨 0</string>
   <string name="pref_camera_saturation_entry_level1">레벨 1</string>
   <string name="pref_camera_saturation_entry_level2">레벨 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">레벨 8</string>
   <string name="pref_camera_saturation_entry_level9">레벨 9</string>
   <string name="pref_camera_saturation_entry_level10">레벨 10</string>
-  <string name="pref_camera_sharpness_title">선명도</string>
-  <string name="pref_camera_contrast_title">대비</string>
-  <string name="pref_camera_saturation_title">채도</string>
   <string name="pref_camera_picture_format_title">사진 포맷</string>
   <string name="pref_camera_jpegquality_title">사진 품질</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">히스토그램</string>
-  <string name="pref_camera_histogram_entry_enable">켜기</string>
-  <string name="pref_camera_histogram_entry_disable">끄기</string>
   <string name="pref_camera_scenedetect_title">자동 장면 인식</string>
-  <string name="pref_camera_scenedetect_entry_on">켜짐</string>
-  <string name="pref_camera_scenedetect_entry_off">꺼짐</string>
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 32dfde732..ecc62fb99 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_10mp">10 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_9mp">9 مێگاپێکسڵ</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 مێگاپێکسڵ</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_4mp">4 مێگاپێکسڵ</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 مێگاپێکسڵ</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">که‌مکردنه‌وه‌ی ته‌ڵخبوونی جوڵه‌</string>
diff --git a/res/values-ku/qcomstrings.xml b/res/values-ku/qcomstrings.xml
index d63b5c7d5..027f4cb24 100644
--- a/res/values-ku/qcomstrings.xml
+++ b/res/values-ku/qcomstrings.xml
@@ -35,36 +35,24 @@
   <string name="pref_camera_video_duration_entry_10">10 خوله‌ک</string>
   <string name="pref_camera_video_duration_entry_30">30 خوله‌ک</string>
   <string name="pref_camera_skinToneEnhancement_title">زیادکردنی جوانکاری ده‌موچاو</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">داگیرسان</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">کوژاندنه‌وه‌</string>
   <string name="pref_camera_selectablezoneaf_title">خۆکارانه‌ سه‌رنجدان</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">خۆکارانه‌</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">مه‌ترکردنی نیشانه‌</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">پانی ناوه‌ڕاست</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">تێكڕای چوارچێوه‌</string>
-  <string name="pref_camera_video_hdr_entry_off">ناچالاکردن</string>
-  <string name="pref_camera_video_hdr_entry_on">چالاکردن</string>
   <string name="pref_camera_video_hdr_title">ڤیدیۆی HDR</string>
   <string name="pref_camera_facedetection_title">پشکنه‌ری ڕوو</string>
-  <string name="pref_camera_facedetection_entry_off">ناچالاکردن</string>
-  <string name="pref_camera_facedetection_entry_on">چالاکردن</string>
   <string name="pref_camera_redeyereduction_title">که‌مکردنه‌وه‌ی سووری چاو</string>
-  <string name="pref_camera_redeyereduction_entry_enable">داگیرسان</string>
-  <string name="pref_camera_redeyereduction_entry_disable">کوژاندنەوە</string>
   <string name="error_app_unsupported_hfr">HFR کار ناکات بۆ کوالێتی ده‌ستنیشانکراو</string>
   <string name="error_app_unsupported_hfr_codec">ته‌نیا H.264 کارده‌کات کاتێک HFR چالاک کرابێت</string>
   <string name="error_app_unsupported">ئه‌م کوالێتی ڤیدیۆیه‌ کارناکات بۆ جۆری لێده‌ره‌که‌</string>
   <string name="pref_camera_ae_bracket_hdr_title">خۆکارانه‌ ڕووناکیدانی که‌وانه‌</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">چالاکردن</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">ناچالاکردن</string>
   <string name="pref_camera_hfr_title">جوڵه‌ی خاوبوونه‌وه‌</string>
   <string name="pref_camera_hfr_entry_off">ناچالاکردن</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">ژاوەژاو لابردن</string>
-  <string name="pref_camera_denoise_entry_off">ناچالاکردن</string>
-  <string name="pref_camera_denoise_entry_on">چالاکردن</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">خۆکارانه‌</string>
   <string name="pref_camera_iso_entry_isodeblur">خۆکارانه‌ (HJR)</string>
@@ -95,14 +83,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">بۆیه‌کردنی شین</string>
   <string name="pref_camera_coloreffect_entry_greentint">بۆیه‌کردنی سه‌وز</string>
   <string name="pref_camera_touchafaec_title">په‌نجه‌لێدان AF\AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">ناچالاکردن</string>
-  <string name="pref_camera_touchafaec_entry_on">چالاکردن</string>
   <string name="pref_camera_dis_title">ڕاگیرکردنی ڤیدیۆ</string>
-  <string name="pref_camera_dis_entry_off">ناچالاکردن</string>
-  <string name="pref_camera_dis_entry_on">چالاکردن</string>
   <string name="pref_camera_facerc_title">ناسینه‌وه‌ی ڕوو</string>
-  <string name="pref_camera_facerc_entry_off">ناچالاکردن</string>
-  <string name="pref_camera_facerc_entry_on">چالاکردن</string>
+  <string name="pref_camera_sharpness_title">زبری</string>
   <string name="pref_camera_sharpness_entry_level0">ئاستی 0</string>
   <string name="pref_camera_sharpness_entry_level1">ئاستی 1</string>
   <string name="pref_camera_sharpness_entry_level2">ئاستی 2 (سه‌ره‌تایی)</string>
@@ -110,6 +93,7 @@
   <string name="pref_camera_sharpness_entry_level4">ئاستی 4</string>
   <string name="pref_camera_sharpness_entry_level5">ئاستی 5</string>
   <string name="pref_camera_sharpness_entry_level6">ئاستی 6</string>
+  <string name="pref_camera_contrast_title">جیاوازی</string>
   <string name="pref_camera_contrast_entry_level0">ئاستی 0</string>
   <string name="pref_camera_contrast_entry_level1">ئاستی 1</string>
   <string name="pref_camera_contrast_entry_level2">ئاستی 2</string>
@@ -121,6 +105,7 @@
   <string name="pref_camera_contrast_entry_level8">ئاستی 8</string>
   <string name="pref_camera_contrast_entry_level9">ئاستی 9</string>
   <string name="pref_camera_contrast_entry_level10">ئاستی 10</string>
+  <string name="pref_camera_saturation_title">تێرایی</string>
   <string name="pref_camera_saturation_entry_level0">ئاستی 0</string>
   <string name="pref_camera_saturation_entry_level1">ئاستی 1</string>
   <string name="pref_camera_saturation_entry_level2">ئاستی 2</string>
@@ -132,9 +117,6 @@
   <string name="pref_camera_saturation_entry_level8">ئاستی 8</string>
   <string name="pref_camera_saturation_entry_level9">ئاستی 9</string>
   <string name="pref_camera_saturation_entry_level10">ئاستی 10</string>
-  <string name="pref_camera_sharpness_title">زبری</string>
-  <string name="pref_camera_contrast_title">جیاوازی</string>
-  <string name="pref_camera_saturation_title">تێرایی</string>
   <string name="pref_camera_picture_format_title">جۆری وێنه‌</string>
   <string name="pref_camera_jpegquality_title">کوالێتی وێنه‌</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +126,5 @@
   <string name="pref_camera_jpegquality_entry_4">%95</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">مێژوویی</string>
-  <string name="pref_camera_histogram_entry_enable">داگیرسان</string>
-  <string name="pref_camera_histogram_entry_disable">کوژاندنه‌وه‌</string>
   <string name="pref_camera_scenedetect_title">خۆکارانه‌ دۆزینه‌وه‌ی دیمه‌ن</string>
-  <string name="pref_camera_scenedetect_entry_on">چالاکردن</string>
-  <string name="pref_camera_scenedetect_entry_off">ناچالاکردن</string>
 </resources>
diff --git a/res/values-large/filtershow_values.xml b/res/values-large/filtershow_values.xml
deleted file mode 100644
index 33b8642ba..000000000
--- a/res/values-large/filtershow_values.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Specify the screen orientation -->
-    <bool name="only_use_portrait">false</bool>
-
-    <!-- Category Panel Height -->
-    <dimen name="category_panel_height">94dip</dimen>
-
-    <!-- Category Panel Icon Size -->
-    <dimen name="category_panel_icon_size">72dip</dimen>
-
-    <!-- Category Panel Text Size -->
-    <dimen name="category_panel_text_size">14dip</dimen>
-
-    <!-- Category Panel Text Size -->
-    <dimen name="category_panel_margin">4dip</dimen>
-</resources>
\ No newline at end of file
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 291fdcc1f..9f143e0be 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -24,15 +24,20 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10,4M Pixelen</string>
   <string name="pref_camera_picturesize_entry_10mp">10M Pixelen</string>
   <string name="pref_camera_picturesize_entry_9mp">9M Pixelen</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2M Pixelen</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7M Pixelen</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4M Pixelen</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M Pixelen</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5M Pixelen</string>
   <string name="pref_camera_picturesize_entry_4mp">4M Pixelen</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7M Pixelen</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5M Pixelen</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1M Pixelen</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9M Pixelen</string>
+  <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
+  <string name="pref_camera_picturesize_entry_xga">XGA</string>
+  <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
+  <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
+  <string name="pref_camera_scenemode_entry_beach">Plage</string>
   <string name="pref_camera_scenemode_entry_mix_illuminant">Gemëscht Luucht</string>
+  <string name="pref_camera_slow_shutter_entry_16s">16 Sekonnen</string>
+  <string name="pref_camera_slow_shutter_entry_32s">32 Sekonnen</string>
+  <string name="pref_camera_slow_shutter_entry_64s">64 Sekonnen</string>
 </resources>
diff --git a/res/values-lb/qcomstrings.xml b/res/values-lb/qcomstrings.xml
index 96d14d0fa..d8eeea54f 100644
--- a/res/values-lb/qcomstrings.xml
+++ b/res/values-lb/qcomstrings.xml
@@ -21,5 +21,19 @@
     limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_video_hdr_entry_off">Aus</string>
+  <string name="pref_camera_iso_entry_iso50">ISO 50</string>
+  <string name="pref_camera_iso_entry_iso100">ISO 100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO 125</string>
+  <string name="pref_camera_iso_entry_iso200">ISO 200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO 250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO 320</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO 1250</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO 1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO 2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO 2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO 3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO 6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO 12800</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index b67d74b80..89a09e6b0 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -84,7 +84,7 @@
   <string name="rendering_photo_sphere">Photosphär gëtt gerendert</string>
   <string name="camera_error_title">Kamerafeeler</string>
   <string name="cannot_connect_camera">Keng Connectioun zur Kamera méiglech.</string>
-  <string name="camera_disabled">D\'Kamera gouf wéinst Sécherheetsriichtlinnen deaktivéiert.</string>
+  <string name="camera_disabled">D\'Kamera gouf wéinst Sécherheetsriichtlinnen desaktivéiert.</string>
   <string name="wait">Waart w.e.g.\u2026</string>
   <string name="no_storage" product="default">Maach eng SD-Kaart dran ier s du d\'Kamera benotzt.</string>
   <string name="preparing_sd" product="default">SD-Kaart gëtt preparéiert\u2026</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 0b7ccf07c..535d5ac88 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -21,25 +21,20 @@
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
   <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 MP</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 MP</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 MP</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 MP</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Judesių liejimosi mažinimas</string>
diff --git a/res/values-lt/qcomstrings.xml b/res/values-lt/qcomstrings.xml
index b7150b5cb..ed912b485 100644
--- a/res/values-lt/qcomstrings.xml
+++ b/res/values-lt/qcomstrings.xml
@@ -35,44 +35,46 @@
   <string name="pref_camera_video_duration_entry_10">10 min.</string>
   <string name="pref_camera_video_duration_entry_30">30 min.</string>
   <string name="pref_camera_skinToneEnhancement_title">Odos spalvos tono didinimas</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Įjungtas</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Išjungtas</string>
   <string name="pref_camera_selectablezoneaf_title">Autom. fokusavimo zona</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatiškai</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Taškinis matavimas</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centruotas</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Vidutinis rėmas</string>
-  <string name="pref_camera_video_hdr_entry_off">Išjungtas</string>
-  <string name="pref_camera_video_hdr_entry_on">Įjungtas</string>
   <string name="pref_camera_video_hdr_title">Vaizdas (HDR)</string>
   <string name="pref_camera_facedetection_title">Veido aptikimas</string>
-  <string name="pref_camera_facedetection_entry_off">Išjungtas</string>
-  <string name="pref_camera_facedetection_entry_on">Įjungtas</string>
   <string name="pref_camera_redeyereduction_title">Raudonų akių mažinimas</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Įjungtas</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Išjungtas</string>
   <string name="error_app_unsupported_hfr">Daug kadrų per sekundę (HFR) nepalaiko pasirinktos rezoliucijos</string>
   <string name="error_app_unsupported_hfr_codec">Kai daug kadrų per sekundę (HFR) yra įjungta, palaikomas tik H264 vaizdo iškodavimas</string>
   <string name="error_app_unsupported">Nepalaikoma vaizdo rezoliucija šiam iškodavimo tipui</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatinio išlaikymo korekcija</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Įjungta</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Išjungta</string>
   <string name="pref_camera_hfr_title">Sulėtinimas (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Išjungta</string>
   <string name="pref_camera_hfr_entry_2x">60 kadrų / sek.</string>
   <string name="pref_camera_hfr_entry_3x">90 kadrų / sek.</string>
   <string name="pref_camera_hfr_entry_4x">120 kadrų / sek.</string>
   <string name="pref_camera_denoise_title">Triukšmo mažinimas</string>
-  <string name="pref_camera_denoise_entry_off">Išjungtas</string>
-  <string name="pref_camera_denoise_entry_on">Įjungtas</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automatinis</string>
   <string name="pref_camera_iso_entry_isodeblur">Automatinis (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Artefaktų mažinimas</string>
   <string name="pref_camera_antibanding_entry_0">Išjungtas</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +97,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Mėlynas atspalvis</string>
   <string name="pref_camera_coloreffect_entry_greentint">Žalias atspalvis</string>
   <string name="pref_camera_touchafaec_title">Lietimas AF / AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Įjungtas</string>
-  <string name="pref_camera_touchafaec_entry_on">Išjungtas</string>
   <string name="pref_camera_dis_title">Vaizdo stabilizavimas</string>
-  <string name="pref_camera_dis_entry_off">Išjungtas</string>
-  <string name="pref_camera_dis_entry_on">Įjungtas</string>
   <string name="pref_camera_facerc_title">Veido atpažinimas</string>
-  <string name="pref_camera_facerc_entry_off">Išjungtas</string>
-  <string name="pref_camera_facerc_entry_on">Įjungtas</string>
+  <string name="pref_camera_sharpness_title">Aštrumas</string>
   <string name="pref_camera_sharpness_entry_level0">0 Lygis</string>
   <string name="pref_camera_sharpness_entry_level1">1 Lygis</string>
   <string name="pref_camera_sharpness_entry_level2">2 Lygis (numatytasis)</string>
@@ -110,6 +107,7 @@
   <string name="pref_camera_sharpness_entry_level4">4 Lygis</string>
   <string name="pref_camera_sharpness_entry_level5">5 Lygis</string>
   <string name="pref_camera_sharpness_entry_level6">6 Lygis</string>
+  <string name="pref_camera_contrast_title">Kontrastas</string>
   <string name="pref_camera_contrast_entry_level0">0 Lygis</string>
   <string name="pref_camera_contrast_entry_level1">1 Lygis</string>
   <string name="pref_camera_contrast_entry_level2">2 Lygis</string>
@@ -121,6 +119,7 @@
   <string name="pref_camera_contrast_entry_level8">8 Lygis</string>
   <string name="pref_camera_contrast_entry_level9">9 Lygis</string>
   <string name="pref_camera_contrast_entry_level10">10 Lygis</string>
+  <string name="pref_camera_saturation_title">Sotis</string>
   <string name="pref_camera_saturation_entry_level0">0 Lygis</string>
   <string name="pref_camera_saturation_entry_level1">1 Lygis</string>
   <string name="pref_camera_saturation_entry_level2">2 Lygis</string>
@@ -132,9 +131,6 @@
   <string name="pref_camera_saturation_entry_level8">8 Lygis</string>
   <string name="pref_camera_saturation_entry_level9">9 Lygis</string>
   <string name="pref_camera_saturation_entry_level10">10 Lygis</string>
-  <string name="pref_camera_sharpness_title">Aštrumas</string>
-  <string name="pref_camera_contrast_title">Kontrastas</string>
-  <string name="pref_camera_saturation_title">Sotis</string>
   <string name="pref_camera_picture_format_title">Nuotraukos formatas</string>
   <string name="pref_camera_jpegquality_title">Nuotraukos kokybė</string>
   <string name="pref_camera_jpegquality_entry_0">JPEG 55%</string>
@@ -144,9 +140,5 @@
   <string name="pref_camera_jpegquality_entry_4">JPEG 95%</string>
   <string name="pref_camera_jpegquality_entry_5">JPEG 100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Įjungta</string>
-  <string name="pref_camera_histogram_entry_disable">Išjungta</string>
   <string name="pref_camera_scenedetect_title">Automatinis scenos aptikimas</string>
-  <string name="pref_camera_scenedetect_entry_on">Įjungtas</string>
-  <string name="pref_camera_scenedetect_entry_off">Išjungtas</string>
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
new file mode 100644
index 000000000..64644460a
--- /dev/null
+++ b/res/values-lv/cm_strings.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pref_camera_picturesize_entry_20_7mp">20.7M punkti</string>
+  <string name="pref_camera_picturesize_entry_18mp">18M punkti</string>
+  <string name="pref_camera_picturesize_entry_12_8mp">12.8M punkti</string>
+  <string name="pref_camera_picturesize_entry_12_7mp">12.7M punkti</string>
+  <string name="pref_camera_picturesize_entry_12mp">12M punkti</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9M punkti</string>
+  <string name="pref_camera_picturesize_entry_11_5mp">11.5M punkti</string>
+  <string name="pref_camera_picturesize_entry_10_4mp">10.4M punkti</string>
+  <string name="pref_camera_picturesize_entry_10mp">10M punkti</string>
+  <string name="pref_camera_picturesize_entry_9mp">9M punkti</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7.7M punkti</string>
+  <string name="pref_camera_picturesize_entry_6_4mp">6.4M punkti</string>
+  <string name="pref_camera_picturesize_entry_4_5mp">4.5M punkti</string>
+  <string name="pref_camera_picturesize_entry_4mp">4M punkti</string>
+  <string name="pref_camera_picturesize_entry_2_5mp">2.5M punkti</string>
+  <string name="pref_camera_picturesize_entry_1_9mp">1.9M punkti</string>
+  <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
+  <string name="pref_camera_picturesize_entry_xga">XGA</string>
+  <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
+  <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
+  <string name="pref_camera_scenemode_entry_antimotionblur">Kustības miglojuma samazināšana</string>
+  <string name="pref_camera_scenemode_entry_aqua">Akva</string>
+  <string name="pref_camera_scenemode_entry_ar">Papildinātā realitāte</string>
+  <string name="pref_camera_scenemode_entry_asd">Labākais uzņēmums</string>
+  <string name="pref_camera_scenemode_entry_baby">Bērns</string>
+  <string name="pref_camera_scenemode_entry_backgroundblur">Izplūdis fons</string>
+  <string name="pref_camera_scenemode_entry_backlight">Pretgaisma</string>
+  <string name="pref_camera_scenemode_entry_backlightportrait">Pretgaismas portrets</string>
+  <string name="pref_camera_scenemode_entry_barcode">Svītrkods</string>
+  <string name="pref_camera_scenemode_entry_beach">Pludmale</string>
+  <string name="pref_camera_scenemode_entry_beauty">Skaistule</string>
+  <string name="pref_camera_scenemode_entry_candlelight">Sveču gaisma</string>
+  <string name="pref_camera_scenemode_entry_cine">Kino</string>
+  <string name="pref_camera_scenemode_entry_closeup">Tuvplāns</string>
+  <string name="pref_camera_scenemode_entry_dark">Tumšs</string>
+  <string name="pref_camera_scenemode_entry_dish">Ēdiens</string>
+  <string name="pref_camera_scenemode_entry_duskdawn">Rītausma</string>
+  <string name="pref_camera_scenemode_entry_document">Dokuments</string>
+  <string name="pref_camera_scenemode_entry_fallcolor">Rudens krāsas</string>
+  <string name="pref_camera_scenemode_entry_fireworks">Uguņošana</string>
+  <string name="pref_camera_scenemode_entry_flowers">Ziedi</string>
+  <string name="pref_camera_scenemode_entry_handheldtwilight">Rokas lampa</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">Augstas jutības</string>
+  <string name="pref_camera_scenemode_entry_indoor">Iekštelpas</string>
+  <string name="pref_camera_scenemode_entry_landscape">Ainava</string>
+  <string name="pref_camera_scenemode_entry_mix_illuminant">Jaukts apgaismojums</string>
+  <string name="pref_camera_scenemode_entry_mood">Noskaņojums</string>
+  <string name="pref_camera_scenemode_entry_nightportrait">Nakts portrets</string>
+  <string name="pref_camera_scenemode_entry_nightindoor">Nakts iekštelpā</string>
+  <string name="pref_camera_scenemode_entry_oldfilm">Veca filma</string>
+  <string name="pref_camera_scenemode_entry_pet">Mīļdzīvnieks</string>
+  <string name="pref_camera_scenemode_entry_portrait">Portrets</string>
+  <string name="pref_camera_scenemode_entry_snow">Sniegs</string>
+  <string name="pref_camera_scenemode_entry_softskin">Maiga āda</string>
+  <string name="pref_camera_scenemode_entry_sports">Sports</string>
+  <string name="pref_camera_scenemode_entry_spotlight">Prožektors</string>
+  <string name="pref_camera_scenemode_entry_steadyphoto">Statīva foto</string>
+  <string name="pref_camera_scenemode_entry_supernight">Tumša nakts</string>
+  <string name="pref_camera_scenemode_entry_sweepstitch">Izsmērēta šuve</string>
+  <string name="pref_camera_scenemode_entry_text">Teksts</string>
+  <string name="pref_camera_scenemode_entry_theatre">Teātris</string>
+  <string name="pref_camera_scenemode_entry_whiteboard">Balta tāfele</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">Nepārtraukts</string>
+  <string name="pref_camera_focusmode_entry_extended">Paplašināts</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Noteikt seju</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Sejas prioritāte</string>
+  <string name="pref_camera_focusmode_entry_fixed">Fiksēts</string>
+  <string name="pref_camera_focusmode_entry_portrait">Portrets</string>
+  <string name="pref_camera_focusmode_entry_hyperfocal">Hiperfokāls</string>
+  <string name="pref_camera_focusmode_entry_manual">Manuāls</string>
+  <string name="pref_camera_coloreffect_entry_washed">Izmazgāts</string>
+  <string name="pref_camera_coloreffect_entry_vintage_warm">Silta vinjete</string>
+  <string name="pref_camera_coloreffect_entry_vintage_cold">Auksta vinjete</string>
+  <string name="pref_camera_coloreffect_entry_point_blue">Punkta zils</string>
+  <string name="pref_camera_coloreffect_entry_point_green">Punkta zaļš</string>
+  <string name="pref_camera_coloreffect_entry_point_red_yellow">Punkta sarkan-dzeltens</string>
+  <string name="pref_camera_coloreffect_entry_cartoonize">Zīmējums</string>
+  <string name="pref_camera_burst_title">Šalts režīms</string>
+  <string name="pref_camera_burst_entry_off">Izslēgts</string>
+  <string name="pref_camera_burst_entry_5">5 kadri</string>
+  <string name="pref_camera_burst_entry_10">10 kadri</string>
+  <string name="pref_camera_burst_entry_15">15 kadri</string>
+  <string name="pref_camera_burst_entry_20">20 kadri</string>
+  <string name="pref_camera_focustime_title">Skāriena fokusa ilgums</string>
+  <string name="pref_camera_focustime_entry_5">5 s</string>
+  <string name="pref_camera_focustime_entry_10">10 s</string>
+  <string name="pref_camera_focustime_entry_15">15 s</string>
+  <string name="pref_camera_focustime_entry_20">20 s</string>
+  <string name="pref_camera_focustime_entry_30">30 s</string>
+  <string name="pref_camera_focustime_entry_infinite">Bezgalīgi</string>
+  <string name="pref_camera_flashmode_entry_redeye">Sarkanas acis</string>
+  <string name="pref_camera_flashmode_label_redeye">SARKANAS ACIS</string>
+  <string name="pref_camera_beauty_mode_title">Skaistuma režīms</string>
+  <string name="pref_camera_slow_shutter_title">Lēns slēdzis</string>
+  <string name="pref_camera_slow_shutter_entry_off">Izslēgts</string>
+  <string name="pref_camera_slow_shutter_entry_auto">Automātiski</string>
+  <string name="pref_camera_slow_shutter_entry_half_second">½ sekunde</string>
+  <string name="pref_camera_slow_shutter_entry_1s">1 sekunde</string>
+  <string name="pref_camera_slow_shutter_entry_2s">2 sekundes</string>
+  <string name="pref_camera_slow_shutter_entry_4s">4 sekundes</string>
+  <string name="pref_camera_slow_shutter_entry_8s">8 sekundes</string>
+  <string name="pref_camera_slow_shutter_entry_16s">16 sekundes</string>
+  <string name="pref_camera_slow_shutter_entry_32s">32 sekundes</string>
+  <string name="pref_camera_slow_shutter_entry_64s">64 sekundes</string>
+  <string name="pref_camera_storage_title">Krātuve</string>
+  <string name="camera_menu_enhance_label">UZLABOT</string>
+  <string name="camera_menu_beauty_mode_label">SKAISTUMS</string>
+  <string name="camera_menu_asd_label">GUDRĀ AINA</string>
+  <string name="pref_camera_power_shutter_title">Jaudas slēdzis</string>
+  <string name="pref_superzoom_title">Palielināt</string>
+</resources>
diff --git a/res/values-lv/qcomstrings.xml b/res/values-lv/qcomstrings.xml
new file mode 100644
index 000000000..e5cf4e019
--- /dev/null
+++ b/res/values-lv/qcomstrings.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+    Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+    Copyright (C) 2013-2014 The CyanogenMod Project
+
+    Not a Contribution.
+
+    Copyright (C) 2007 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<resources>
+  <string name="pref_camera_powermode_title">Jaudas režīms</string>
+  <string name="pref_camera_powermode_entry_lp">Mazjaudas</string>
+  <string name="pref_camera_powermode_entry_np">Vidējas jaudas</string>
+  <string name="pref_camera_autoexposure_title">Automātiska ekspozīcija</string>
+  <string name="pref_camera_autoexposure_entry_frameaverage">Kadra vidējais</string>
+  <string name="pref_camera_autoexposure_entry_centerweighted">Centra svērtā</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Punkta mērīšana</string>
+  <string name="pref_camera_videoencoder_title">Video kodeks</string>
+  <string name="pref_camera_audioencoder_title">Audio kodeks</string>
+  <string name="pref_camera_video_duration_title">Video ilgums</string>
+  <string name="pref_camera_video_duration_entry_mms">30 sekundes (MMS)</string>
+  <string name="pref_camera_video_duration_entry_10">10 minūtes</string>
+  <string name="pref_camera_video_duration_entry_30">30 minūtes</string>
+  <string name="pref_camera_skinToneEnhancement_title">Ādas toņu uzlabošana</string>
+  <string name="pref_camera_selectablezoneaf_title">Autofokusa zona</string>
+  <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Punkta mērīšana</string>
+  <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centra svērtā</string>
+  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Kadra vidējais</string>
+  <string name="pref_camera_video_hdr_title">Video HDR</string>
+  <string name="pref_camera_facedetection_title">Seju noteikšana</string>
+  <string name="pref_camera_redeyereduction_title">Sarkano acu vājināšana</string>
+  <string name="error_app_unsupported_hfr">Izvēlētajai izšķirtspējai HFR nav atbalstīts</string>
+  <string name="error_app_unsupported_hfr_codec">h. 264 video kodējums ir atbalstīts, tikai ja ir ieslēgts HFR</string>
+  <string name="error_app_unsupported">Neatbalstīta video izšķirtspēja šim kodeka veidam</string>
+  <string name="pref_camera_ae_bracket_hdr_title">Automātiskā ekspozīcijas ierobežošana</string>
+  <string name="pref_camera_hfr_title">Lēna kustība (HFR)</string>
+  <string name="pref_camera_hfr_entry_off">Izslēgts</string>
+  <string name="pref_camera_hfr_entry_2x">60 k/s</string>
+  <string name="pref_camera_hfr_entry_3x">90 k/s</string>
+  <string name="pref_camera_hfr_entry_4x">120 k/s</string>
+  <string name="pref_camera_denoise_title">Attrokšņot</string>
+  <string name="pref_camera_iso_title">ISO</string>
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
+  <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
+  <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
+  <string name="pref_camera_antibanding_title">Antibanding</string>
+  <string name="pref_camera_antibanding_entry_0">Izslēgts</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz</string>
+  <string name="pref_camera_antibanding_entry_3">Automātiski</string>
+  <string name="pref_camera_coloreffect_title">Krāsu efekts</string>
+  <string name="pref_camera_coloreffect_entry_none">Neviens</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sēpija</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negatīvs</string>
+  <string name="pref_camera_coloreffect_entry_solarize">Solarizēt</string>
+  <string name="pref_camera_coloreffect_entry_posterize">Plakāta</string>
+  <string name="pref_camera_coloreffect_entry_aqua">Akva</string>
+  <string name="pref_camera_coloreffect_entry_emboss">Reljefs</string>
+  <string name="pref_camera_coloreffect_entry_sketch">Skice</string>
+  <string name="pref_camera_coloreffect_entry_neon">Neona</string>
+  <string name="pref_camera_coloreffect_entry_pastel">Pasteļu</string>
+  <string name="pref_camera_coloreffect_entry_mosaic">Mozaīka</string>
+  <string name="pref_camera_coloreffect_entry_redtint">Sarkanais tonis</string>
+  <string name="pref_camera_coloreffect_entry_bluetint">Zilais tonis</string>
+  <string name="pref_camera_coloreffect_entry_greentint">Zaļais tonis</string>
+  <string name="pref_camera_touchafaec_title">Pieskarties AF/AEC</string>
+  <string name="pref_camera_dis_title">Video stabilizācija</string>
+  <string name="pref_camera_facerc_title">Seju atpazīšana</string>
+  <string name="pref_camera_sharpness_title">Asums</string>
+  <string name="pref_camera_sharpness_entry_level0">0. līmenis</string>
+  <string name="pref_camera_sharpness_entry_level1">1. līmenis</string>
+  <string name="pref_camera_sharpness_entry_level2">2.  līmenis (noklusētais)</string>
+  <string name="pref_camera_sharpness_entry_level3">3.  līmenis</string>
+  <string name="pref_camera_sharpness_entry_level4">4.  līmenis</string>
+  <string name="pref_camera_sharpness_entry_level5">5.  līmenis</string>
+  <string name="pref_camera_sharpness_entry_level6">6.  līmenis</string>
+  <string name="pref_camera_contrast_title">Kontrasts</string>
+  <string name="pref_camera_contrast_entry_level0">0.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level1">1.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level2">2.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level3">3.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level4">4.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level5">5.  līmenis (noklusētais)</string>
+  <string name="pref_camera_contrast_entry_level6">6.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level7">7.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level8">8.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level9">9.  līmenis</string>
+  <string name="pref_camera_contrast_entry_level10">10.  līmenis</string>
+  <string name="pref_camera_saturation_title">Piesātinājums</string>
+  <string name="pref_camera_saturation_entry_level0">0.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level1">1.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level2">2.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level3">3.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level4">4.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level5">5.  līmenis (noklusētais)</string>
+  <string name="pref_camera_saturation_entry_level6">6.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level7">7.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level8">8.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level9">9.  līmenis</string>
+  <string name="pref_camera_saturation_entry_level10">10.  līmenis</string>
+  <string name="pref_camera_picture_format_title">Attēla formāts</string>
+  <string name="pref_camera_jpegquality_title">Attēla kvalitāte</string>
+  <string name="pref_camera_jpegquality_entry_0">55%</string>
+  <string name="pref_camera_jpegquality_entry_1">65% (normāls)</string>
+  <string name="pref_camera_jpegquality_entry_2">75% (smalks)</string>
+  <string name="pref_camera_jpegquality_entry_3">85% (īpaši smalks)</string>
+  <string name="pref_camera_jpegquality_entry_4">95%</string>
+  <string name="pref_camera_jpegquality_entry_5">100%</string>
+  <string name="pref_camera_histogram_title">Histogramma</string>
+  <string name="pref_camera_scenedetect_title">Automātiskā ainas noteikšana</string>
+</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index fcfd410ad..d77c5752a 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapiksler</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapiksler</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapiksler</string>
   <string name="pref_camera_picturesize_entry_12mp">12M piksler</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 M piksler</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapiksler</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapiksler</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 M piksler</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapiksler</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapiksler</string>
   <string name="pref_camera_picturesize_entry_4mp">4M piksler</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapiksler</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Bevegelsesuskarphet reduksjon</string>
@@ -84,12 +86,14 @@
   <string name="pref_camera_scenemode_entry_text">Tekst</string>
   <string name="pref_camera_scenemode_entry_theatre">Teater</string>
   <string name="pref_camera_scenemode_entry_whiteboard">Tavle</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">Kontinuerlig</string>
   <string name="pref_camera_focusmode_entry_extended">Utvidet</string>
   <string name="pref_camera_focusmode_entry_facedetect">Ansiktsoppdagelse</string>
   <string name="pref_camera_focusmode_entry_facepriority">Ansiktsprioritet</string>
   <string name="pref_camera_focusmode_entry_fixed">Fast</string>
   <string name="pref_camera_focusmode_entry_portrait">Portrett</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfokal</string>
+  <string name="pref_camera_focusmode_entry_manual">Manuell</string>
   <string name="pref_camera_coloreffect_entry_washed">Utvasket</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage varmt</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage kaldt</string>
@@ -129,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">FORSKJØNNE</string>
   <string name="camera_menu_asd_label">SMART SCENE</string>
   <string name="pref_camera_power_shutter_title">Påknapp som utløser</string>
+  <string name="pref_camera_max_brightness_title">Lys skjerm</string>
   <string name="pref_superzoom_title">Forstørre</string>
 </resources>
diff --git a/res/values-nb/qcomstrings.xml b/res/values-nb/qcomstrings.xml
index d0ea2e2b9..440cdfd74 100644
--- a/res/values-nb/qcomstrings.xml
+++ b/res/values-nb/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minutter</string>
   <string name="pref_camera_video_duration_entry_30">30 minutter</string>
   <string name="pref_camera_skinToneEnhancement_title">Hud farge forsterkning</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">På</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Av</string>
   <string name="pref_camera_selectablezoneaf_title">Autofokus sone</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatisk</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Punktmåling</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Sentermålt</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Ramme gjennomsnitt</string>
-  <string name="pref_camera_video_hdr_entry_off">Av</string>
-  <string name="pref_camera_video_hdr_entry_on">På</string>
+  <string name="hdr_enable_message">HDR er aktivert, automatisk scene modus støttes</string>
+  <string name="scene_enable_message">HDR støttes ikke i denne scenemodusen annet enn Auto</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Ansiktsgjenkjenning</string>
-  <string name="pref_camera_facedetection_entry_off">Av</string>
-  <string name="pref_camera_facedetection_entry_on">På</string>
   <string name="pref_camera_redeyereduction_title">Reduksjon av røde øyne</string>
-  <string name="pref_camera_redeyereduction_entry_enable">På</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Av</string>
+  <string name="error_app_unsupported_hfr_selection">HFR støttes ikke når videostabilisering, tidsforløp eller video HDR er på</string>
   <string name="error_app_unsupported_hfr">HFR støttes ikke for valgt oppløsning</string>
   <string name="error_app_unsupported_hfr_codec">Bare H.264 video-koding støttes når HFR er på</string>
   <string name="error_app_unsupported">Ustøttet skjermoppløsning for denne kodeken</string>
+  <string name="error_app_unsupported_dis">Videostabilisering støttes ikke for valgt oppløsning</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">På</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Av</string>
   <string name="pref_camera_hfr_title">Slow Motion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Av</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Fjern støy</string>
-  <string name="pref_camera_denoise_entry_off">Av</string>
-  <string name="pref_camera_denoise_entry_on">På</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automatisk</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">Av</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Blå fargetone</string>
   <string name="pref_camera_coloreffect_entry_greentint">Grønn fargetone</string>
   <string name="pref_camera_touchafaec_title">Trykk AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Av</string>
-  <string name="pref_camera_touchafaec_entry_on">På</string>
   <string name="pref_camera_dis_title">Videostabilisering</string>
-  <string name="pref_camera_dis_entry_off">Av</string>
-  <string name="pref_camera_dis_entry_on">På</string>
   <string name="pref_camera_facerc_title">Ansiktsgjenkjenning</string>
-  <string name="pref_camera_facerc_entry_off">Av</string>
-  <string name="pref_camera_facerc_entry_on">På</string>
+  <string name="pref_camera_sharpness_title">Skarphet</string>
   <string name="pref_camera_sharpness_entry_level0">Nivå 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivå 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivå 2 (standard)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nivå 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nivå 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nivå 6</string>
+  <string name="pref_camera_contrast_title">Kontrast</string>
   <string name="pref_camera_contrast_entry_level0">Nivå 0</string>
   <string name="pref_camera_contrast_entry_level1">Nivå 1</string>
   <string name="pref_camera_contrast_entry_level2">Nivå 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Level 8</string>
   <string name="pref_camera_contrast_entry_level9">Nivå 9</string>
   <string name="pref_camera_contrast_entry_level10">Nivå 10</string>
+  <string name="pref_camera_saturation_title">Metning</string>
   <string name="pref_camera_saturation_entry_level0">Nivå 0</string>
   <string name="pref_camera_saturation_entry_level1">Nivå 1</string>
   <string name="pref_camera_saturation_entry_level2">Nivå 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Level 8</string>
   <string name="pref_camera_saturation_entry_level9">Nivå 9</string>
   <string name="pref_camera_saturation_entry_level10">Nivå 10</string>
-  <string name="pref_camera_sharpness_title">Skarphet</string>
-  <string name="pref_camera_contrast_title">Kontrast</string>
-  <string name="pref_camera_saturation_title">Metning</string>
   <string name="pref_camera_picture_format_title">Bildeformat</string>
   <string name="pref_camera_jpegquality_title">Bildekvalitet</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">På</string>
-  <string name="pref_camera_histogram_entry_disable">Av</string>
   <string name="pref_camera_scenedetect_title">Automatisk Scene deteksjon</string>
-  <string name="pref_camera_scenedetect_entry_on">På</string>
-  <string name="pref_camera_scenedetect_entry_off">Av</string>
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index e890da1f7..4a03e39e7 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -18,28 +18,27 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapixel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixel</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_12mp">12 megapixel</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 megapixel</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixel</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapixel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 megapixel</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixel</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Beweging verscherpen</string>
@@ -84,12 +83,14 @@
   <string name="pref_camera_scenemode_entry_text">Tekst</string>
   <string name="pref_camera_scenemode_entry_theatre">Theater</string>
   <string name="pref_camera_scenemode_entry_whiteboard">Whiteboard</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">Continu</string>
   <string name="pref_camera_focusmode_entry_extended">Uitgebreid</string>
   <string name="pref_camera_focusmode_entry_facedetect">Gezichtsdetectie</string>
   <string name="pref_camera_focusmode_entry_facepriority">Gezichtsprioriteit</string>
   <string name="pref_camera_focusmode_entry_fixed">Vast</string>
   <string name="pref_camera_focusmode_entry_portrait">Portret</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocaal</string>
+  <string name="pref_camera_focusmode_entry_manual">Handmatig</string>
   <string name="pref_camera_coloreffect_entry_washed">Verwassen</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">Ouderwets (warm)</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">Ouderwets (koud)</string>
diff --git a/res/values-nl/qcomstrings.xml b/res/values-nl/qcomstrings.xml
index 1bd2268dc..25c90d676 100644
--- a/res/values-nl/qcomstrings.xml
+++ b/res/values-nl/qcomstrings.xml
@@ -35,44 +35,46 @@
   <string name="pref_camera_video_duration_entry_10">10 minuten</string>
   <string name="pref_camera_video_duration_entry_30">30 minuten</string>
   <string name="pref_camera_skinToneEnhancement_title">Huidskleurverbetering</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Aan</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Uit</string>
   <string name="pref_camera_selectablezoneaf_title">Selecteerbare autofocus-zone</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatisch</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spotmeting</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centrum gewogen</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Beeldgemiddelde</string>
-  <string name="pref_camera_video_hdr_entry_off">Uit</string>
-  <string name="pref_camera_video_hdr_entry_on">Aan</string>
   <string name="pref_camera_video_hdr_title">Video (HDR)</string>
   <string name="pref_camera_facedetection_title">Gezichtsherkenning</string>
-  <string name="pref_camera_facedetection_entry_off">Uit</string>
-  <string name="pref_camera_facedetection_entry_on">Aan</string>
   <string name="pref_camera_redeyereduction_title">Rode ogen verminderen</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Aan</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Uit</string>
   <string name="error_app_unsupported_hfr">Hoge beeldsnelheid (HFR) wordt niet ondersteund bij deze resolutie</string>
   <string name="error_app_unsupported_hfr_codec">Alleen H.264-videocodec ondersteund bij HFR</string>
   <string name="error_app_unsupported">Videoresolutie niet ondersteund bij deze codec</string>
   <string name="pref_camera_ae_bracket_hdr_title">Reeksopname met automatische belichting</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Aan</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Uit</string>
   <string name="pref_camera_hfr_title">Slowmotion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Uit</string>
   <string name="pref_camera_hfr_entry_2x">60 fps</string>
   <string name="pref_camera_hfr_entry_3x">90 fps</string>
   <string name="pref_camera_hfr_entry_4x">120 fps</string>
   <string name="pref_camera_denoise_title">Kleurruis verwijderen</string>
-  <string name="pref_camera_denoise_entry_off">Uit</string>
-  <string name="pref_camera_denoise_entry_on">Aan</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automatisch</string>
   <string name="pref_camera_iso_entry_isodeblur">Automatisch (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">50</string>
   <string name="pref_camera_iso_entry_iso100">100</string>
+  <string name="pref_camera_iso_entry_iso125">125</string>
   <string name="pref_camera_iso_entry_iso200">200</string>
+  <string name="pref_camera_iso_entry_iso250">250</string>
+  <string name="pref_camera_iso_entry_iso320">320</string>
   <string name="pref_camera_iso_entry_iso400">400</string>
+  <string name="pref_camera_iso_entry_iso500">500</string>
+  <string name="pref_camera_iso_entry_iso640">640</string>
   <string name="pref_camera_iso_entry_iso800">800</string>
+  <string name="pref_camera_iso_entry_iso1000">1000</string>
+  <string name="pref_camera_iso_entry_iso1200">1200</string>
+  <string name="pref_camera_iso_entry_iso1250">1250</string>
   <string name="pref_camera_iso_entry_iso1600">1600</string>
+  <string name="pref_camera_iso_entry_iso2000">2000</string>
+  <string name="pref_camera_iso_entry_iso2500">2500</string>
+  <string name="pref_camera_iso_entry_iso3200">3200</string>
+  <string name="pref_camera_iso_entry_iso6400">6400</string>
+  <string name="pref_camera_iso_entry_iso12800">12800</string>
   <string name="pref_camera_antibanding_title">Anti-banding</string>
   <string name="pref_camera_antibanding_entry_0">Uit</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +97,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Blauwe tint</string>
   <string name="pref_camera_coloreffect_entry_greentint">Groene tint</string>
   <string name="pref_camera_touchafaec_title">Aanraken voor AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Uit</string>
-  <string name="pref_camera_touchafaec_entry_on">Aan</string>
   <string name="pref_camera_dis_title">Digitale beeldstabilisatie</string>
-  <string name="pref_camera_dis_entry_off">Uit</string>
-  <string name="pref_camera_dis_entry_on">Aan</string>
   <string name="pref_camera_facerc_title">Gezichtsherkenning</string>
-  <string name="pref_camera_facerc_entry_off">Uit</string>
-  <string name="pref_camera_facerc_entry_on">Aan</string>
+  <string name="pref_camera_sharpness_title">Scherpte</string>
   <string name="pref_camera_sharpness_entry_level0">Niveau 0</string>
   <string name="pref_camera_sharpness_entry_level1">Niveau 1</string>
   <string name="pref_camera_sharpness_entry_level2">Niveau 2 (standaard)</string>
@@ -110,6 +107,7 @@
   <string name="pref_camera_sharpness_entry_level4">Niveau 4</string>
   <string name="pref_camera_sharpness_entry_level5">Niveau 5</string>
   <string name="pref_camera_sharpness_entry_level6">Niveau 6</string>
+  <string name="pref_camera_contrast_title">Contrast</string>
   <string name="pref_camera_contrast_entry_level0">Niveau 0</string>
   <string name="pref_camera_contrast_entry_level1">Niveau 1</string>
   <string name="pref_camera_contrast_entry_level2">Niveau 2</string>
@@ -121,6 +119,7 @@
   <string name="pref_camera_contrast_entry_level8">Niveau 8</string>
   <string name="pref_camera_contrast_entry_level9">Niveau 9</string>
   <string name="pref_camera_contrast_entry_level10">Niveau 10</string>
+  <string name="pref_camera_saturation_title">Verzadiging</string>
   <string name="pref_camera_saturation_entry_level0">Niveau 0</string>
   <string name="pref_camera_saturation_entry_level1">Niveau 1</string>
   <string name="pref_camera_saturation_entry_level2">Niveau 2</string>
@@ -132,9 +131,6 @@
   <string name="pref_camera_saturation_entry_level8">Niveau 8</string>
   <string name="pref_camera_saturation_entry_level9">Niveau 9</string>
   <string name="pref_camera_saturation_entry_level10">Niveau 10</string>
-  <string name="pref_camera_sharpness_title">Scherpte</string>
-  <string name="pref_camera_contrast_title">Contrast</string>
-  <string name="pref_camera_saturation_title">Verzadiging</string>
   <string name="pref_camera_picture_format_title">Bestandsformaat</string>
   <string name="pref_camera_jpegquality_title">Beeldkwaliteit</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +140,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">Aan</string>
-  <string name="pref_camera_histogram_entry_disable">Uit</string>
   <string name="pref_camera_scenedetect_title">Automatische scènedetectie</string>
-  <string name="pref_camera_scenedetect_entry_on">Aan</string>
-  <string name="pref_camera_scenedetect_entry_off">Uit</string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 36fc9a503..17a45334e 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -21,24 +21,20 @@
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpix</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpix</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mpix</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 Mpix</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpix</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpix</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mpix</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mpix</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpix</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpix</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpix</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mpix</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpix</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mpix</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpix</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpix</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpix</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpix</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukcja rozmazywania</string>
@@ -83,12 +79,14 @@
   <string name="pref_camera_scenemode_entry_text">Tekst</string>
   <string name="pref_camera_scenemode_entry_theatre">Teatr</string>
   <string name="pref_camera_scenemode_entry_whiteboard">Biała tablica</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">Ciągły</string>
   <string name="pref_camera_focusmode_entry_extended">Rozszerzony</string>
   <string name="pref_camera_focusmode_entry_facedetect">Wykrywanie twarzy</string>
   <string name="pref_camera_focusmode_entry_facepriority">Priorytet twarzy</string>
   <string name="pref_camera_focusmode_entry_fixed">Stały</string>
   <string name="pref_camera_focusmode_entry_portrait">Portret</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfokalnie</string>
+  <string name="pref_camera_focusmode_entry_manual">Ręczny</string>
   <string name="pref_camera_coloreffect_entry_washed">Zmyty</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">Klasyczne ciepło</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">Klasyczne zimno</string>
diff --git a/res/values-pl/qcomstrings.xml b/res/values-pl/qcomstrings.xml
index 411922604..ea5bea3fc 100644
--- a/res/values-pl/qcomstrings.xml
+++ b/res/values-pl/qcomstrings.xml
@@ -35,44 +35,46 @@
   <string name="pref_camera_video_duration_entry_10">10 minut</string>
   <string name="pref_camera_video_duration_entry_30">30 minut</string>
   <string name="pref_camera_skinToneEnhancement_title">Poprawa koloru skóry</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Wł.</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Wył.</string>
   <string name="pref_camera_selectablezoneaf_title">Strefa automatycznego wyostrzenia</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatyczne</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Pomiar punktowy</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centralnie ważony</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Średnia ramki</string>
-  <string name="pref_camera_video_hdr_entry_off">Wył.</string>
-  <string name="pref_camera_video_hdr_entry_on">Wł.</string>
   <string name="pref_camera_video_hdr_title">Wideo HDR</string>
   <string name="pref_camera_facedetection_title">Wykrywanie twarzy</string>
-  <string name="pref_camera_facedetection_entry_off">Wył.</string>
-  <string name="pref_camera_facedetection_entry_on">Wł.</string>
   <string name="pref_camera_redeyereduction_title">Redukcja czerwonych oczu</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Wł.</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Wył.</string>
   <string name="error_app_unsupported_hfr">HFR nie jest wspierany dla wskazanej rozdzielczości</string>
   <string name="error_app_unsupported_hfr_codec">Tylko kodek H.264 jest wspierany gdy HFR jest włączone</string>
   <string name="error_app_unsupported">Niewspierana rozdzielczość dla tego kodeka</string>
   <string name="pref_camera_ae_bracket_hdr_title">Autobracketing ekspozycji</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Wł.</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Wył.</string>
   <string name="pref_camera_hfr_title">Zwolnione tempo (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Wył.</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Odszumienie</string>
-  <string name="pref_camera_denoise_entry_off">Wył.</string>
-  <string name="pref_camera_denoise_entry_on">Wł.</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automatyczne</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Antybanding</string>
   <string name="pref_camera_antibanding_entry_0">Wył.</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +97,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Niebieski odcień</string>
   <string name="pref_camera_coloreffect_entry_greentint">Zielony odcień</string>
   <string name="pref_camera_touchafaec_title">Dotykowy AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Wył.</string>
-  <string name="pref_camera_touchafaec_entry_on">Wł.</string>
   <string name="pref_camera_dis_title">Stabilizacja wideo</string>
-  <string name="pref_camera_dis_entry_off">Wył.</string>
-  <string name="pref_camera_dis_entry_on">Wł.</string>
   <string name="pref_camera_facerc_title">Rozpoznawanie twarzy</string>
-  <string name="pref_camera_facerc_entry_off">Wył.</string>
-  <string name="pref_camera_facerc_entry_on">Wł.</string>
+  <string name="pref_camera_sharpness_title">Ostrość</string>
   <string name="pref_camera_sharpness_entry_level0">Poziom 0</string>
   <string name="pref_camera_sharpness_entry_level1">Poziom 1</string>
   <string name="pref_camera_sharpness_entry_level2">Poziom 2 (domyślny)</string>
@@ -110,6 +107,7 @@
   <string name="pref_camera_sharpness_entry_level4">Poziom 4</string>
   <string name="pref_camera_sharpness_entry_level5">Poziom 5</string>
   <string name="pref_camera_sharpness_entry_level6">Poziom 6</string>
+  <string name="pref_camera_contrast_title">Kontrast</string>
   <string name="pref_camera_contrast_entry_level0">Poziom 0</string>
   <string name="pref_camera_contrast_entry_level1">Poziom 1</string>
   <string name="pref_camera_contrast_entry_level2">Poziom 2</string>
@@ -121,6 +119,7 @@
   <string name="pref_camera_contrast_entry_level8">Poziom 8</string>
   <string name="pref_camera_contrast_entry_level9">Poziom 9</string>
   <string name="pref_camera_contrast_entry_level10">Poziom 10</string>
+  <string name="pref_camera_saturation_title">Nasycenie</string>
   <string name="pref_camera_saturation_entry_level0">Poziom 0</string>
   <string name="pref_camera_saturation_entry_level1">Poziom 1</string>
   <string name="pref_camera_saturation_entry_level2">Poziom 2</string>
@@ -132,9 +131,6 @@
   <string name="pref_camera_saturation_entry_level8">Poziom 8</string>
   <string name="pref_camera_saturation_entry_level9">Poziom 9</string>
   <string name="pref_camera_saturation_entry_level10">Poziom 10</string>
-  <string name="pref_camera_sharpness_title">Ostrość</string>
-  <string name="pref_camera_contrast_title">Kontrast</string>
-  <string name="pref_camera_saturation_title">Nasycenie</string>
   <string name="pref_camera_picture_format_title">Format obrazu</string>
   <string name="pref_camera_jpegquality_title">Jakość zdjęć</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +140,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">Wł.</string>
-  <string name="pref_camera_histogram_entry_disable">Wył.</string>
   <string name="pref_camera_scenedetect_title">Automatyczne rozpoznawanie sceny</string>
-  <string name="pref_camera_scenedetect_entry_on">Wł.</string>
-  <string name="pref_camera_scenedetect_entry_off">Wył.</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 5c55eb1bb..eb6850cba 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
   <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
   <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redução de borrões de movimento</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELEZAR</string>
   <string name="camera_menu_asd_label">CENA AUTOMÁTICA</string>
   <string name="pref_camera_power_shutter_title">Disparador c/ botão de energia</string>
+  <string name="pref_camera_max_brightness_title">Tela brilhante</string>
   <string name="pref_superzoom_title">Ampliar</string>
 </resources>
diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml
index 039f3c16b..f277f1588 100644
--- a/res/values-pt-rBR/qcomstrings.xml
+++ b/res/values-pt-rBR/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minutos</string>
   <string name="pref_camera_video_duration_entry_30">30 minutos</string>
   <string name="pref_camera_skinToneEnhancement_title">Melhoria do tom da pele</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Ligado</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desligado</string>
   <string name="pref_camera_selectablezoneaf_title">Zone de auto-foco</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automático</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Mediçãode espaço</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderada central</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Média de frames</string>
-  <string name="pref_camera_video_hdr_entry_off">Desligar</string>
-  <string name="pref_camera_video_hdr_entry_on">Ligar</string>
+  <string name="hdr_enable_message">HDR está ativado, somente o modo de cena Auto é suportado</string>
+  <string name="scene_enable_message">HDR não é suportado em modo de cena diferente de Auto</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
   <string name="pref_camera_facedetection_title">Detecção Facial</string>
-  <string name="pref_camera_facedetection_entry_off">Desligar</string>
-  <string name="pref_camera_facedetection_entry_on">Ligar</string>
   <string name="pref_camera_redeyereduction_title">Redução de olhos vermelhos</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Ligado</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desligado</string>
+  <string name="error_app_unsupported_hfr_selection">HFR não é suportado quando a estabilização de vídeo, passar do tempo ou vídeo HDR estiverem ativados</string>
   <string name="error_app_unsupported_hfr">HFR não é suportado para a resolução selecionada</string>
   <string name="error_app_unsupported_hfr_codec">Só encoding do tipo H.264 é permitido quando o HFR está ligado</string>
   <string name="error_app_unsupported">Resolução de vídeo não suportada para este tipo de codec</string>
+  <string name="error_app_unsupported_dis">A estabilização de vídeo não é suportada para a resolução selecionada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing de auto-exposição</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Ligar</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Desligar</string>
   <string name="pref_camera_hfr_title">Câmara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desligar</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Reduzir ruído</string>
-  <string name="pref_camera_denoise_entry_off">Desligar</string>
-  <string name="pref_camera_denoise_entry_on">Ligar</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automático</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">Desligar</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tom azul</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tom verde</string>
   <string name="pref_camera_touchafaec_title">Toque AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Desligar</string>
-  <string name="pref_camera_touchafaec_entry_on">Ligar</string>
   <string name="pref_camera_dis_title">Estabilização de vídeo</string>
-  <string name="pref_camera_dis_entry_off">Desligar</string>
-  <string name="pref_camera_dis_entry_on">Ligar</string>
   <string name="pref_camera_facerc_title">Reconhecimento facial</string>
-  <string name="pref_camera_facerc_entry_off">Desligar</string>
-  <string name="pref_camera_facerc_entry_on">Ligar</string>
+  <string name="pref_camera_sharpness_title">Áspero</string>
   <string name="pref_camera_sharpness_entry_level0">Nível 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nível 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nível 2 (Padrão)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nível 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nível 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nível 6</string>
+  <string name="pref_camera_contrast_title">Contraste</string>
   <string name="pref_camera_contrast_entry_level0">Nível 0</string>
   <string name="pref_camera_contrast_entry_level1">Nível 1</string>
   <string name="pref_camera_contrast_entry_level2">Nível 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Nível 8</string>
   <string name="pref_camera_contrast_entry_level9">Nível 9</string>
   <string name="pref_camera_contrast_entry_level10">Nível 10</string>
+  <string name="pref_camera_saturation_title">Saturação</string>
   <string name="pref_camera_saturation_entry_level0">Nível 0</string>
   <string name="pref_camera_saturation_entry_level1">Nível 1</string>
   <string name="pref_camera_saturation_entry_level2">Nível 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Nível 8</string>
   <string name="pref_camera_saturation_entry_level9">Nível 9</string>
   <string name="pref_camera_saturation_entry_level10">Nível 10</string>
-  <string name="pref_camera_sharpness_title">Áspero</string>
-  <string name="pref_camera_contrast_title">Contraste</string>
-  <string name="pref_camera_saturation_title">Saturação</string>
   <string name="pref_camera_picture_format_title">Formato de imagem</string>
   <string name="pref_camera_jpegquality_title">Qualidade da imagem</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Ligado</string>
-  <string name="pref_camera_histogram_entry_disable">Desligado</string>
   <string name="pref_camera_scenedetect_title">Auto-Detecção de Cena</string>
-  <string name="pref_camera_scenedetect_entry_on">Ligar</string>
-  <string name="pref_camera_scenedetect_entry_off">Desligar</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index b4b2b9404..3650ad5c4 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
   <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
   <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redução da desfocagem de movimento</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELEZAR</string>
   <string name="camera_menu_asd_label">CENA INTELIGENTE</string>
   <string name="pref_camera_power_shutter_title">Disparar com botão de ligar</string>
+  <string name="pref_camera_max_brightness_title">Ecrã brilhante</string>
   <string name="pref_superzoom_title">Ampliar</string>
 </resources>
diff --git a/res/values-pt-rPT/qcomstrings.xml b/res/values-pt-rPT/qcomstrings.xml
index e49716cf8..38cd8bf53 100644
--- a/res/values-pt-rPT/qcomstrings.xml
+++ b/res/values-pt-rPT/qcomstrings.xml
@@ -29,50 +29,56 @@
   <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada ao centro</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Medição pontual</string>
   <string name="pref_camera_videoencoder_title">Codec de vídeo</string>
-  <string name="pref_camera_audioencoder_title">Codec de áudio.</string>
+  <string name="pref_camera_audioencoder_title">Codec de áudio</string>
   <string name="pref_camera_video_duration_title">Duração do video</string>
   <string name="pref_camera_video_duration_entry_mms">30 segundos (MMS)</string>
   <string name="pref_camera_video_duration_entry_10">10 minutos</string>
   <string name="pref_camera_video_duration_entry_30">30 minutos</string>
   <string name="pref_camera_skinToneEnhancement_title">Melhoria do tom de pele</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Ligado</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desligado</string>
   <string name="pref_camera_selectablezoneaf_title">Zona de focagem automática</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Medição pontual</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderada ao centro</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Média de frames</string>
-  <string name="pref_camera_video_hdr_entry_off">Desligado</string>
-  <string name="pref_camera_video_hdr_entry_on">Ligado</string>
+  <string name="hdr_enable_message">HDR está ativado, só o modo de cenário automático é suportado</string>
+  <string name="scene_enable_message">HDR não é suportado noutro modo de cenário diferente do automático</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
   <string name="pref_camera_facedetection_title">Deteção de rosto</string>
-  <string name="pref_camera_facedetection_entry_off">Desligado</string>
-  <string name="pref_camera_facedetection_entry_on">Ligado</string>
   <string name="pref_camera_redeyereduction_title">Redução de olhos vermelhos</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Ligado</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desligado</string>
+  <string name="error_app_unsupported_hfr_selection">HFR não é suportado quando a estabilização de vídeo ou o video HDR estiverem ativados</string>
   <string name="error_app_unsupported_hfr">HFR não é suportado para a resolução selecionada</string>
   <string name="error_app_unsupported_hfr_codec">Apenas é suportada codificação de vídeo H.264 quando HFR está ligado</string>
   <string name="error_app_unsupported">Resolução de vídeo não suportada para este tipo de codec</string>
+  <string name="error_app_unsupported_dis">A estabilização de vídeo não é suportada para a resolução selecionada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Escalonamento de Exposição Automática</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Ligado</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Desligar</string>
   <string name="pref_camera_hfr_title">Câmara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desligar</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Denoise</string>
-  <string name="pref_camera_denoise_entry_off">Desligado</string>
-  <string name="pref_camera_denoise_entry_on">Ligado</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Evitar bandas</string>
   <string name="pref_camera_antibanding_entry_0">Desligado</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tinta azul</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tinta verde</string>
   <string name="pref_camera_touchafaec_title">Toque AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Desligado</string>
-  <string name="pref_camera_touchafaec_entry_on">Ligado</string>
   <string name="pref_camera_dis_title">Estabilização de vídeo</string>
-  <string name="pref_camera_dis_entry_off">Desligado</string>
-  <string name="pref_camera_dis_entry_on">Ligado</string>
   <string name="pref_camera_facerc_title">Reconhecimento facial</string>
-  <string name="pref_camera_facerc_entry_off">Desligado</string>
-  <string name="pref_camera_facerc_entry_on">Ligado</string>
+  <string name="pref_camera_sharpness_title">Nitidez</string>
   <string name="pref_camera_sharpness_entry_level0">Nível 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nível 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nível 2 (Padrão)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nível 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nível 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nível 6</string>
+  <string name="pref_camera_contrast_title">Contraste</string>
   <string name="pref_camera_contrast_entry_level0">Nível 0</string>
   <string name="pref_camera_contrast_entry_level1">Nível 1</string>
   <string name="pref_camera_contrast_entry_level2">Nível 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Nível 8</string>
   <string name="pref_camera_contrast_entry_level9">Nível 9</string>
   <string name="pref_camera_contrast_entry_level10">Nível 10</string>
+  <string name="pref_camera_saturation_title">Saturação</string>
   <string name="pref_camera_saturation_entry_level0">Nível 0</string>
   <string name="pref_camera_saturation_entry_level1">Nível 1</string>
   <string name="pref_camera_saturation_entry_level2">Nível 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Nível 8</string>
   <string name="pref_camera_saturation_entry_level9">Nível 9</string>
   <string name="pref_camera_saturation_entry_level10">Nível 10</string>
-  <string name="pref_camera_sharpness_title">Nitidez</string>
-  <string name="pref_camera_contrast_title">Contraste</string>
-  <string name="pref_camera_saturation_title">Saturação</string>
   <string name="pref_camera_picture_format_title">Formato da fotografia</string>
   <string name="pref_camera_jpegquality_title">Qualidade da fotografia</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Ligado</string>
-  <string name="pref_camera_histogram_entry_disable">Desligado</string>
   <string name="pref_camera_scenedetect_title">Deteção Automática de Cena</string>
-  <string name="pref_camera_scenedetect_entry_on">Ligado</string>
-  <string name="pref_camera_scenedetect_entry_off">Desligado</string>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 090e583b1..7a6cac8d6 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixeli</string>
   <string name="pref_camera_picturesize_entry_10mp">10M pixeli</string>
   <string name="pref_camera_picturesize_entry_9mp">9M pixeli</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M pixeli</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixeli</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M pixeli</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pixeli</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M pixeli</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pixeli</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M pixeli</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M pixeli</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M pixeli</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M pixeli</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reducerea umbrei de mișcare</string>
diff --git a/res/values-ro/qcomstrings.xml b/res/values-ro/qcomstrings.xml
index 214425f96..d6a171df1 100644
--- a/res/values-ro/qcomstrings.xml
+++ b/res/values-ro/qcomstrings.xml
@@ -39,26 +39,18 @@
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Calculare punct</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centrat</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Media cadrului</string>
-  <string name="pref_camera_video_hdr_entry_off">Dezactivat</string>
-  <string name="pref_camera_video_hdr_entry_on">Activat</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Detectare față</string>
-  <string name="pref_camera_facedetection_entry_off">Dezactivat</string>
-  <string name="pref_camera_facedetection_entry_on">Activat</string>
   <string name="pref_camera_redeyereduction_title">Reducere ochi roșii</string>
   <string name="error_app_unsupported_hfr">HFR nu este acceptată pentru rezoluția selectată</string>
   <string name="error_app_unsupported_hfr_codec">Numai codarea video H.264 este acceptată atunci când HFR este pornit</string>
   <string name="error_app_unsupported">Rezoluția video nu este acceptată de acest tip de codec</string>
   <string name="pref_camera_ae_bracket_hdr_title">Rafală cu expunere automată</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Activat</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Dezactivat</string>
   <string name="pref_camera_hfr_title">Miscare lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Dezactivat</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
-  <string name="pref_camera_denoise_entry_off">Dezactivat</string>
-  <string name="pref_camera_denoise_entry_on">Activat</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
@@ -89,13 +81,8 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tentă albastră</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tentă verde</string>
   <string name="pref_camera_touchafaec_title">Atingeți AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Dezactivat</string>
-  <string name="pref_camera_touchafaec_entry_on">Activat</string>
-  <string name="pref_camera_dis_entry_off">Dezactivat</string>
-  <string name="pref_camera_dis_entry_on">Activat</string>
   <string name="pref_camera_facerc_title">Recunoașterea feței</string>
-  <string name="pref_camera_facerc_entry_off">Dezactivat</string>
-  <string name="pref_camera_facerc_entry_on">Activat</string>
+  <string name="pref_camera_sharpness_title">Claritate</string>
   <string name="pref_camera_sharpness_entry_level0">Nivel 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivel 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivel 2 (implicit)</string>
@@ -103,6 +90,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nivel 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nivel 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nivel 6</string>
+  <string name="pref_camera_contrast_title">Contrast</string>
   <string name="pref_camera_contrast_entry_level0">Nivel 0</string>
   <string name="pref_camera_contrast_entry_level1">Nivel 1</string>
   <string name="pref_camera_contrast_entry_level2">Nivel 2</string>
@@ -114,6 +102,7 @@
   <string name="pref_camera_contrast_entry_level8">Nivel 8</string>
   <string name="pref_camera_contrast_entry_level9">Nivel 9</string>
   <string name="pref_camera_contrast_entry_level10">Nivel 10</string>
+  <string name="pref_camera_saturation_title">Saturație</string>
   <string name="pref_camera_saturation_entry_level0">Nivel 0</string>
   <string name="pref_camera_saturation_entry_level1">Nivel 1</string>
   <string name="pref_camera_saturation_entry_level2">Nivel 2</string>
@@ -125,9 +114,6 @@
   <string name="pref_camera_saturation_entry_level8">Nivel 8</string>
   <string name="pref_camera_saturation_entry_level9">Nivel 9</string>
   <string name="pref_camera_saturation_entry_level10">Nivel 10</string>
-  <string name="pref_camera_sharpness_title">Claritate</string>
-  <string name="pref_camera_contrast_title">Contrast</string>
-  <string name="pref_camera_saturation_title">Saturație</string>
   <string name="pref_camera_picture_format_title">Formatul pozei</string>
   <string name="pref_camera_jpegquality_title">Calitatea imaginii</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -138,6 +124,4 @@
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogramă</string>
   <string name="pref_camera_scenedetect_title">Detectare automată a scenei</string>
-  <string name="pref_camera_scenedetect_entry_on">Activat</string>
-  <string name="pref_camera_scenedetect_entry_off">Dezactivat</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 73a801b8c..b1fa07ef6 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 Мпикс</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Устранение разм. движения</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">АВТОУЛУЧШЕНИЕ</string>
   <string name="camera_menu_asd_label">РАСПОЗН. УСЛОВИЙ СЪЕМКИ</string>
   <string name="pref_camera_power_shutter_title">Съёмка кн. питания</string>
+  <string name="pref_camera_max_brightness_title">Яркий экран</string>
   <string name="pref_superzoom_title">Увеличение</string>
 </resources>
diff --git a/res/values-ru/qcomstrings.xml b/res/values-ru/qcomstrings.xml
index aaea7470c..58fed21de 100644
--- a/res/values-ru/qcomstrings.xml
+++ b/res/values-ru/qcomstrings.xml
@@ -35,44 +35,46 @@
   <string name="pref_camera_video_duration_entry_10">10 минут</string>
   <string name="pref_camera_video_duration_entry_30">30 минут</string>
   <string name="pref_camera_skinToneEnhancement_title">Улучшение цвета кожи</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Вкл.</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Выкл.</string>
   <string name="pref_camera_selectablezoneaf_title">Многозонный автофокус</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Авто</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Точечный замер</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">По центру кадра</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Усреднённый</string>
-  <string name="pref_camera_video_hdr_entry_off">Выкл.</string>
-  <string name="pref_camera_video_hdr_entry_on">Вкл.</string>
   <string name="pref_camera_video_hdr_title">HDR-видеосъёмка</string>
   <string name="pref_camera_facedetection_title">Определение лиц</string>
-  <string name="pref_camera_facedetection_entry_off">Выкл.</string>
-  <string name="pref_camera_facedetection_entry_on">Вкл.</string>
   <string name="pref_camera_redeyereduction_title">Ум. эфф. красных глаз</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Вкл.</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Выкл.</string>
   <string name="error_app_unsupported_hfr">Ускоренная съёмка не поддерживается для текущего разрешения</string>
   <string name="error_app_unsupported_hfr_codec">Ускоренная съёмка возможна только с видеокодеком H264</string>
   <string name="error_app_unsupported">Видеокодек не поддерживает выбранное разрешение</string>
   <string name="pref_camera_ae_bracket_hdr_title">Автобрекетинг</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Вкл.</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Выкл.</string>
   <string name="pref_camera_hfr_title">Ускоренная съёмка (замедл. движ.)</string>
   <string name="pref_camera_hfr_entry_off">Выкл.</string>
   <string name="pref_camera_hfr_entry_2x">60 кадр/с</string>
   <string name="pref_camera_hfr_entry_3x">90 кадр/с</string>
   <string name="pref_camera_hfr_entry_4x">120 кадр/с</string>
   <string name="pref_camera_denoise_title">Шумоподавление</string>
-  <string name="pref_camera_denoise_entry_off">Выкл.</string>
-  <string name="pref_camera_denoise_entry_on">Вкл.</string>
   <string name="pref_camera_iso_title">Значение ISO</string>
   <string name="pref_camera_iso_entry_auto">Авто</string>
   <string name="pref_camera_iso_entry_isodeblur">Aвто (уменьш. размытия)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO 50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO 125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO 250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO 320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO 500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO 640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO 1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO 1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO 1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO 2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO 2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO 3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO 6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO 12800</string>
   <string name="pref_camera_antibanding_title">Подавление мерцания</string>
   <string name="pref_camera_antibanding_entry_0">Выкл.</string>
   <string name="pref_camera_antibanding_entry_1">50 Гц</string>
@@ -95,14 +97,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Синий оттенок</string>
   <string name="pref_camera_coloreffect_entry_greentint">Зелёный оттенок</string>
   <string name="pref_camera_touchafaec_title">Сенсорная фокусировка</string>
-  <string name="pref_camera_touchafaec_entry_off">Выкл.</string>
-  <string name="pref_camera_touchafaec_entry_on">Вкл.</string>
   <string name="pref_camera_dis_title">Стабилизатор изобр.</string>
-  <string name="pref_camera_dis_entry_off">Выкл.</string>
-  <string name="pref_camera_dis_entry_on">Вкл.</string>
   <string name="pref_camera_facerc_title">Распознавание лиц</string>
-  <string name="pref_camera_facerc_entry_off">Выкл.</string>
-  <string name="pref_camera_facerc_entry_on">Вкл.</string>
+  <string name="pref_camera_sharpness_title">Резкость</string>
   <string name="pref_camera_sharpness_entry_level0">Уровень 0</string>
   <string name="pref_camera_sharpness_entry_level1">Уровень 1</string>
   <string name="pref_camera_sharpness_entry_level2">Уровень 2 (по умолч.)</string>
@@ -110,6 +107,7 @@
   <string name="pref_camera_sharpness_entry_level4">Уровень 4</string>
   <string name="pref_camera_sharpness_entry_level5">Уровень 5</string>
   <string name="pref_camera_sharpness_entry_level6">Уровень 6</string>
+  <string name="pref_camera_contrast_title">Контрастность</string>
   <string name="pref_camera_contrast_entry_level0">Уровень 0</string>
   <string name="pref_camera_contrast_entry_level1">Уровень 1</string>
   <string name="pref_camera_contrast_entry_level2">Уровень 2</string>
@@ -121,6 +119,7 @@
   <string name="pref_camera_contrast_entry_level8">Уровень 8</string>
   <string name="pref_camera_contrast_entry_level9">Уровень 9</string>
   <string name="pref_camera_contrast_entry_level10">Уровень 10</string>
+  <string name="pref_camera_saturation_title">Насыщенность</string>
   <string name="pref_camera_saturation_entry_level0">Уровень 0</string>
   <string name="pref_camera_saturation_entry_level1">Уровень 1</string>
   <string name="pref_camera_saturation_entry_level2">Уровень 2</string>
@@ -132,9 +131,6 @@
   <string name="pref_camera_saturation_entry_level8">Уровень 8</string>
   <string name="pref_camera_saturation_entry_level9">Уровень 9</string>
   <string name="pref_camera_saturation_entry_level10">Уровень 10</string>
-  <string name="pref_camera_sharpness_title">Резкость</string>
-  <string name="pref_camera_contrast_title">Контрастность</string>
-  <string name="pref_camera_saturation_title">Насыщенность</string>
   <string name="pref_camera_picture_format_title">Формат изображения</string>
   <string name="pref_camera_jpegquality_title">Качество изображения</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +140,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Гистограмма</string>
-  <string name="pref_camera_histogram_entry_enable">Вкл.</string>
-  <string name="pref_camera_histogram_entry_disable">Выкл.</string>
   <string name="pref_camera_scenedetect_title">Распозн. условий съёмки</string>
-  <string name="pref_camera_scenedetect_entry_on">Вкл.</string>
-  <string name="pref_camera_scenedetect_entry_off">Выкл.</string>
 </resources>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
index bdeaaba90..705f86dc3 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">මෙගා පික්සල 20.7</string>
   <string name="pref_camera_picturesize_entry_18mp">මෙගා පික්සල 18</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">මෙගා පික්සල 15.9 (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">මෙගා පික්සල 12.8</string>
   <string name="pref_camera_picturesize_entry_12_7mp">මෙගා පික්සල 12.7</string>
   <string name="pref_camera_picturesize_entry_12mp">මෙගා පික්සල 12</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">මෙගා පික්සල 11.9</string>
   <string name="pref_camera_picturesize_entry_11_5mp">මෙගා පික්සල 11.5</string>
   <string name="pref_camera_picturesize_entry_10_4mp">මෙගා පික්සල 10.4</string>
   <string name="pref_camera_picturesize_entry_10mp">මෙගා පික්සල 10</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">මෙගා පික්සල 9.7</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">මෙගා පික්සල 9.7 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">මෙගා පික්සල 9</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">මෙගා පික්සල 8.2</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">මෙගා පික්සල 8.2 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">මෙගා පික්සල 7.7</string>
   <string name="pref_camera_picturesize_entry_6_4mp">මෙගා පික්සල 6.4</string>
-  <string name="pref_camera_picturesize_entry_6mp">මෙගා පික්සල 6</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">මෙගා පික්සල 6 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">මෙගා පික්සල 4.5</string>
   <string name="pref_camera_picturesize_entry_4mp">මෙගා පික්සල 4</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">මෙගා පික්සල 3.7</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">මෙගා පික්සල 3.7 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">මෙගා පික්සල 2.5</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">මෙගා පික්සල 2.1</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">මෙගා පික්සල 2.1 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">මෙගා පික්සල 1.9</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">චලන අවිශදතාව අඩුකිරීම</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ලස්සණ කිරීම</string>
   <string name="camera_menu_asd_label">දැකුම්කලු දර්ශනය</string>
   <string name="pref_camera_power_shutter_title">බල ශටරය</string>
+  <string name="pref_camera_max_brightness_title">දීප්තිමත් තිරය</string>
   <string name="pref_superzoom_title">විශාලනය කරන්න</string>
 </resources>
diff --git a/res/values-si/qcomstrings.xml b/res/values-si/qcomstrings.xml
index 828833954..1b1365a02 100644
--- a/res/values-si/qcomstrings.xml
+++ b/res/values-si/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">මිනිත්තු 10</string>
   <string name="pref_camera_video_duration_entry_30">මිනිත්තු 30</string>
   <string name="pref_camera_skinToneEnhancement_title">හමේ වර්ණය වැඩි කිරීම</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">සක්‍රීයයි</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">අක්‍රීයයි</string>
   <string name="pref_camera_selectablezoneaf_title">ස්වයං නාභිගත පෙදෙස</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">ස්වයං</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">තැන මානනය</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">මධ්‍ය භරිත</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">රාමු සාමාන්‍යය</string>
-  <string name="pref_camera_video_hdr_entry_off">අක්‍රීයයි</string>
-  <string name="pref_camera_video_hdr_entry_on">සක්‍රීයයි</string>
+  <string name="hdr_enable_message">HDR සබලයි, ස්වයං දර්ශන ප්‍රකාරය පමණක් සහාය දක්වයි</string>
+  <string name="scene_enable_message">දර්ශන ප්‍රකාරයේ ස්වයං ප්‍රකාරයට අමතරව HDR සහාය නොදක්වයි</string>
   <string name="pref_camera_video_hdr_title">වීඩියෝ HDR</string>
   <string name="pref_camera_facedetection_title">මුහුණ අබික්සුම</string>
-  <string name="pref_camera_facedetection_entry_off">අක්‍රීයයි</string>
-  <string name="pref_camera_facedetection_entry_on">සක්‍රීයයි</string>
   <string name="pref_camera_redeyereduction_title">රතු ඇස අවකරණය</string>
-  <string name="pref_camera_redeyereduction_entry_enable">සක්‍රීයයි</string>
-  <string name="pref_camera_redeyereduction_entry_disable">අක්‍රීයයි</string>
+  <string name="error_app_unsupported_hfr_selection">වීඩියෝ ස්ථාවරකිරීම, වේලා දෝෂය හෝ වීඩියෝ HDR සක්‍රීය විට HFR සහාය නොදක්වයි</string>
   <string name="error_app_unsupported_hfr">තෝරාගත් විභේදනය සඳහා HFR සහාය නොදක්වයි</string>
   <string name="error_app_unsupported_hfr_codec">HFR සක්‍රීය විට H.264 වීඩියෝ සංකේතනය පමණක් සහාය දක්වයි</string>
   <string name="error_app_unsupported">මෙම කොඩෙක් ආකාරය සඳහා සහාය නොදක්වන වීඩියෝ විභේදනයකි</string>
+  <string name="error_app_unsupported_dis">තෝරාගත් විභේදනය සඳහා වීඩියෝ ස්ථාවරකිරීම සහාය නොදක්වයි</string>
   <string name="pref_camera_ae_bracket_hdr_title">ස්වයං නිරාවරණ සවිකිරීම</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">සක්‍රීයයි</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">අක්‍රීයයි</string>
   <string name="pref_camera_hfr_title">මන්ද චලනය (HFR)</string>
   <string name="pref_camera_hfr_entry_off">අක්‍රීයයි</string>
   <string name="pref_camera_hfr_entry_2x">තත්පරයට රාමු 60</string>
   <string name="pref_camera_hfr_entry_3x">තත්පරයට රාමු 90</string>
   <string name="pref_camera_hfr_entry_4x">තත්පරයට රාමු 120</string>
   <string name="pref_camera_denoise_title">නිශ්චල</string>
-  <string name="pref_camera_denoise_entry_off">අක්‍රීයයි</string>
-  <string name="pref_camera_denoise_entry_on">සක්‍රීයයි</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">ස්වයං</string>
   <string name="pref_camera_iso_entry_isodeblur">ස්වයං (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">ප්‍රතිපටිලෑම</string>
   <string name="pref_camera_antibanding_entry_0">අක්‍රීයයි</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">නිල් මදපැහැය</string>
   <string name="pref_camera_coloreffect_entry_greentint">කොළ මදපැහැය</string>
   <string name="pref_camera_touchafaec_title">AF/AEC ස්පර්ශය</string>
-  <string name="pref_camera_touchafaec_entry_off">අක්‍රීයයි</string>
-  <string name="pref_camera_touchafaec_entry_on">සක්‍රීයයි</string>
   <string name="pref_camera_dis_title">වීඩියෝ ස්ථාවරකිරීම</string>
-  <string name="pref_camera_dis_entry_off">අක්‍රීයයි</string>
-  <string name="pref_camera_dis_entry_on">සක්‍රීයයි</string>
   <string name="pref_camera_facerc_title">මුහුණ හඳුනාගැනීම</string>
-  <string name="pref_camera_facerc_entry_off">අක්‍රීයයි</string>
-  <string name="pref_camera_facerc_entry_on">සක්‍රීයයි</string>
+  <string name="pref_camera_sharpness_title">තියුණු බව</string>
   <string name="pref_camera_sharpness_entry_level0">0 මට්ටම</string>
   <string name="pref_camera_sharpness_entry_level1">1 මට්ටම</string>
   <string name="pref_camera_sharpness_entry_level2">2 මට්ටම (පෙරනිමි)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">4 මට්ටම</string>
   <string name="pref_camera_sharpness_entry_level5">5 මට්ටම</string>
   <string name="pref_camera_sharpness_entry_level6">6 මට්ටම</string>
+  <string name="pref_camera_contrast_title">විලක්ෂණය</string>
   <string name="pref_camera_contrast_entry_level0">0 මට්ටම</string>
   <string name="pref_camera_contrast_entry_level1">1 මට්ටම</string>
   <string name="pref_camera_contrast_entry_level2">2 මට්ටම</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">8 මට්ටම</string>
   <string name="pref_camera_contrast_entry_level9">9 මට්ටම</string>
   <string name="pref_camera_contrast_entry_level10">10 මට්ටම</string>
+  <string name="pref_camera_saturation_title">සන්තෘප්තිය</string>
   <string name="pref_camera_saturation_entry_level0">0 මට්ටම</string>
   <string name="pref_camera_saturation_entry_level1">1 මට්ටම</string>
   <string name="pref_camera_saturation_entry_level2">2 මට්ටම</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">8 මට්ටම</string>
   <string name="pref_camera_saturation_entry_level9">9 මට්ටම</string>
   <string name="pref_camera_saturation_entry_level10">10 මට්ටම</string>
-  <string name="pref_camera_sharpness_title">තියුණු බව</string>
-  <string name="pref_camera_contrast_title">විලක්ෂණය</string>
-  <string name="pref_camera_saturation_title">සන්තෘප්තිය</string>
   <string name="pref_camera_picture_format_title">සේයා ආකෘතිය</string>
   <string name="pref_camera_jpegquality_title">සේයාවේ ගුණත්වය</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">සංඛ්‍යාත ප්‍රස්තාරය</string>
-  <string name="pref_camera_histogram_entry_enable">සක්‍රීයයි</string>
-  <string name="pref_camera_histogram_entry_disable">අක්‍රීයයි</string>
   <string name="pref_camera_scenedetect_title">ස්වයං දර්ශන අබික්සුම</string>
-  <string name="pref_camera_scenedetect_entry_on">සක්‍රීයයි</string>
-  <string name="pref_camera_scenedetect_entry_off">අක්‍රීයයි</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 05a211e02..dd52ce6bc 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Mpx</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpx</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mpx</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 Mpx</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpx</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpx</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mpx</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mpx</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpx</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mpx</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpx</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpx</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpx</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukcia rozmazania pohybu</string>
@@ -84,12 +86,14 @@
   <string name="pref_camera_scenemode_entry_text">Text</string>
   <string name="pref_camera_scenemode_entry_theatre">Divadlo</string>
   <string name="pref_camera_scenemode_entry_whiteboard">Biela tabuľa</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">Neustály</string>
   <string name="pref_camera_focusmode_entry_extended">Rozšírené</string>
   <string name="pref_camera_focusmode_entry_facedetect">Rozpoznanie tváre</string>
   <string name="pref_camera_focusmode_entry_facepriority">Priorita tváre</string>
   <string name="pref_camera_focusmode_entry_fixed">Pevné</string>
   <string name="pref_camera_focusmode_entry_portrait">Portrét</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfokálne</string>
+  <string name="pref_camera_focusmode_entry_manual">Ručne</string>
   <string name="pref_camera_coloreffect_entry_washed">Degradácia</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">Teplé staré</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">Chladné staré</string>
@@ -129,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">SKRÁŠLENIE</string>
   <string name="camera_menu_asd_label">INTELIGENTNÁ SCÉNA</string>
   <string name="pref_camera_power_shutter_title">Uzávierka tlačidlom napájania</string>
+  <string name="pref_camera_max_brightness_title">Jasná obrazovka</string>
   <string name="pref_superzoom_title">Zväčšenie</string>
 </resources>
diff --git a/res/values-sk/qcomstrings.xml b/res/values-sk/qcomstrings.xml
index 0e010cb64..5d92f936c 100644
--- a/res/values-sk/qcomstrings.xml
+++ b/res/values-sk/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minút</string>
   <string name="pref_camera_video_duration_entry_30">30 minút</string>
   <string name="pref_camera_skinToneEnhancement_title">Vylepšenia tónu pleti</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Zapnuté</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Vypnuté</string>
   <string name="pref_camera_selectablezoneaf_title">Zóna automatického zaostrovania</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automaticky</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Bodové meranie</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Na stred</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Priemer rámu</string>
-  <string name="pref_camera_video_hdr_entry_off">Vypnuté</string>
-  <string name="pref_camera_video_hdr_entry_on">Zap.</string>
+  <string name="hdr_enable_message">HDR je povolené, podporovaný je iba Automatickom režime scény</string>
+  <string name="scene_enable_message">HDR nie je podporované v režime scény inej ako Automatickej</string>
   <string name="pref_camera_video_hdr_title">HDR video</string>
   <string name="pref_camera_facedetection_title">Detekcia tvárí</string>
-  <string name="pref_camera_facedetection_entry_off">Vypnuté</string>
-  <string name="pref_camera_facedetection_entry_on">Zap.</string>
   <string name="pref_camera_redeyereduction_title">Redukcia červených očí</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Zapnuté</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Vypnuté</string>
+  <string name="error_app_unsupported_hfr_selection">HFR nie je podporované pri stabilizácii videa, časového oneskorenia alebo pri zapnutom HDR videu</string>
   <string name="error_app_unsupported_hfr">HFR nie je podporované pre vybrané rozlíšenie</string>
   <string name="error_app_unsupported_hfr_codec">Kódovanie videa H.264 je podporované iba pri zapnutom HFR</string>
   <string name="error_app_unsupported">Nepodporované rozlíšenie videa pre tento typ kodeka</string>
+  <string name="error_app_unsupported_dis">Stabilizácia videa nie je podporovaná pre vybraté rozlíšenie</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatické posúvanie expozície</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Zap.</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Vypnuté</string>
   <string name="pref_camera_hfr_title">Spomalenie (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Vypnuté</string>
   <string name="pref_camera_hfr_entry_2x">60 snímkov za sekundu</string>
   <string name="pref_camera_hfr_entry_3x">90 snímkov za sekundu</string>
   <string name="pref_camera_hfr_entry_4x">120 snímkov za sekundu</string>
   <string name="pref_camera_denoise_title">Odstránenie šumu</string>
-  <string name="pref_camera_denoise_entry_off">Vypnuté</string>
-  <string name="pref_camera_denoise_entry_on">Zap.</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Automaticky</string>
   <string name="pref_camera_iso_entry_isodeblur">Automatické (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO 50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO 125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO 250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO 320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO 500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO 640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO 1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO 1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO 1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO 2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO 2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO 3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO 6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO 12800</string>
   <string name="pref_camera_antibanding_title">Potlačenie blikania obrazu</string>
   <string name="pref_camera_antibanding_entry_0">Vypnuté</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Modrý odtieň</string>
   <string name="pref_camera_coloreffect_entry_greentint">Zelený odtieň</string>
   <string name="pref_camera_touchafaec_title">Dotykový AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Vypnuté</string>
-  <string name="pref_camera_touchafaec_entry_on">Zap.</string>
   <string name="pref_camera_dis_title">Stabilizácia videa</string>
-  <string name="pref_camera_dis_entry_off">Vypnuté</string>
-  <string name="pref_camera_dis_entry_on">Zap.</string>
   <string name="pref_camera_facerc_title">Rozpoznávanie tvárí</string>
-  <string name="pref_camera_facerc_entry_off">Vypnuté</string>
-  <string name="pref_camera_facerc_entry_on">Zap.</string>
+  <string name="pref_camera_sharpness_title">Ostrosť</string>
   <string name="pref_camera_sharpness_entry_level0">Úroveň 0</string>
   <string name="pref_camera_sharpness_entry_level1">Úroveň 1</string>
   <string name="pref_camera_sharpness_entry_level2">Úroveň 2 (Predvolené)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Úroveň 4</string>
   <string name="pref_camera_sharpness_entry_level5">Úroveň 5</string>
   <string name="pref_camera_sharpness_entry_level6">Úroveň 6</string>
+  <string name="pref_camera_contrast_title">Kontrast</string>
   <string name="pref_camera_contrast_entry_level0">Úroveň 0</string>
   <string name="pref_camera_contrast_entry_level1">Úroveň 1</string>
   <string name="pref_camera_contrast_entry_level2">Úroveň 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Úroveň 8</string>
   <string name="pref_camera_contrast_entry_level9">Úroveň 9</string>
   <string name="pref_camera_contrast_entry_level10">Úroveň 10</string>
+  <string name="pref_camera_saturation_title">Sýtosť</string>
   <string name="pref_camera_saturation_entry_level0">Úroveň 0</string>
   <string name="pref_camera_saturation_entry_level1">Úroveň 1</string>
   <string name="pref_camera_saturation_entry_level2">Úroveň 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Úroveň 8</string>
   <string name="pref_camera_saturation_entry_level9">Úroveň 9</string>
   <string name="pref_camera_saturation_entry_level10">Úroveň 10</string>
-  <string name="pref_camera_sharpness_title">Ostrosť</string>
-  <string name="pref_camera_contrast_title">Kontrast</string>
-  <string name="pref_camera_saturation_title">Sýtosť</string>
   <string name="pref_camera_picture_format_title">Formát obrázkov</string>
   <string name="pref_camera_jpegquality_title">Kvalita obrázkov</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">Zapnuté</string>
-  <string name="pref_camera_histogram_entry_disable">Vypnuté</string>
   <string name="pref_camera_scenedetect_title">Automatická detekcia scény</string>
-  <string name="pref_camera_scenedetect_entry_on">Zap.</string>
-  <string name="pref_camera_scenedetect_entry_off">Vypnuté</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 416e77816..8e6f11b6f 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_18mp">18 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_12mp">12 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_10mp">10 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_4mp">4 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Редукција замагљеног покрета</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">УЛЕПШАВАЊЕ</string>
   <string name="camera_menu_asd_label">ПАМЕТНА СЦЕНА</string>
   <string name="pref_camera_power_shutter_title">Алтернативни окидач</string>
+  <string name="pref_camera_max_brightness_title">Светли екран</string>
   <string name="pref_superzoom_title">Увеличај</string>
 </resources>
diff --git a/res/values-sr/qcomstrings.xml b/res/values-sr/qcomstrings.xml
index b78883857..6f8be47a1 100644
--- a/res/values-sr/qcomstrings.xml
+++ b/res/values-sr/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 минута</string>
   <string name="pref_camera_video_duration_entry_30">30 минута</string>
   <string name="pref_camera_skinToneEnhancement_title">Унапређење тона коже</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Укључено</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Искључено</string>
   <string name="pref_camera_selectablezoneaf_title">Зона аутофокуса</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Аутоматски</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Мерење места</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Притиснут центар</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Просек оквира</string>
-  <string name="pref_camera_video_hdr_entry_off">Искључено</string>
-  <string name="pref_camera_video_hdr_entry_on">Укључено</string>
+  <string name="hdr_enable_message">HDR је омогућен, само аутоматски режим сцене је подржан</string>
+  <string name="scene_enable_message">HDR није подржан у моду сцене осим у Ауто</string>
   <string name="pref_camera_video_hdr_title">HDR Видео</string>
   <string name="pref_camera_facedetection_title">Детекција лица</string>
-  <string name="pref_camera_facedetection_entry_off">Искључено</string>
-  <string name="pref_camera_facedetection_entry_on">Укључено</string>
   <string name="pref_camera_redeyereduction_title">Редукција црвених очију</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Укључено</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Искључено</string>
+  <string name="error_app_unsupported_hfr_selection">HFR није подржан када је видео стабилизација, проток времена или видео HDR укључен</string>
   <string name="error_app_unsupported_hfr">HFR није подржан за изабрану резолуцију</string>
   <string name="error_app_unsupported_hfr_codec">Само H.264 видео кодирање је подржано када је HFR укључен</string>
   <string name="error_app_unsupported">Неподржана видео резолуција за овај тип кодека</string>
+  <string name="error_app_unsupported_dis">Видео стабилизација није подржана за одабрану резолуцију</string>
   <string name="pref_camera_ae_bracket_hdr_title">Држање аутоматске експозиције</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Укључено</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Искључено</string>
   <string name="pref_camera_hfr_title">Успорено кретање (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Искључено</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Потискивање буке</string>
-  <string name="pref_camera_denoise_entry_off">Искључено</string>
-  <string name="pref_camera_denoise_entry_on">Укључено</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Аутоматски</string>
   <string name="pref_camera_iso_entry_isodeblur">Аутоматски (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Смањивање трептања</string>
   <string name="pref_camera_antibanding_entry_0">Искључено</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Плава нијанса</string>
   <string name="pref_camera_coloreffect_entry_greentint">Зелена нијанса</string>
   <string name="pref_camera_touchafaec_title">Додирни AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Искључено</string>
-  <string name="pref_camera_touchafaec_entry_on">Укључено</string>
   <string name="pref_camera_dis_title">Стабилизација видеа</string>
-  <string name="pref_camera_dis_entry_off">Искључено</string>
-  <string name="pref_camera_dis_entry_on">Укључено</string>
   <string name="pref_camera_facerc_title">Препознавање лица</string>
-  <string name="pref_camera_facerc_entry_off">Искључено</string>
-  <string name="pref_camera_facerc_entry_on">Укључено</string>
+  <string name="pref_camera_sharpness_title">Оштрина</string>
   <string name="pref_camera_sharpness_entry_level0">Ниво 1</string>
   <string name="pref_camera_sharpness_entry_level1">Ниво 1</string>
   <string name="pref_camera_sharpness_entry_level2">Ниво 2 (Подразумевано)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Ниво 4</string>
   <string name="pref_camera_sharpness_entry_level5">Ниво 5</string>
   <string name="pref_camera_sharpness_entry_level6">Ниво 6</string>
+  <string name="pref_camera_contrast_title">Контраст</string>
   <string name="pref_camera_contrast_entry_level0">Ниво 1</string>
   <string name="pref_camera_contrast_entry_level1">Ниво 1</string>
   <string name="pref_camera_contrast_entry_level2">Ниво 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Ниво 8</string>
   <string name="pref_camera_contrast_entry_level9">Ниво 9</string>
   <string name="pref_camera_contrast_entry_level10">Ниво 10</string>
+  <string name="pref_camera_saturation_title">Засићење</string>
   <string name="pref_camera_saturation_entry_level0">Ниво 0</string>
   <string name="pref_camera_saturation_entry_level1">Ниво 1</string>
   <string name="pref_camera_saturation_entry_level2">Ниво 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Ниво 8</string>
   <string name="pref_camera_saturation_entry_level9">Ниво 9</string>
   <string name="pref_camera_saturation_entry_level10">Ниво 10</string>
-  <string name="pref_camera_sharpness_title">Оштрина</string>
-  <string name="pref_camera_contrast_title">Контраст</string>
-  <string name="pref_camera_saturation_title">Засићење</string>
   <string name="pref_camera_picture_format_title">Формат слике</string>
   <string name="pref_camera_jpegquality_title">Квалитет слике</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Хистограм</string>
-  <string name="pref_camera_histogram_entry_enable">Укључено</string>
-  <string name="pref_camera_histogram_entry_disable">Искључено</string>
   <string name="pref_camera_scenedetect_title">Аутоматска детекција сцена</string>
-  <string name="pref_camera_scenedetect_entry_on">Укључено</string>
-  <string name="pref_camera_scenedetect_entry_off">Искључено</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index d86b87e5a..b4a38c8d3 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixlar</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapixlar</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapixlar</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixlar</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixlar</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixlar</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixlar</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixlar</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixlar</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixlar</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixlar</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixlar</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixlar</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reducera rörelseoskärpa</string>
diff --git a/res/values-sv/qcomstrings.xml b/res/values-sv/qcomstrings.xml
index 746f72c3f..adffd6ee3 100644
--- a/res/values-sv/qcomstrings.xml
+++ b/res/values-sv/qcomstrings.xml
@@ -39,26 +39,18 @@
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Punktmätning</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Mittvägd</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Bildgenomsnitt</string>
-  <string name="pref_camera_video_hdr_entry_off">Av</string>
-  <string name="pref_camera_video_hdr_entry_on">På</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Ansiktsigenkänning</string>
-  <string name="pref_camera_facedetection_entry_off">Av</string>
-  <string name="pref_camera_facedetection_entry_on">På</string>
   <string name="pref_camera_redeyereduction_title">Röda ögon-reduktion</string>
   <string name="error_app_unsupported_hfr">HFR fungerar inte med vald upplösning</string>
   <string name="error_app_unsupported_hfr_codec">Endast H.264-kodning fungerar med HFR</string>
   <string name="error_app_unsupported">Videoupplösningen fungerar inte med denna kodek</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">På</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Av</string>
   <string name="pref_camera_hfr_title">Slow Motion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Av</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
-  <string name="pref_camera_denoise_entry_off">Av</string>
-  <string name="pref_camera_denoise_entry_on">På</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
@@ -89,14 +81,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Blå toning</string>
   <string name="pref_camera_coloreffect_entry_greentint">Grön toning</string>
   <string name="pref_camera_touchafaec_title">AF/AEC vid pekning</string>
-  <string name="pref_camera_touchafaec_entry_off">Av</string>
-  <string name="pref_camera_touchafaec_entry_on">På</string>
   <string name="pref_camera_dis_title">Videostabilisering</string>
-  <string name="pref_camera_dis_entry_off">Av</string>
-  <string name="pref_camera_dis_entry_on">På</string>
   <string name="pref_camera_facerc_title">Ansiktsigenkänning</string>
-  <string name="pref_camera_facerc_entry_off">Av</string>
-  <string name="pref_camera_facerc_entry_on">På</string>
+  <string name="pref_camera_sharpness_title">Skärpa</string>
   <string name="pref_camera_sharpness_entry_level0">Nivå 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivå 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivå 2 (Standard)</string>
@@ -104,6 +91,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nivå 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nivå 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nivå 6</string>
+  <string name="pref_camera_contrast_title">Kontrast</string>
   <string name="pref_camera_contrast_entry_level0">Nivå 0</string>
   <string name="pref_camera_contrast_entry_level1">Nivå 1</string>
   <string name="pref_camera_contrast_entry_level2">Nivå 2</string>
@@ -115,6 +103,7 @@
   <string name="pref_camera_contrast_entry_level8">Nivå 8</string>
   <string name="pref_camera_contrast_entry_level9">Nivå 9</string>
   <string name="pref_camera_contrast_entry_level10">Nivå 10</string>
+  <string name="pref_camera_saturation_title">Mättnad</string>
   <string name="pref_camera_saturation_entry_level0">Nivå 0</string>
   <string name="pref_camera_saturation_entry_level1">Nivå 1</string>
   <string name="pref_camera_saturation_entry_level2">Nivå 2</string>
@@ -126,9 +115,6 @@
   <string name="pref_camera_saturation_entry_level8">Nivå 8</string>
   <string name="pref_camera_saturation_entry_level9">Nivå 9</string>
   <string name="pref_camera_saturation_entry_level10">Nivå 10</string>
-  <string name="pref_camera_sharpness_title">Skärpa</string>
-  <string name="pref_camera_contrast_title">Kontrast</string>
-  <string name="pref_camera_saturation_title">Mättnad</string>
   <string name="pref_camera_picture_format_title">Bildformat</string>
   <string name="pref_camera_jpegquality_title">Bildkvalitet</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -138,9 +124,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">På</string>
-  <string name="pref_camera_histogram_entry_disable">Av</string>
   <string name="pref_camera_scenedetect_title">Automatisk scendetektion</string>
-  <string name="pref_camera_scenedetect_entry_on">På</string>
-  <string name="pref_camera_scenedetect_entry_off">Av</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 6af9f565b..e44a4f6ca 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_18mp">18 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_12mp">12 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_10mp">10 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_4mp">4 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">ลดเบลอเคลื่อนไหว</string>
@@ -84,12 +86,14 @@
   <string name="pref_camera_scenemode_entry_text">ข้อความ</string>
   <string name="pref_camera_scenemode_entry_theatre">โรงละคร</string>
   <string name="pref_camera_scenemode_entry_whiteboard">กระดานดำ</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">ต่อเนื่อง</string>
   <string name="pref_camera_focusmode_entry_extended">ขยายออก</string>
   <string name="pref_camera_focusmode_entry_facedetect">ตรวจสอบใบหน้า</string>
   <string name="pref_camera_focusmode_entry_facepriority">ให้ใบหน้าสำคัญ</string>
   <string name="pref_camera_focusmode_entry_fixed">คงที่</string>
   <string name="pref_camera_focusmode_entry_portrait">ถ่ายภาพบุคคล</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">โฟกัสมากเกิน</string>
+  <string name="pref_camera_focusmode_entry_manual">ปรับเอง</string>
   <string name="pref_camera_coloreffect_entry_washed">ล้าง</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">วินเทจอบอุ่น</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">วินเทจเย็น</string>
@@ -129,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ตกแต่ง</string>
   <string name="camera_menu_asd_label">สมาร์ทซีน</string>
   <string name="pref_camera_power_shutter_title">ชัตเตอร์ปุ่มเพาเวอร์</string>
+  <string name="pref_camera_max_brightness_title">หน้าจอสว่าง</string>
   <string name="pref_superzoom_title">ขยาย</string>
 </resources>
diff --git a/res/values-th/qcomstrings.xml b/res/values-th/qcomstrings.xml
index c66b7c2da..adaf4b866 100644
--- a/res/values-th/qcomstrings.xml
+++ b/res/values-th/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 นาที</string>
   <string name="pref_camera_video_duration_entry_30">30 นาที</string>
   <string name="pref_camera_skinToneEnhancement_title">ปรับโทนสีผิว</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">เปิด</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">ปิด</string>
   <string name="pref_camera_selectablezoneaf_title">บริเวณโฟกัสอัตโนมัติ</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">อัตโนมัติ</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">จุดวัดแสง</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">ศูนย์ถ่วงน้ำหนัก</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">ค่าเฉลี่ยของเฟรม</string>
-  <string name="pref_camera_video_hdr_entry_off">ปิด</string>
-  <string name="pref_camera_video_hdr_entry_on">เปิด</string>
+  <string name="hdr_enable_message">เปิดใช้งาน HDR ,ลองรับเฉพาะรูปแบบซีนอัตโนมัติเท่านั้น</string>
+  <string name="scene_enable_message">HDR ไม่รองรับรูปแบบซีนอื่นนอกจากอัตโนมัติ</string>
   <string name="pref_camera_video_hdr_title">วิดีโอ HDR</string>
   <string name="pref_camera_facedetection_title">ตรวจจับใบหน้า</string>
-  <string name="pref_camera_facedetection_entry_off">ปิด</string>
-  <string name="pref_camera_facedetection_entry_on">เปิด</string>
   <string name="pref_camera_redeyereduction_title">ลดตาแดง</string>
-  <string name="pref_camera_redeyereduction_entry_enable">เปิด</string>
-  <string name="pref_camera_redeyereduction_entry_disable">ปิด</string>
+  <string name="error_app_unsupported_hfr_selection">HFR ไม่สามารถใช้งานได้ขณะใช้งานลดกานสั่นวิดีโอ Time lapse หรือวิดีโอ HDR อยู่</string>
   <string name="error_app_unsupported_hfr">HFR ไม่สนับสนุนความละเอียดที่เลือก</string>
   <string name="error_app_unsupported_hfr_codec">เข้ารหัสได้เฉพาะ H.264 เมื่อเปิด HFR</string>
   <string name="error_app_unsupported">ไม่รองรับขนาดที่เลือกสำหรับการเข้ารหัสนี้</string>
+  <string name="error_app_unsupported_dis">ลดการสั่นของวิดีโอไม่สามารถใช้งานได้ในความละเอียดนี้</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">เปิด</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">ปิด</string>
   <string name="pref_camera_hfr_title">Slow Motion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">ปิด</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">ลดการรบกวน</string>
-  <string name="pref_camera_denoise_entry_off">ปิด</string>
-  <string name="pref_camera_denoise_entry_on">เปิด</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">อัตโนมัติ</string>
   <string name="pref_camera_iso_entry_isodeblur">อัตโนมัติ (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">ปิด</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">เน้นสีฟ้า</string>
   <string name="pref_camera_coloreffect_entry_greentint">เน้นสีเขียว</string>
   <string name="pref_camera_touchafaec_title">แตะ AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">ปิด</string>
-  <string name="pref_camera_touchafaec_entry_on">เปิด</string>
   <string name="pref_camera_dis_title">วิดีโอเสถียร</string>
-  <string name="pref_camera_dis_entry_off">ปิด</string>
-  <string name="pref_camera_dis_entry_on">เปิด</string>
   <string name="pref_camera_facerc_title">จดจำใบหน้า</string>
-  <string name="pref_camera_facerc_entry_off">ปิด</string>
-  <string name="pref_camera_facerc_entry_on">เปิด</string>
+  <string name="pref_camera_sharpness_title">ความคมชัด</string>
   <string name="pref_camera_sharpness_entry_level0">ระดับ 0</string>
   <string name="pref_camera_sharpness_entry_level1">ระดับ 1</string>
   <string name="pref_camera_sharpness_entry_level2">ระดับ 2 (เริ่มต้น)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">ระดับ 4</string>
   <string name="pref_camera_sharpness_entry_level5">ระดับ 5</string>
   <string name="pref_camera_sharpness_entry_level6">ระดับ 6</string>
+  <string name="pref_camera_contrast_title">ความ​เข้ม</string>
   <string name="pref_camera_contrast_entry_level0">ระดับ 0</string>
   <string name="pref_camera_contrast_entry_level1">ระดับ 1</string>
   <string name="pref_camera_contrast_entry_level2">ระดับ 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">ระดับ 8</string>
   <string name="pref_camera_contrast_entry_level9">ระดับ 9</string>
   <string name="pref_camera_contrast_entry_level10">ระดับ 10</string>
+  <string name="pref_camera_saturation_title">ความอิ่มตัว</string>
   <string name="pref_camera_saturation_entry_level0">ระดับ 0</string>
   <string name="pref_camera_saturation_entry_level1">ระดับ 1</string>
   <string name="pref_camera_saturation_entry_level2">ระดับ 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">ระดับ 8</string>
   <string name="pref_camera_saturation_entry_level9">ระดับ 9</string>
   <string name="pref_camera_saturation_entry_level10">ระดับ 10</string>
-  <string name="pref_camera_sharpness_title">ความคมชัด</string>
-  <string name="pref_camera_contrast_title">ความ​เข้ม</string>
-  <string name="pref_camera_saturation_title">ความอิ่มตัว</string>
   <string name="pref_camera_picture_format_title">นามสกุลรูปภาพ</string>
   <string name="pref_camera_jpegquality_title">คุณภาพของภาพ</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">ฮิสโตแกรม</string>
-  <string name="pref_camera_histogram_entry_enable">เปิด</string>
-  <string name="pref_camera_histogram_entry_disable">ปิด</string>
   <string name="pref_camera_scenedetect_title">ตรวจสอบฉากอัตโนมัติ</string>
-  <string name="pref_camera_scenedetect_entry_on">เปิด</string>
-  <string name="pref_camera_scenedetect_entry_off">ปิด</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 4fec3afee..700654b2b 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7M piksel</string>
   <string name="pref_camera_picturesize_entry_18mp">18M piksel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8M piksel</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7M piksel</string>
   <string name="pref_camera_picturesize_entry_12mp">12M piksel</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9M piksel</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M piksel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M piksel</string>
   <string name="pref_camera_picturesize_entry_10mp">10M piksel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 Megapiksel</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9M piksel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M piksel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M piksel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M piksel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M piksel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M piksel</string>
   <string name="pref_camera_picturesize_entry_4mp">4M piksel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M piksel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M piksel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M piksel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M piksel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Hareket bulanıklığı düşürücü</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">GÜZELLİK</string>
   <string name="camera_menu_asd_label">AKILLI SAHNE</string>
   <string name="pref_camera_power_shutter_title">Güç tuşuyla çek</string>
+  <string name="pref_camera_max_brightness_title">Parlak ekran</string>
   <string name="pref_superzoom_title">Büyüt</string>
 </resources>
diff --git a/res/values-tr/qcomstrings.xml b/res/values-tr/qcomstrings.xml
index 0ba4ebbe1..4d7e661b7 100644
--- a/res/values-tr/qcomstrings.xml
+++ b/res/values-tr/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 dakika</string>
   <string name="pref_camera_video_duration_entry_30">30 dakika</string>
   <string name="pref_camera_skinToneEnhancement_title">Cilt rengi geliştirmesi</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Açık</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Kapalı</string>
   <string name="pref_camera_selectablezoneaf_title">Otomatik odaklama alanı</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Oto</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Nokta ölçümlü</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Orta ağırlıklı</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Çerçeve ortalaması</string>
-  <string name="pref_camera_video_hdr_entry_off">Kapalı</string>
-  <string name="pref_camera_video_hdr_entry_on">Açık</string>
+  <string name="hdr_enable_message">HDR etkinleştirildi, sadece Otomatik mod destekleniyor</string>
+  <string name="scene_enable_message">HDR, Otomatik mod dışında sahne modunda desteklenmiyor</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Yüz tanıma</string>
-  <string name="pref_camera_facedetection_entry_off">Kapalı</string>
-  <string name="pref_camera_facedetection_entry_on">Açık</string>
   <string name="pref_camera_redeyereduction_title">Kırmızı göz giderme</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Açık</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Kapalı</string>
+  <string name="error_app_unsupported_hfr_selection">HFR, video görüntü sabitleme, hızlandırılmış çekim ya da video HDR açıkken desteklenmiyor</string>
   <string name="error_app_unsupported_hfr">HFR seçilen çözünürlükte desteklenmiyor</string>
   <string name="error_app_unsupported_hfr_codec">HFR açıkken sadece H.264 video kodlaması desteklenmektedir</string>
   <string name="error_app_unsupported">Bu kodlayıcı için desteklenmeyen video çözünürlüğü</string>
+  <string name="error_app_unsupported_dis">Video görüntü sabitleme seçilen çözünürlük için desteklenmiyor</string>
   <string name="pref_camera_ae_bracket_hdr_title">Otomatik Poz Tarama</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Açık</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Kapalı</string>
   <string name="pref_camera_hfr_title">Ağır Çekim (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Kapalı</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Gürültü engelleme</string>
-  <string name="pref_camera_denoise_entry_off">Kapalı</string>
-  <string name="pref_camera_denoise_entry_on">Açık</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Oto</string>
   <string name="pref_camera_iso_entry_isodeblur">Otomatik (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Antibanding</string>
   <string name="pref_camera_antibanding_entry_0">Kapalı</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Mavi tonlama</string>
   <string name="pref_camera_coloreffect_entry_greentint">Yeşil tonlama</string>
   <string name="pref_camera_touchafaec_title">Dokunma AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">Kapalı</string>
-  <string name="pref_camera_touchafaec_entry_on">Açık</string>
   <string name="pref_camera_dis_title">Video sabitleme</string>
-  <string name="pref_camera_dis_entry_off">Kapalı</string>
-  <string name="pref_camera_dis_entry_on">Açık</string>
   <string name="pref_camera_facerc_title">Yüz tanıma</string>
-  <string name="pref_camera_facerc_entry_off">Kapalı</string>
-  <string name="pref_camera_facerc_entry_on">Açık</string>
+  <string name="pref_camera_sharpness_title">Keskinlik</string>
   <string name="pref_camera_sharpness_entry_level0">Düzey 0</string>
   <string name="pref_camera_sharpness_entry_level1">Düzey 1</string>
   <string name="pref_camera_sharpness_entry_level2">Düzey 2 (Varsayılan)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Düzey 4</string>
   <string name="pref_camera_sharpness_entry_level5">Düzey 5</string>
   <string name="pref_camera_sharpness_entry_level6">Düzey 6</string>
+  <string name="pref_camera_contrast_title">Karşıtlık</string>
   <string name="pref_camera_contrast_entry_level0">Düzey 0</string>
   <string name="pref_camera_contrast_entry_level1">Düzey 1</string>
   <string name="pref_camera_contrast_entry_level2">Düzey 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Düzey 8</string>
   <string name="pref_camera_contrast_entry_level9">Düzey 9</string>
   <string name="pref_camera_contrast_entry_level10">Düzey 10</string>
+  <string name="pref_camera_saturation_title">Doygunluk</string>
   <string name="pref_camera_saturation_entry_level0">Düzey 0</string>
   <string name="pref_camera_saturation_entry_level1">Düzey 1</string>
   <string name="pref_camera_saturation_entry_level2">Düzey 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Düzey 8</string>
   <string name="pref_camera_saturation_entry_level9">Düzey 9</string>
   <string name="pref_camera_saturation_entry_level10">Düzey 10</string>
-  <string name="pref_camera_sharpness_title">Keskinlik</string>
-  <string name="pref_camera_contrast_title">Karşıtlık</string>
-  <string name="pref_camera_saturation_title">Doygunluk</string>
   <string name="pref_camera_picture_format_title">Resim formatı</string>
   <string name="pref_camera_jpegquality_title">Resim kalitesi</string>
   <string name="pref_camera_jpegquality_entry_0">%55</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">%95</string>
   <string name="pref_camera_jpegquality_entry_5">%100</string>
   <string name="pref_camera_histogram_title">Histogram</string>
-  <string name="pref_camera_histogram_entry_enable">Açık</string>
-  <string name="pref_camera_histogram_entry_disable">Kapalı</string>
   <string name="pref_camera_scenedetect_title">Otomatik Sahne Tespiti</string>
-  <string name="pref_camera_scenedetect_entry_on">Açık</string>
-  <string name="pref_camera_scenedetect_entry_off">Kapalı</string>
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 6fbd999ee..a2370eefc 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -15,6 +15,269 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">كامېرا</string>
+  <string name="video_camera_label">سىنئالغۇ</string>
+  <string name="details_ms">%1$02d:%2$02d</string>
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
+  <string name="set_image">رەسىم تەڭشىكى</string>
+  <string name="delete">ئۆچۈر</string>
+  <plurals name="delete_selection">
+    <item quantity="other">تاللىغان تۈرنى ئۆچۈرەمدۇ؟</item>
+  </plurals>
+  <string name="share">ھەمبەھىر</string>
+  <string name="share_panorama">پۈتۈن مەنزىرە ھەمبەھىر</string>
+  <string name="share_as_photo">سۈرەت سۈپىتىدە ھەمبەھىر</string>
+  <string name="deleted">ئۆچۈرۈلدى</string>
+  <string name="undo">يېنىۋال</string>
+  <string name="details">تەپسىلاتى</string>
+  <string name="close">ياپ</string>
+  <plurals name="number_of_items_selected">
+    <item quantity="other">%1$d تاللاندى</item>
+  </plurals>
+  <plurals name="number_of_albums_selected">
+    <item quantity="other">%1$d تاللاندى</item>
+  </plurals>
+  <plurals name="number_of_groups_selected">
+    <item quantity="other">%1$d تاللاندى</item>
+  </plurals>
+  <string name="show_on_map">خەرىتىدە كۆرسەت</string>
+  <string name="rotate_left">سولغا ئايلاندۇر</string>
+  <string name="rotate_right">ئوڭغا ئايلاندۇر</string>
+  <string name="edit">تەھرىر</string>
+  <string name="crop_action">كەس</string>
+  <string name="trim_action">كەس</string>
+  <string name="set_as">تەڭشىكى</string>
+  <string name="video_err">سىننى قويالمايدۇ</string>
+  <string name="crop_saved">كېسىلگەن سۈرەت <xliff:g id="FOLDER_NAME">%s</xliff:g> غا ساقلاندى.</string>
+  <string name="title">ماۋزۇ</string>
+  <string name="description">چۈشەندۈرۈش</string>
+  <string name="time">ۋاقىت</string>
+  <string name="location">ئورنى</string>
+  <string name="path">يول</string>
+  <string name="width">كەڭلىك</string>
+  <string name="height">ئېگىزلىك</string>
+  <string name="orientation">يۆنىلىش</string>
+  <string name="duration">داۋاملىشىش ۋاقتى</string>
+  <string name="mimetype">MIME تىپى</string>
+  <string name="file_size">ھۆججەت چوڭلۇقى</string>
+  <string name="maker">ياسىغۇچ</string>
+  <string name="model">ئەندىزە</string>
+  <string name="flash">چاقماق چىراغ</string>
+  <string name="aperture">نۇر گەردىشى</string>
+  <string name="focal_length">فوكۇس ئارىلىقى</string>
+  <string name="white_balance">ئاق تەڭپۇڭلۇق</string>
+  <string name="exposure_time">ئاشكارىلانغان ۋاقتى</string>
+  <string name="iso">ISO</string>
+  <string name="unit_mm">mm</string>
+  <string name="manual">قولدا</string>
+  <string name="auto">ئاپتوماتىك</string>
+  <string name="flash_on">چاقماق چىراغ</string>
+  <string name="flash_off">چاقماق چىراغ يوق</string>
+  <string name="unknown">يوچۇن</string>
+  <string name="try_to_set_local_album_available_offline">بۇ تۈر يەرلىك ئورۇنغا ساقلاندى، تورسىز ئىشلەتكىلى بولىدۇ.</string>
+  <string name="please_wait">سەل كۈتۈڭ</string>
+  <string name="rendering_photo_sphere">سۈرەت شارىنى رەڭلەۋاتىدۇ</string>
+  <string name="camera_error_title">كامېرا خاتالىقى</string>
+  <string name="cannot_connect_camera">كامېراغا باغلىنالمىدى</string>
+  <string name="camera_disabled">بىخەتەرلىك تەدبىرى سەۋەبىدىن كامېرا چەكلەندى.</string>
+  <string name="wait">سەل كۈتۈڭ…</string>
+  <string name="no_storage" product="default">كامېرا ئىشلىتىشتىن ئىلگىرى SD كارتا قىستۇرۇڭ.</string>
+  <string name="preparing_sd" product="default">SD كارتا تەييارلاۋاتىدۇ…</string>
+  <string name="access_sd_fail" product="default">SD كارتىنى زىيارەت قىلالمايدۇ.</string>
+  <string name="time_lapse_title">ۋاقىت بەلگىلەپ خاتىرىلەش</string>
+  <string name="capturing">ئېكران تۇتۇۋاتىدۇ</string>
+  <string name="pref_camera_id_title">كامېرا تاللاڭ</string>
+  <string name="pref_camera_id_entry_back">قايت</string>
+  <string name="pref_camera_id_entry_front">ئالدى</string>
+  <string name="pref_camera_recordlocation_title">ساقلاش ئورنى</string>
+  <string name="pref_camera_location_label">ئورنى</string>
+  <string name="pref_camera_timer_title">تەتۈر سانىغۇچ ۋاقىت خاتىرىلىگۈچ</string>
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="other">1 سېكۇنت</item>
+  </plurals>
+  <string name="pref_camera_timer_sound_default">@string/setting_on_value</string>
+  <string name="pref_camera_timer_sound_title">تەتۈر ساناۋاتقاندا ئەسكەرتىش ئاۋازى چىقار</string>
+  <string name="setting_off">تاقاق</string>
+  <string name="setting_on">ئوچۇق</string>
+  <string name="pref_video_quality_title">سىن سۈپىتى</string>
+  <string name="pref_video_quality_entry_high">يۇقىرى</string>
+  <string name="pref_video_quality_entry_low">تۆۋەن</string>
+  <string name="pref_video_time_lapse_frame_interval_title">ۋاقىت بەلگىلەپ سۈرەت تارتىش</string>
+  <string name="pref_camera_settings_category">كامېرا تەڭشەك</string>
+  <string name="pref_camcorder_settings_category">سىنئالغۇ تەڭشەك</string>
+  <string name="pref_camera_picturesize_title">رەسىم چوڭلۇقى</string>
+  <string name="pref_camera_picturesize_entry_13mp">13 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_8mp">8 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_5mp">5 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_4mp_wide">4 مىليون پىكسېل (16:9)</string>
+  <string name="pref_camera_picturesize_entry_3mp">3 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_2mp">2 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_2mp_wide">2 مىليون پىكسېل (16:9)</string>
+  <string name="pref_camera_picturesize_entry_1_5mp">1،5 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_1_3mp">1،3 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_1mp">1 مىليون پىكسېل</string>
+  <string name="pref_camera_picturesize_entry_vga">VGA</string>
+  <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
+  <string name="pref_camera_focusmode_title">فوكۇس مودېلى</string>
+  <string name="pref_camera_focusmode_entry_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_focusmode_entry_infinity">چەكسىز</string>
+  <string name="pref_camera_focusmode_entry_macro">ماكرو</string>
+  <string name="pref_camera_focusmode_label_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_focusmode_label_infinity">چەكسىز</string>
+  <string name="pref_camera_focusmode_label_macro">ماكرو</string>
+  <string name="pref_camera_flashmode_title">چاقماق چىراغ ھالىتى</string>
+  <string name="pref_camera_flashmode_label">چاقماق چىراغ ھالىتى</string>
+  <string name="pref_camera_flashmode_entry_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_flashmode_entry_on">ئوچۇق</string>
+  <string name="pref_camera_flashmode_entry_off">تاقاق</string>
+  <string name="pref_camera_flashmode_label_auto">چاقماق چىراغ ئاپتوماتىل</string>
+  <string name="pref_camera_flashmode_label_on">چاقماق چىراغ ئوچۇق</string>
+  <string name="pref_camera_flashmode_label_off">چاقماق چىراغ تاقاق</string>
+  <string name="pref_camera_whitebalance_title">ئاق تەڭپۇڭلۇق</string>
+  <string name="pref_camera_whitebalance_label">ئاق تەڭپۇڭلۇق</string>
+  <string name="pref_camera_whitebalance_entry_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">چوغلانما چىراغ</string>
+  <string name="pref_camera_whitebalance_entry_daylight">كۈن نۇرى</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">يالتىراق چىراغ</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">بۇلۇتلۇق</string>
+  <string name="pref_camera_whitebalance_label_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_whitebalance_label_incandescent">چوغلانما چىراغ</string>
+  <string name="pref_camera_whitebalance_label_daylight">كۈن نۇرى</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">يالتىراق چىراغ</string>
+  <string name="pref_camera_whitebalance_label_cloudy">بۇلۇتلۇق</string>
+  <string name="pref_camera_scenemode_title">مەنزىرە ھالىتى</string>
+  <string name="pref_camera_scenemode_entry_auto">ئاپتوماتىك</string>
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <string name="pref_camera_scenemode_entry_hdr">HDR</string>
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ نى ئاچ</string>
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ نى تاقا</string>
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR نى ئاچ</string>
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR نى تاقا</string>
+  <string name="pref_camera_scenemode_entry_action">مەشغۇلات</string>
+  <string name="pref_camera_scenemode_entry_night">كېچە</string>
+  <string name="pref_camera_scenemode_entry_sunset">كۈن پېتىش</string>
+  <string name="pref_camera_scenemode_entry_party">يىغىلىش</string>
+  <string name="pref_camera_scenemode_label_auto">يوق</string>
+  <string name="pref_camera_scenemode_label_action">مەشغۇلات</string>
+  <string name="pref_camera_scenemode_label_night">كېچە</string>
+  <string name="pref_camera_scenemode_label_sunset">كۈن پېتىش</string>
+  <string name="pref_camera_scenemode_label_party">يىغىلىش</string>
+  <string name="pref_camera_countdown_label_off">ۋاقىت خاتىرىلىگۈچ تاقاق</string>
+  <string name="pref_camera_countdown_label_one">1 سېكۇنت</string>
+  <string name="pref_camera_countdown_label_three">3 سېكۇنت</string>
+  <string name="pref_camera_countdown_label_ten">10 سېكۇنت</string>
+  <string name="pref_camera_countdown_label_fifteen">15 سېكۇنت</string>
+  <string name="not_selectable_in_scene_mode">تەڭشەكنى مەنزىرە ھالىتىدە تاللىغىلى بولمايدۇ.</string>
+  <string name="pref_exposure_title">نۇر ئۆتۈش</string>
+  <string name="pref_exposure_label">نۇر ئۆتۈش</string>
+  <string name="pref_camera_hdr_default">@string/setting_off_value</string>
+  <string name="pref_camera_hdr_plus_default">@string/setting_off_value</string>
   <string name="pref_camera_hdr_label">HDR</string>
+  <string name="pref_camera_id_label_back">ئالدى كامېرا</string>
+  <string name="pref_camera_id_label_front">كەينى كامېرا</string>
+  <string name="dialog_ok">جەزملە</string>
+  <string name="spaceIsLow_content" product="default">SD كارتا بوشلۇقىڭىز توشاي دېدى. سۈپەت تەڭشەكنى ئۆزگەرتىڭ ياكى بەزى سۈرەتلەرنى ياكى باشقا ھۆججەتلەرنى ئۆچۈرۈڭ.</string>
+  <string name="video_reach_size_limit">چوڭلۇق چېكىگە يەتتى.</string>
+  <string name="pano_too_fast_prompt">بەك تېز</string>
+  <string name="pano_dialog_prepare_preview">پۈتۈن مەنزىرە تەييارلاۋاتىدۇ</string>
+  <string name="pano_dialog_panorama_failed">پۈتۈن مەنزىرە ساقلىيالمايدۇ.</string>
+  <string name="pano_dialog_title">پۈتۈن مەنزىرە</string>
+  <string name="pano_capture_indication">پۈتۈن مەنزىرە سۈرەت تارتىۋاتىدۇ</string>
+  <string name="pano_dialog_waiting_previous">ئالدىنقى پۈتۈن مەنزىرە سۈرەتنىڭ بىر تەرەپ قىلىنىشىنى كۈتۈۋاتىدۇ</string>
+  <string name="pano_review_saving_indication_str">ساقلاۋاتىدۇ…</string>
+  <string name="pano_review_rendering">پۈتۈن مەنزىرە سۈرەتنى رەڭلەۋاتىدۇ</string>
+  <string name="tap_to_focus">چېكىسلە فوكۇس توغرىلايدۇ.</string>
+  <string name="pref_video_effect_title">ئالاھىدە ئۈنۈم</string>
+  <string name="effect_none">يوق</string>
+  <string name="effect_goofy_face_squeeze">شەيتان ئەينەك</string>
+  <string name="effect_goofy_face_big_eyes">چوڭ كۆز</string>
+  <string name="effect_goofy_face_big_mouth">چوڭ ئېغىز</string>
+  <string name="effect_goofy_face_small_mouth">كىچىك ئېغىز</string>
+  <string name="effect_goofy_face_big_nose">چوڭ بۇرۇن</string>
+  <string name="effect_goofy_face_small_eyes">كىچىك كۆز</string>
+  <string name="effect_backdropper_space">ئالەم تەگلىكى</string>
+  <string name="effect_backdropper_sunset">كۈن پېتىش</string>
+  <string name="effect_backdropper_gallery">سىنلىرىڭىز</string>
+  <string name="video_snapshot_hint">سىنغا ئېلىۋاتقاندا چېكىلسە بىر پارچە سۈرەت تارتىدۇ.</string>
+  <string name="video_recording_started">سىنغا ئېلىش باشلاندى.</string>
+  <string name="video_recording_stopped">سىنغا ئېلىش توختىدى.</string>
+  <string name="clear_effects">ئۈنۈمنى تازىلا</string>
+  <string name="effect_silly_faces">كۈلكىلىك چىرايلار</string>
+  <string name="effect_background">تەگلىك</string>
+  <string name="accessibility_shutter_button">قاپقاق</string>
+  <string name="accessibility_menu_button">تىزىملىك توپچا</string>
+  <string name="accessibility_mode_picker">كامېرا، سىن ياكى پۈتۈن مەنزىرە تاللىغۇچ</string>
+  <string name="accessibility_check_box">%1$s كۆپ تاللاش رامكىسى</string>
+  <string name="accessibility_switch_to_camera">سۈرەتكە ئالماشتۇر</string>
+  <string name="accessibility_switch_to_video">سىنغا ئالماشتۇر</string>
+  <string name="accessibility_switch_to_panorama">پۈتۈن مەنزىرىگە ئالماشتۇر</string>
+  <string name="accessibility_switch_to_photo_sphere">سۈرەت شارىغا ئالماشتۇر</string>
+  <string name="accessibility_switch_to_gcam">يۇقىرى سۈپەت ھالىتىگە ئالماشتۇر</string>
+  <string name="accessibility_review_cancel">ئالدىن كۆزىتىشتىن ۋاز كەچ</string>
+  <string name="accessibility_review_ok">ئالدىن كۆزىتىش تامام</string>
+  <string name="accessibility_review_retake">ئالدىن كۆزىتىشنى قايتا تارت</string>
+  <string name="capital_on">ئوچۇق</string>
+  <string name="capital_off">تاقاق</string>
+  <string name="pref_video_time_lapse_frame_interval_off">تاقاق</string>
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_1000">1 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_2000">2 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_2500">2.5 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_3000">3 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_4000">4 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_5000">5 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_6000">6 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_10000">10 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_12000">12 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_15000">15 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_24000">24 سېكۇنت</string>
+  <string name="pref_video_time_lapse_frame_interval_30000">0.5 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_60000">1 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_120000">2 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_180000">3 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_240000">4 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_300000">5 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_360000">6 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_600000">10 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_720000">12 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_900000">15 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 مىنۇت</string>
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 سائەت</string>
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 سائەت</string>
+  <string name="time_lapse_seconds">سېكۇنت</string>
+  <string name="time_lapse_minutes">مىنۇت</string>
+  <string name="time_lapse_hours">سائەت</string>
+  <string name="time_lapse_interval_set">تاماملاندى</string>
+  <string name="set_time_interval">\"ۋاقىت ئارىلىق تەڭشىكى\"</string>
+  <string name="set_time_interval_help">ۋاقىت كېچىكتۈرۈپ سۈرەت تارتىش ئىقتىدارى تاقالدى. ۋاقىت ئارىلىقى تەڭشىمەكچى بولغاندا، ئالدى بىلەن شۇ ئىقتىدارنى ئېچىڭ.</string>
+  <string name="set_duration">داۋاملىشىش ۋاقىت تەڭشىكى سېكۇنت</string>
+  <string name="count_down_title_text">سۈرەت تارتىش تەتۈر ساناق ساناۋاتىدۇ</string>
+  <string name="remember_location_title">سۈرەت تارتقان ئورۇننى ئەستە تۇتامدۇ؟</string>
+  <string name="remember_location_prompt">سىز تارتقان سىن ۋە سۈرەتلىرىڭىزگە تارتقان ئورۇن بەلگىسىنى سالىدۇ.\"\n\n\"باشقا ئەپلەر سىز ساقلىغان سۈرەتلەرنى كۆرگەندە بۇ ئۇچۇرلارنى زىيارەت قىلالايدۇ.</string>
+  <string name="remember_location_no">ياق، رەھمەت</string>
+  <string name="remember_location_yes">ھەئە</string>
+  <string name="camera_menu_more_label">تېخىمۇ كۆپ تاللانمىلار</string>
+  <string name="camera_menu_settings_label">تەڭشەكلەر</string>
+  <string name="create_tiny_planet">كىچىك شار رەسىمى قۇر</string>
+  <string name="saving_tiny_planet">كىچىك شار رەسىمىنى ساقلاۋاتىدۇ&#8230;</string>
+  <string name="tiny_planet_zoom">يىراق-يېقىن</string>
+  <string name="tiny_planet_rotate">ئايلاندۇر</string>
+  <string name="crop_save">ساقلا</string>
+  <string name="cannot_load_image">بۇ سۈرەتنى يۈكلىيەلمەيدۇ!</string>
+  <string name="switch_photo_filmstrip">تام تەسۋىر كۆرۈنۈش</string>
+  <string name="setting_wallpaper">تام قەغەزنى تەڭشەۋاتىدۇ</string>
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 8d0e54746..30399b86f 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -20,24 +20,21 @@
   <string name="pref_camera_picturesize_entry_18mp">18 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Мпікс.</string>
+  <string name="pref_camera_picturesize_entry_12mp">12 Мпікс</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 Мпікс</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Зменшення розмиття руху</string>
@@ -82,12 +79,14 @@
   <string name="pref_camera_scenemode_entry_text">Текст</string>
   <string name="pref_camera_scenemode_entry_theatre">Театр</string>
   <string name="pref_camera_scenemode_entry_whiteboard">Біла дошка</string>
+  <string name="pref_camera_focusmode_entry_continuouspicture">Безперервний</string>
   <string name="pref_camera_focusmode_entry_extended">Розширений</string>
   <string name="pref_camera_focusmode_entry_facedetect">Визначення лиць</string>
   <string name="pref_camera_focusmode_entry_facepriority">Фокус на лиця</string>
   <string name="pref_camera_focusmode_entry_fixed">Фіксований</string>
   <string name="pref_camera_focusmode_entry_portrait">Портрет</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Гіперфокальний</string>
+  <string name="pref_camera_focusmode_entry_manual">Ручний</string>
   <string name="pref_camera_coloreffect_entry_washed">Розмито</string>
   <string name="pref_camera_coloreffect_entry_vintage_warm">Старовина тепло</string>
   <string name="pref_camera_coloreffect_entry_vintage_cold">Старовина холодно</string>
@@ -119,10 +118,14 @@
   <string name="pref_camera_slow_shutter_entry_2s">2 секунди</string>
   <string name="pref_camera_slow_shutter_entry_4s">4 секунди</string>
   <string name="pref_camera_slow_shutter_entry_8s">8 секунд</string>
+  <string name="pref_camera_slow_shutter_entry_16s">16 секунд</string>
+  <string name="pref_camera_slow_shutter_entry_32s">32 секунди</string>
+  <string name="pref_camera_slow_shutter_entry_64s">64 секунди</string>
   <string name="pref_camera_storage_title">Сховище</string>
   <string name="camera_menu_enhance_label">ПОКРАЩЕННЯ</string>
   <string name="camera_menu_beauty_mode_label">ПОКРАЩЕННЯ</string>
   <string name="camera_menu_asd_label">РОЗПІЗНАВАННЯ УМОВИ ЗЙОМКИ</string>
   <string name="pref_camera_power_shutter_title">Зйомка кноп. живлення</string>
+  <string name="pref_camera_max_brightness_title">Яскравий екран</string>
   <string name="pref_superzoom_title">Збільшення</string>
 </resources>
diff --git a/res/values-uk/qcomstrings.xml b/res/values-uk/qcomstrings.xml
index 2ccc673e1..4180f4d1b 100644
--- a/res/values-uk/qcomstrings.xml
+++ b/res/values-uk/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 хвилин</string>
   <string name="pref_camera_video_duration_entry_30">30 хвилин</string>
   <string name="pref_camera_skinToneEnhancement_title">Кращий тон шкіри</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Увімкнути</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Вимкнути</string>
   <string name="pref_camera_selectablezoneaf_title">Зона афтофокусу</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Авто</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Точковий замір</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">По центру</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Усереднений</string>
-  <string name="pref_camera_video_hdr_entry_off">Вимкн.</string>
-  <string name="pref_camera_video_hdr_entry_on">Увімк.</string>
+  <string name="hdr_enable_message">HDR увімкнуто, підтримується тільки сцена режим авто</string>
+  <string name="scene_enable_message">HDR не підтримується в режимі сцени, крім авто</string>
   <string name="pref_camera_video_hdr_title">Відео HDR</string>
   <string name="pref_camera_facedetection_title">Визначення лиць</string>
-  <string name="pref_camera_facedetection_entry_off">Вимкн.</string>
-  <string name="pref_camera_facedetection_entry_on">Увімк.</string>
   <string name="pref_camera_redeyereduction_title">Ефект вид. черв. очей</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Увімкнути</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Вимкнути</string>
+  <string name="error_app_unsupported_hfr_selection">HFR не підтримується, коли відео стабілізація, проміжок часу або HDR увімкнено</string>
   <string name="error_app_unsupported_hfr">HFR не підтримується на цьому розширенні</string>
   <string name="error_app_unsupported_hfr_codec">Пришвидшена зйомка доступна тільки з кодеком H.264</string>
   <string name="error_app_unsupported">Відеокодек не підтримує це розширення</string>
+  <string name="error_app_unsupported_dis">Відео стабілізація не підтримується на вибраній роздільній здатності</string>
   <string name="pref_camera_ae_bracket_hdr_title">Брекетинг автоекспозиції</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Увімк.</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Вимкн.</string>
   <string name="pref_camera_hfr_title">Повільний рух (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Вимкн.</string>
   <string name="pref_camera_hfr_entry_2x">60 кадр/с</string>
   <string name="pref_camera_hfr_entry_3x">90 кадр/с</string>
   <string name="pref_camera_hfr_entry_4x">120 кадр/с</string>
   <string name="pref_camera_denoise_title">Усунення шуму</string>
-  <string name="pref_camera_denoise_entry_off">Вимкн.</string>
-  <string name="pref_camera_denoise_entry_on">Увімк.</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Авто</string>
   <string name="pref_camera_iso_entry_isodeblur">Авто (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO 50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO 125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO 250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO 320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO 500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO 640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO 1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO 1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO 1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO 2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO 2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO 3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO 6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO 12800</string>
   <string name="pref_camera_antibanding_title">Вилучення мигання</string>
   <string name="pref_camera_antibanding_entry_0">Вимкн.</string>
   <string name="pref_camera_antibanding_entry_1">50 Гц</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Синій</string>
   <string name="pref_camera_coloreffect_entry_greentint">Зелений</string>
   <string name="pref_camera_touchafaec_title">Сенсорний фокус</string>
-  <string name="pref_camera_touchafaec_entry_off">Вимкн.</string>
-  <string name="pref_camera_touchafaec_entry_on">Увімк.</string>
   <string name="pref_camera_dis_title">Стабілізація відео</string>
-  <string name="pref_camera_dis_entry_off">Вимкн.</string>
-  <string name="pref_camera_dis_entry_on">Увімк.</string>
   <string name="pref_camera_facerc_title">Розпізнавання лиць</string>
-  <string name="pref_camera_facerc_entry_off">Вимкн.</string>
-  <string name="pref_camera_facerc_entry_on">Увімк.</string>
+  <string name="pref_camera_sharpness_title">Різкість</string>
   <string name="pref_camera_sharpness_entry_level0">Рівень 0</string>
   <string name="pref_camera_sharpness_entry_level1">Рівень 1</string>
   <string name="pref_camera_sharpness_entry_level2">Рівень 2 (типово)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Рівень 4</string>
   <string name="pref_camera_sharpness_entry_level5">Рівень 5</string>
   <string name="pref_camera_sharpness_entry_level6">Рівень 6</string>
+  <string name="pref_camera_contrast_title">Контраст</string>
   <string name="pref_camera_contrast_entry_level0">Рівень 0</string>
   <string name="pref_camera_contrast_entry_level1">Рівень 1</string>
   <string name="pref_camera_contrast_entry_level2">Рівень 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Рівень 8</string>
   <string name="pref_camera_contrast_entry_level9">Рівень 9</string>
   <string name="pref_camera_contrast_entry_level10">Рівень 10</string>
+  <string name="pref_camera_saturation_title">Насиченість</string>
   <string name="pref_camera_saturation_entry_level0">Рівень 0</string>
   <string name="pref_camera_saturation_entry_level1">Рівень 1</string>
   <string name="pref_camera_saturation_entry_level2">Рівень 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Рівень 8</string>
   <string name="pref_camera_saturation_entry_level9">Рівень 9</string>
   <string name="pref_camera_saturation_entry_level10">Рівень 10</string>
-  <string name="pref_camera_sharpness_title">Різкість</string>
-  <string name="pref_camera_contrast_title">Контраст</string>
-  <string name="pref_camera_saturation_title">Насиченість</string>
   <string name="pref_camera_picture_format_title">Формат зображення</string>
   <string name="pref_camera_jpegquality_title">Якість зображення</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Гістограма</string>
-  <string name="pref_camera_histogram_entry_enable">Увімкнути</string>
-  <string name="pref_camera_histogram_entry_disable">Вимкнути</string>
   <string name="pref_camera_scenedetect_title">Розпізн. умов зйомки</string>
-  <string name="pref_camera_scenedetect_entry_on">Увімк.</string>
-  <string name="pref_camera_scenedetect_entry_off">Вимкн.</string>
 </resources>
diff --git a/res/values-xlarge/filtershow_values.xml b/res/values-xlarge/filtershow_values.xml
deleted file mode 100644
index c6fe3996b..000000000
--- a/res/values-xlarge/filtershow_values.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Specify the screen orientation -->
-    <bool name="only_use_portrait">false</bool>
-
-    <!-- Category Panel Height -->
-    <dimen name="category_panel_height">106dip</dimen>
-
-    <!-- Category Panel Icon Size -->
-    <dimen name="category_panel_icon_size">84dip</dimen>
-
-    <!-- Category Panel Text Size -->
-    <dimen name="category_panel_text_size">14dip</dimen>
-
-    <!-- Category Panel Text Size -->
-    <dimen name="category_panel_margin">4dip</dimen>
-</resources>
\ No newline at end of file
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 55b29b1fa..c413052b1 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -14,12 +14,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <style name="DialogPickerTheme" parent="android:Theme.Holo.Dialog">
-    </style>
-    <bool name="picker_is_dialog">true</bool>
 
     <!-- Camera resources below -->
-
     <style name="ReviewControlText" parent="@style/ReviewControlText_xlarge" />
     <style name="PopupTitleText" parent="@style/PopupTitleText_xlarge" />
     <style name="PanoCustomDialogText" parent="@style/PanoCustomDialogText_xlarge" />
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index a4766de76..a0c135885 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">2070 万像素</string>
   <string name="pref_camera_picturesize_entry_18mp">1800 万像素</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">1590 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">1280 万像素</string>
   <string name="pref_camera_picturesize_entry_12_7mp">1270 万像素</string>
   <string name="pref_camera_picturesize_entry_12mp">1200 万像素</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">1190 万象素</string>
   <string name="pref_camera_picturesize_entry_11_5mp">1150 万像素</string>
   <string name="pref_camera_picturesize_entry_10_4mp">1040 万像素</string>
   <string name="pref_camera_picturesize_entry_10mp">1000 万像素</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">970 万像素</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">970 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">900 万像素</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">820 万像素</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">820 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770 万像素</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640 万像素</string>
-  <string name="pref_camera_picturesize_entry_6mp">600 万像素</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">600 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450 万像素</string>
   <string name="pref_camera_picturesize_entry_4mp">400 万像素</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">370 万像素</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">370 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250 万像素</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">210 万像素</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">210 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190 万像素</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">降低动态模糊</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">美肤</string>
   <string name="camera_menu_asd_label">智能场景</string>
   <string name="pref_camera_power_shutter_title">电源键快门</string>
+  <string name="pref_camera_max_brightness_title">明亮的屏幕</string>
   <string name="pref_superzoom_title">放大</string>
 </resources>
diff --git a/res/values-zh-rCN/qcomstrings.xml b/res/values-zh-rCN/qcomstrings.xml
index 429c1a14f..e4a9e3b56 100644
--- a/res/values-zh-rCN/qcomstrings.xml
+++ b/res/values-zh-rCN/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 分钟</string>
   <string name="pref_camera_video_duration_entry_30">30 分钟</string>
   <string name="pref_camera_skinToneEnhancement_title">皮肤色调增强</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">开启</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">关闭</string>
   <string name="pref_camera_selectablezoneaf_title">自动对焦区域</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">自动</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">点测光</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">中心测光</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">平均帧</string>
-  <string name="pref_camera_video_hdr_entry_off">关闭</string>
-  <string name="pref_camera_video_hdr_entry_on">开启</string>
+  <string name="hdr_enable_message">由于 HDR 已启用，仅能使用自动场景模式</string>
+  <string name="scene_enable_message">HDR 不支持自动场景以外的模式</string>
   <string name="pref_camera_video_hdr_title">视频 HDR</string>
   <string name="pref_camera_facedetection_title">人脸检测</string>
-  <string name="pref_camera_facedetection_entry_off">关闭</string>
-  <string name="pref_camera_facedetection_entry_on">开启</string>
   <string name="pref_camera_redeyereduction_title">红眼消除</string>
-  <string name="pref_camera_redeyereduction_entry_enable">开启</string>
-  <string name="pref_camera_redeyereduction_entry_disable">关闭</string>
+  <string name="error_app_unsupported_hfr_selection">当视频稳定化、缩时摄影、或视频 HDR 已开启时， HFR 将无法使用。</string>
   <string name="error_app_unsupported_hfr">选择的分辨率不支持高帧率</string>
   <string name="error_app_unsupported_hfr_codec">开启高帧率时仅支持 H.264 视频编码</string>
   <string name="error_app_unsupported">视频分辨率不支持此编解码器类型</string>
+  <string name="error_app_unsupported_dis">选中的分辨率不支持视频稳定化。</string>
   <string name="pref_camera_ae_bracket_hdr_title">自动包围曝光</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">开启</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">关闭</string>
   <string name="pref_camera_hfr_title">慢动作 (高帧率)</string>
   <string name="pref_camera_hfr_entry_off">关闭</string>
   <string name="pref_camera_hfr_entry_2x">60 帧/秒</string>
   <string name="pref_camera_hfr_entry_3x">90 帧/秒</string>
   <string name="pref_camera_hfr_entry_4x">120 帧/秒</string>
   <string name="pref_camera_denoise_title">降噪</string>
-  <string name="pref_camera_denoise_entry_off">关闭</string>
-  <string name="pref_camera_denoise_entry_on">开启</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">自动</string>
   <string name="pref_camera_iso_entry_isodeblur">自动 (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">抗条纹</string>
   <string name="pref_camera_antibanding_entry_0">关闭</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">蓝色调</string>
   <string name="pref_camera_coloreffect_entry_greentint">绿色调</string>
   <string name="pref_camera_touchafaec_title">触摸 AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">关闭</string>
-  <string name="pref_camera_touchafaec_entry_on">开启</string>
   <string name="pref_camera_dis_title">视频防抖</string>
-  <string name="pref_camera_dis_entry_off">关闭</string>
-  <string name="pref_camera_dis_entry_on">开启</string>
   <string name="pref_camera_facerc_title">人脸识别</string>
-  <string name="pref_camera_facerc_entry_off">关闭</string>
-  <string name="pref_camera_facerc_entry_on">开启</string>
+  <string name="pref_camera_sharpness_title">锐度</string>
   <string name="pref_camera_sharpness_entry_level0">0 级</string>
   <string name="pref_camera_sharpness_entry_level1">1 级</string>
   <string name="pref_camera_sharpness_entry_level2">2 级 (默认)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">4 级</string>
   <string name="pref_camera_sharpness_entry_level5">5 级</string>
   <string name="pref_camera_sharpness_entry_level6">6 级</string>
+  <string name="pref_camera_contrast_title">对比度</string>
   <string name="pref_camera_contrast_entry_level0">0 级</string>
   <string name="pref_camera_contrast_entry_level1">1 级</string>
   <string name="pref_camera_contrast_entry_level2">2 级</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">8 级</string>
   <string name="pref_camera_contrast_entry_level9">9 级</string>
   <string name="pref_camera_contrast_entry_level10">10 级</string>
+  <string name="pref_camera_saturation_title">饱和度</string>
   <string name="pref_camera_saturation_entry_level0">0 级</string>
   <string name="pref_camera_saturation_entry_level1">1 级</string>
   <string name="pref_camera_saturation_entry_level2">2 级</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">8 级</string>
   <string name="pref_camera_saturation_entry_level9">9 级</string>
   <string name="pref_camera_saturation_entry_level10">10 级</string>
-  <string name="pref_camera_sharpness_title">锐度</string>
-  <string name="pref_camera_contrast_title">对比度</string>
-  <string name="pref_camera_saturation_title">饱和度</string>
   <string name="pref_camera_picture_format_title">图片格式</string>
   <string name="pref_camera_jpegquality_title">图片质量</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">直方图</string>
-  <string name="pref_camera_histogram_entry_enable">开启</string>
-  <string name="pref_camera_histogram_entry_disable">关闭</string>
   <string name="pref_camera_scenedetect_title">自动场景检测</string>
-  <string name="pref_camera_scenedetect_entry_on">开启</string>
-  <string name="pref_camera_scenedetect_entry_off">关闭</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 673fffdde..c3f42b414 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">2070 萬像素</string>
   <string name="pref_camera_picturesize_entry_18mp">1800 萬像素</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">1590 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">1280 萬像素</string>
   <string name="pref_camera_picturesize_entry_12_7mp">1270 萬像素</string>
   <string name="pref_camera_picturesize_entry_12mp">1200 萬像素</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">1190 萬像素</string>
   <string name="pref_camera_picturesize_entry_11_5mp">1150 萬像素</string>
   <string name="pref_camera_picturesize_entry_10_4mp">1040 萬像素</string>
   <string name="pref_camera_picturesize_entry_10mp">1000 萬像素</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">970 萬像素</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">970 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">900 萬像素</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">820 萬像素</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">820 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770 萬像素</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640 萬像素</string>
-  <string name="pref_camera_picturesize_entry_6mp">600 萬像素</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">600 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450 萬像素</string>
   <string name="pref_camera_picturesize_entry_4mp">400 萬像素</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">370 萬像素</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">370 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250 萬像素</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">210 萬像素</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">210 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190 萬像素</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">降低動態模糊</string>
diff --git a/res/values-zh-rHK/qcomstrings.xml b/res/values-zh-rHK/qcomstrings.xml
index 95d77075d..b5ee7fcaa 100644
--- a/res/values-zh-rHK/qcomstrings.xml
+++ b/res/values-zh-rHK/qcomstrings.xml
@@ -34,35 +34,23 @@
   <string name="pref_camera_video_duration_entry_10">10 分鐘</string>
   <string name="pref_camera_video_duration_entry_30">30 分鐘</string>
   <string name="pref_camera_skinToneEnhancement_title">膚色色調強化</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">開啟</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">關閉</string>
   <string name="pref_camera_selectablezoneaf_title">自動對焦區域</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">自動</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">測光點</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">中心測光</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">幅均值</string>
-  <string name="pref_camera_video_hdr_entry_off">關閉</string>
-  <string name="pref_camera_video_hdr_entry_on">開啟</string>
   <string name="pref_camera_video_hdr_title">影片 HDR</string>
   <string name="pref_camera_facedetection_title">臉部偵測</string>
-  <string name="pref_camera_facedetection_entry_off">關閉</string>
-  <string name="pref_camera_facedetection_entry_on">開啟</string>
   <string name="pref_camera_redeyereduction_title">消除紅眼</string>
-  <string name="pref_camera_redeyereduction_entry_enable">開啟</string>
-  <string name="pref_camera_redeyereduction_entry_disable">關閉</string>
   <string name="error_app_unsupported_hfr">HFR 不支援所選的解像度</string>
   <string name="error_app_unsupported_hfr_codec">當 HFR 開啟時只支援 H.264 視像編碼</string>
   <string name="error_app_unsupported">影片解像度不支援此視像編解碼器</string>
   <string name="pref_camera_ae_bracket_hdr_title">自動包圍曝光</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">開啟</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">關閉</string>
   <string name="pref_camera_hfr_title">慢動作 (高頻率)</string>
   <string name="pref_camera_hfr_entry_off">關閉</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
-  <string name="pref_camera_denoise_entry_off">關閉</string>
-  <string name="pref_camera_denoise_entry_on">開啟</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">自動</string>
   <string name="pref_camera_iso_entry_isodeblur">自動 (HJR)</string>
@@ -93,13 +81,8 @@
   <string name="pref_camera_coloreffect_entry_bluetint">藍色色調</string>
   <string name="pref_camera_coloreffect_entry_greentint">綠色色調</string>
   <string name="pref_camera_touchafaec_title">輕觸 AF/AEC</string>
-  <string name="pref_camera_touchafaec_entry_off">關閉</string>
-  <string name="pref_camera_touchafaec_entry_on">開啟</string>
-  <string name="pref_camera_dis_entry_off">關閉</string>
-  <string name="pref_camera_dis_entry_on">開啟</string>
   <string name="pref_camera_facerc_title">人臉識別</string>
-  <string name="pref_camera_facerc_entry_off">關閉</string>
-  <string name="pref_camera_facerc_entry_on">開啟</string>
+  <string name="pref_camera_sharpness_title">銳利度</string>
   <string name="pref_camera_sharpness_entry_level0">Level 0</string>
   <string name="pref_camera_sharpness_entry_level1">Level 1</string>
   <string name="pref_camera_sharpness_entry_level2">Level 2 (預設值)</string>
@@ -107,6 +90,7 @@
   <string name="pref_camera_sharpness_entry_level4">Level 4</string>
   <string name="pref_camera_sharpness_entry_level5">Level 5</string>
   <string name="pref_camera_sharpness_entry_level6">Level 6</string>
+  <string name="pref_camera_contrast_title">對比度</string>
   <string name="pref_camera_contrast_entry_level0">Level 0</string>
   <string name="pref_camera_contrast_entry_level1">Level 1</string>
   <string name="pref_camera_contrast_entry_level2">Level 2</string>
@@ -118,6 +102,7 @@
   <string name="pref_camera_contrast_entry_level8">Level 8</string>
   <string name="pref_camera_contrast_entry_level9">Level 9</string>
   <string name="pref_camera_contrast_entry_level10">Level 10</string>
+  <string name="pref_camera_saturation_title">飽和度</string>
   <string name="pref_camera_saturation_entry_level0">Level 0</string>
   <string name="pref_camera_saturation_entry_level1">Level 1</string>
   <string name="pref_camera_saturation_entry_level2">Level 2</string>
@@ -129,9 +114,6 @@
   <string name="pref_camera_saturation_entry_level8">Level 8</string>
   <string name="pref_camera_saturation_entry_level9">Level 9</string>
   <string name="pref_camera_saturation_entry_level10">Level 10</string>
-  <string name="pref_camera_sharpness_title">銳利度</string>
-  <string name="pref_camera_contrast_title">對比度</string>
-  <string name="pref_camera_saturation_title">飽和度</string>
   <string name="pref_camera_picture_format_title">圖片格式</string>
   <string name="pref_camera_jpegquality_title">圖片質素</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -142,6 +124,4 @@
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">柱狀圖</string>
   <string name="pref_camera_scenedetect_title">自動場景檢測</string>
-  <string name="pref_camera_scenedetect_entry_on">開啟</string>
-  <string name="pref_camera_scenedetect_entry_off">關閉</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 4bd3208be..ac4104100 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -24,19 +24,14 @@
   <string name="pref_camera_picturesize_entry_10_4mp">1040 萬像素</string>
   <string name="pref_camera_picturesize_entry_10mp">1000 萬像素</string>
   <string name="pref_camera_picturesize_entry_9mp">900 萬像素</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">820 萬像素</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770 萬像素</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640 萬像素</string>
-  <string name="pref_camera_picturesize_entry_6mp">600 萬像素</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450 萬像素</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">370 萬像素</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250 萬像素</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">210 萬像素</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190 萬像素</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_ar">增強實景</string>
@@ -68,6 +63,7 @@
   <string name="pref_camera_focusmode_entry_facedetect">臉部偵測</string>
   <string name="pref_camera_focusmode_entry_facepriority">臉部優先</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">超焦距</string>
+  <string name="pref_camera_burst_title">連拍模式</string>
   <string name="pref_camera_burst_entry_off">關閉</string>
   <string name="pref_camera_burst_entry_5">5 連拍</string>
   <string name="pref_camera_burst_entry_10">10 連拍</string>
@@ -90,6 +86,9 @@
   <string name="pref_camera_slow_shutter_entry_2s">2 秒</string>
   <string name="pref_camera_slow_shutter_entry_4s">4 秒</string>
   <string name="pref_camera_slow_shutter_entry_8s">8 秒</string>
+  <string name="pref_camera_slow_shutter_entry_16s">16 秒</string>
+  <string name="pref_camera_slow_shutter_entry_32s">32 秒</string>
+  <string name="pref_camera_slow_shutter_entry_64s">64 秒</string>
   <string name="pref_camera_storage_title">儲存空間</string>
   <string name="pref_camera_power_shutter_title">電源快門</string>
   <string name="pref_superzoom_title">放大</string>
diff --git a/res/values-zh-rTW/qcomstrings.xml b/res/values-zh-rTW/qcomstrings.xml
index cabc62de6..bf7ad0563 100644
--- a/res/values-zh-rTW/qcomstrings.xml
+++ b/res/values-zh-rTW/qcomstrings.xml
@@ -26,17 +26,10 @@
   <string name="pref_camera_video_duration_entry_30">30 分鐘</string>
   <string name="pref_camera_selectablezoneaf_title">自動對焦區域</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">自動</string>
-  <string name="pref_camera_video_hdr_entry_off">關閉</string>
-  <string name="pref_camera_video_hdr_entry_on">開啟</string>
-  <string name="pref_camera_facedetection_entry_off">關閉</string>
-  <string name="pref_camera_facedetection_entry_on">開啟</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">開啟</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">關閉</string>
   <string name="pref_camera_hfr_entry_off">關閉</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
-  <string name="pref_camera_denoise_entry_off">關閉</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">自動</string>
   <string name="pref_camera_iso_entry_isodeblur">自動 (HJR)</string>
@@ -51,10 +44,6 @@
   <string name="pref_camera_coloreffect_title">色彩效果</string>
   <string name="pref_camera_coloreffect_entry_none">無</string>
   <string name="pref_camera_coloreffect_entry_sepia">棕褐色</string>
-  <string name="pref_camera_dis_entry_off">關閉</string>
-  <string name="pref_camera_dis_entry_on">開啟</string>
-  <string name="pref_camera_facerc_entry_off">關閉</string>
-  <string name="pref_camera_facerc_entry_on">開啟</string>
   <string name="pref_camera_picture_format_title">圖片格式</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
   <string name="pref_camera_jpegquality_entry_1">65% (一般)</string>
@@ -62,6 +51,4 @@
   <string name="pref_camera_jpegquality_entry_3">85% (超級精細)</string>
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
-  <string name="pref_camera_scenedetect_entry_on">開啟</string>
-  <string name="pref_camera_scenedetect_entry_off">關閉</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index aa6ef1c6f..b1284b7f4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -177,33 +177,35 @@
     <string-array name="pref_camera_picturesize_entries" translatable="false">
         <item>@string/pref_camera_picturesize_entry_20_7mp</item>
         <item>@string/pref_camera_picturesize_entry_18mp</item>
+        <item>@string/pref_camera_picturesize_entry_15_9mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_13mp</item>
         <item>@string/pref_camera_picturesize_entry_13mp</item>
         <item>@string/pref_camera_picturesize_entry_12_8mp</item>
         <item>@string/pref_camera_picturesize_entry_12_7mp</item>
         <item>@string/pref_camera_picturesize_entry_12mp</item>
+        <item>@string/pref_camera_picturesize_entry_11_9mp</item>
         <item>@string/pref_camera_picturesize_entry_11_5mp</item>
         <item>@string/pref_camera_picturesize_entry_10_4mp</item>
         <item>@string/pref_camera_picturesize_entry_10mp</item>
-        <item>@string/pref_camera_picturesize_entry_9_7mp</item>
+        <item>@string/pref_camera_picturesize_entry_9_7mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_9mp</item>
-        <item>@string/pref_camera_picturesize_entry_8_2mp</item>
+        <item>@string/pref_camera_picturesize_entry_8_2mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_8mp</item>
         <item>@string/pref_camera_picturesize_entry_7_7mp</item>
         <item>@string/pref_camera_picturesize_entry_6_4mp</item>
-        <item>@string/pref_camera_picturesize_entry_6mp</item>
-        <item>@string/pref_camera_picturesize_entry_6mp</item>
+        <item>@string/pref_camera_picturesize_entry_6mp_wide</item>
+        <item>@string/pref_camera_picturesize_entry_6mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_5mp</item>
         <item>@string/pref_camera_picturesize_entry_5mp</item>
         <item>@string/pref_camera_picturesize_entry_5mp</item>
         <item>@string/pref_camera_picturesize_entry_4_5mp</item>
         <item>@string/pref_camera_picturesize_entry_4mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_4mp</item>
-        <item>@string/pref_camera_picturesize_entry_3_7mp</item>
+        <item>@string/pref_camera_picturesize_entry_3_7mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_3mp</item>
         <item>@string/pref_camera_picturesize_entry_3mp</item>
         <item>@string/pref_camera_picturesize_entry_2_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_2_1mp</item>
+        <item>@string/pref_camera_picturesize_entry_2_1mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_2mp</item>
         <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_1_9mp</item>
@@ -215,7 +217,7 @@
         <item>@string/pref_camera_picturesize_entry_svga</item>
         <item>@string/pref_camera_picturesize_entry_wvga</item>
         <item>@string/pref_camera_picturesize_entry_vga</item>
-        <item>@string/pref_camera_picturesize_entry_nhd</item>
+        <item>@string/pref_camera_picturesize_entry_nhd_wide</item>
         <item>@string/pref_camera_picturesize_entry_wqvga</item>
         <item>@string/pref_camera_picturesize_entry_qvga</item>
     </string-array>
@@ -226,11 +228,13 @@
     <string-array name="pref_camera_picturesize_entryvalues" translatable="false">
         <item>5248x3936</item>
         <item>4992x3744</item>
+        <item>5312x2988</item>
         <item>4208x3120</item>
         <item>4160x3120</item>
         <item>4128x3096</item>
         <item>4128x3088</item>
         <item>4000x3000</item>
+        <item>3984x2988</item>
         <item>3920x2940</item>
         <item>4128x2528</item>
         <item>4320x2432</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 5a00a695a..5e10ec9fd 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -30,6 +30,7 @@
         <attr name="entryValues" format="reference" />
         <attr name="entries" format="reference" />
         <attr name="labelList" format="reference" />
+        <attr name="icon" format="reference" />
     </declare-styleable>
     <declare-styleable name="IconIndicator">
         <attr name="icons" format="reference" />
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index c76fc02a9..a1f3042b6 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -27,39 +27,39 @@
 
     <!-- Camera Preferences for burst modes -->
     <string-array name="pref_camera_burst_mode_entries" translatable="false">
-        <item>@string/pref_camera_burst_entry_20</item>
-        <item>@string/pref_camera_burst_entry_15</item>
-        <item>@string/pref_camera_burst_entry_10</item>
-        <item>@string/pref_camera_burst_entry_5</item>
         <item>@string/pref_camera_burst_entry_off</item>
+        <item>@string/pref_camera_burst_entry_5</item>
+        <item>@string/pref_camera_burst_entry_10</item>
+        <item>@string/pref_camera_burst_entry_15</item>
+        <item>@string/pref_camera_burst_entry_20</item>
     </string-array>
 
     <string-array name="pref_camera_burst_mode_values" translatable="false">
-        <item>20</item>
-        <item>15</item>
-        <item>10</item>
-        <item>5</item>
         <item>1</item>
+        <item>5</item>
+        <item>10</item>
+        <item>15</item>
+        <item>20</item>
      </string-array>
 
     <!-- Camera Preferences for timer duration -->
     <string-array name="pref_camera_focustime_duration_entries" translatable="false">
-        <item>@string/pref_camera_focustime_entry_infinite</item>
-        <item>@string/pref_camera_focustime_entry_30</item>
-        <item>@string/pref_camera_focustime_entry_20</item>
-        <item>@string/pref_camera_focustime_entry_15</item>
-        <item>@string/pref_camera_focustime_entry_10</item>
         <item>@string/pref_camera_focustime_entry_5</item>
+        <item>@string/pref_camera_focustime_entry_10</item>
+        <item>@string/pref_camera_focustime_entry_15</item>
+        <item>@string/pref_camera_focustime_entry_20</item>
+        <item>@string/pref_camera_focustime_entry_30</item>
+        <item>@string/pref_camera_focustime_entry_infinite</item>
     </string-array>
 
     <!-- Camera focus duration - stored in milliseconds -->
     <string-array name="pref_camera_focustime_duration_values" translatable="false">
-        <item>0</item>
-        <item>30000</item>
-        <item>20000</item>
-        <item>15000</item>
-        <item>10000</item>
         <item>5000</item>
+        <item>10000</item>
+        <item>15000</item>
+        <item>20000</item>
+        <item>30000</item>
+        <item>0</item>
     </string-array>
 
     <!-- Slow shutter feature -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 70daba735..47911f226 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -19,12 +19,16 @@
     <string name="pref_camera_picturesize_entry_20_7mp">20.7M pixels</string>
     <!-- Settings screen, dialog choice for 18 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
+    <!-- Settings screen, dialog choice for 15.9 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M pixels (16:9)</string>
     <!-- Settings screen, dialog choice for 12.8 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_12_8mp">12.8M pixels</string>
     <!-- Settings screen, dialog choice for 12.7 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_12_7mp">12.7M pixels</string>
     <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_12mp">12M pixels</string>
+    <!-- Settings screen, dialog choice for 11.9 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_11_9mp">11.9M pixels</string>
     <!-- Settings screen, dialog choice for 11.5 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_11_5mp">11.5M pixels</string>
     <!-- Settings screen, dialog choice for 10.4 megapixels picture size [CHAR LIMIT=15] -->
@@ -32,27 +36,27 @@
     <!-- Settings screen, dialog choice for 10 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_10mp">10M pixels</string>
     <!-- Settings screen, dialog choice for 9.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9_7mp">9.7M pixels</string>
+    <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M pixels (16:9)</string>
     <!-- Settings screen, dialog choice for 9 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_9mp">9M pixels</string>
     <!-- Settings screen, dialog choice for 8.2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_8_2mp">8.2M pixels</string>
+    <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M pixels (16:9)</string>
     <!-- Settings screen, dialog choice for 7.7 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels</string>
     <!-- Settings screen, dialog choice for 6.4 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_6_4mp">6.4M pixels</string>
     <!-- Settings screen, dialog choice for 6 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_6mp">6M pixels</string>
+    <string name="pref_camera_picturesize_entry_6mp_wide">6M pixels (16:9)</string>
     <!-- Settings screen, dialog choice for 4.5 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_4_5mp">4.5M pixels</string>
     <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>
     <!-- Settings screen, dialog choice for 3.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_3_7mp">3.7M pixels</string>
+    <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M pixels (16:9)</string>
     <!-- Settings screen, dialog choice for 2.5 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_2_5mp">2.5M pixels</string>
     <!-- Settings screen, dialog choice for 2.1 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_2_1mp">2.1M pixels</string>
+    <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M pixels (16:9)</string>
     <!-- Settings screen, dialog choice for 1.9 megapixels picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_1_9mp">1.9M pixels</string>
     <!-- Settings screen, dialog choice for WXGA picture size [CHAR LIMIT=15] -->
@@ -62,7 +66,7 @@
     <!-- Settings screen, dialog choice for SVGA picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_svga">SVGA</string>
     <!-- Settings screen, dialog choice for nHD picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+    <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
     <!-- Settings screen, dialog choice for WVGA picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
     <!-- Settings screen, dialog choice for WQVGA picture size [CHAR LIMIT=15] -->
@@ -190,6 +194,10 @@
     <string name="pref_camera_power_shutter_title">Power shutter</string>
     <string name="pref_camera_power_shutter_default" translatable="false">off</string>
 
+    <!-- More Settings screen, max brightness title -->
+    <string name="pref_camera_max_brightness_title">Bright screen</string>
+    <string name="pref_camera_max_brightness_default" translatable="false">off</string>
+
     <!-- SuperZoom -->
     <string name="pref_superzoom_title">Magnify</string>
     <string name="pref_superzoom_default" translatable="false">off</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index f8ca50328..9bb3b8b73 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -31,10 +31,6 @@
     <!-- Cancel autofocus if preview stopped. If camera HAL does not support
         it set this value to false -->
     <bool name="cancelAutoFocusOnPreviewStopped">true</bool>
-    <!-- Samsung Camcorder Mode -->
-    <bool name="needsSamsungCamMode">false</bool>
-    <!-- HTC Camcorder Mode -->
-    <bool name="needsHTCCamMode">false</bool>
 
     <!-- Ordered list of detected scene modes
          This should reference the list in camera_asd_values and
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index a94fd6b29..9a70a06b7 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -1,5 +1,6 @@
 <!--
     Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+    Copyright (C) 2014 The CyanogenMod Project
 
     Not a Contribution.
 
@@ -26,8 +27,8 @@
     </string-array>
 
     <string-array name="pref_camera_powermode_entryvalues" translatable="false">
-        <item>@string/pref_camera_powermode_value_lp</item>
-        <item>@string/pref_camera_powermode_value_np</item>
+        <item>Low_Power</item>
+        <item>Normal_Power</item>
     </string-array>
 
     <!-- Camera Preferences Picture format dialog box entries -->
@@ -104,78 +105,79 @@
         <item>@string/pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12rggb</item>
         <item>@string/pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12bggr</item>
     </string-array>
+
     <string-array name="pref_camera_picture_format_entryvalues" translatable="false">
-        <item>@string/pref_camera_picture_format_value_jpeg</item>
-        <item>@string/pref_camera_picture_format_value_raw</item>
-        <item>@string/pref_camera_picture_format_value_raw_yuv_422_sp</item>
-        <item>@string/pref_camera_picture_format_value_raw_yuv_8bit_yuyv</item>
-        <item>@string/pref_camera_picture_format_value_raw_yuv_8bit_yvyu</item>
-        <item>@string/pref_camera_picture_format_value_raw_yuv_8bit_uyvy</item>
-        <item>@string/pref_camera_picture_format_value_raw_yuv_8bit_vyuy</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_8gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_8grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_8rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_8bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_10gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_10grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_10rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_10bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_12gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_12grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_12rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_qcom_12bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_8gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_8grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_8rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_8bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_10gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_10grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_10rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_10bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_12gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_12grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_12rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_mipi_12bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_8gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_8grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_8rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_8bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_10gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_10grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_10rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_10bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_12gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_12grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_12rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_12bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_8gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_8grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_8rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_8bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_10gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_10grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_10rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_10bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_12gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_12grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_12rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_12bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain8_8gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain8_8grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain8_8rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain8_8bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_8gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_8grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_8rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_8bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_10gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_10grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_10rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_10bggr</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_12gbrg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_12grbg</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_12rggb</item>
-        <item>@string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_12bggr</item>
+        <item>jpeg</item>
+        <item>raw</item>
+        <item>yuv422sp</item>
+        <item>yuv-raw8-yuyv</item>
+        <item>yuv-raw8-yvyu</item>
+        <item>yuv-raw8-uyvy</item>
+        <item>yuv-raw8-vyuy</item>
+        <item>bayer-qcom-8gbrg</item>
+        <item>bayer-qcom-8grbg</item>
+        <item>bayer-qcom-8rggb</item>
+        <item>bayer-qcom-8bgrr</item>
+        <item>bayer-qcom-10gbrg</item>
+        <item>bayer-qcom-10grbg</item>
+        <item>bayer-qcom-10rggb</item>
+        <item>bayer-qcom-10bggr</item>
+        <item>bayer-qcom-12gbrg</item>
+        <item>bayer-qcom-12grbg</item>
+        <item>bayer-qcom-12rggb</item>
+        <item>bayer-qcom-12bggr</item>
+        <item>bayer-mipi-8gbrg</item>
+        <item>bayer-mipi-8grbg</item>
+        <item>bayer-mipi-8rggb</item>
+        <item>bayer-mipi-8bggr</item>
+        <item>bayer-mipi-10gbrg</item>
+        <item>bayer-mipi-10grbg</item>
+        <item>bayer-mipi-10rggb</item>
+        <item>bayer-mipi-10bggr</item>
+        <item>bayer-mipi-12gbrg</item>
+        <item>bayer-mipi-12grbg</item>
+        <item>bayer-mipi-12rggb</item>
+        <item>bayer-mipi-12bggr</item>
+        <item>bayer-ideal-qcom-8gbrg</item>
+        <item>bayer-ideal-qcom-8grbg</item>
+        <item>bayer-ideal-qcom-8rggb</item>
+        <item>bayer-ideal-qcom-8bggr</item>
+        <item>bayer-ideal-qcom-10gbrg</item>
+        <item>bayer-ideal-qcom-10grbg</item>
+        <item>bayer-ideal-qcom-10rggb</item>
+        <item>bayer-ideal-qcom-10bggr</item>
+        <item>bayer-ideal-qcom-12gbrg</item>
+        <item>bayer-ideal-qcom-12grbg</item>
+        <item>bayer-ideal-qcom-12rggb</item>
+        <item>bayer-ideal-qcom-12bggr</item>
+        <item>bayer-ideal-mipi-8gbrg</item>
+        <item>bayer-ideal-mipi-8grbg</item>
+        <item>bayer-ideal-mipi-8rggb</item>
+        <item>bayer-ideal-mipi-8bggr</item>
+        <item>bayer-ideal-mipi-10gbrg</item>
+        <item>bayer-ideal-mipi-10grbg</item>
+        <item>bayer-ideal-mipi-10rggb</item>
+        <item>bayer-ideal-mipi-8bggr</item>
+        <item>bayer-ideal-mipi-12gbrg</item>
+        <item>bayer-ideal-mipi-12grbg</item>
+        <item>bayer-ideal-mipi-12rggb</item>
+        <item>bayer-ideal-mipi-12bggr</item>
+        <item>bayer-ideal-plain8-8gbrg</item>
+        <item>bayer-ideal-plain8-8grbg</item>
+        <item>bayer-ideal-plain8-8rggb</item>
+        <item>bayer-ideal-plain8-8bggr</item>
+        <item>bayer-ideal-plain16-8gbrg</item>
+        <item>bayer-ideal-plain16-8grbg</item>
+        <item>bayer-ideal-plain16-8rggb</item>
+        <item>bayer-ideal-plain16-8bggr</item>
+        <item>bayer-ideal-plain16-10gbrg</item>
+        <item>bayer-ideal-plain16-10grbg</item>
+        <item>bayer-ideal-plain16-10rggb</item>
+        <item>bayer-ideal-plain16-10bggr</item>
+        <item>bayer-ideal-plain16-12gbrg</item>
+        <item>bayer-ideal-plain16-12grbg</item>
+        <item>bayer-ideal-plain16-12rggb</item>
+        <item>bayer-ideal-plain16-12bggr</item>
     </string-array>
 
     <!-- Camera Preferences JPEG quality dialog box entries -->
@@ -250,11 +252,10 @@
 
     <!-- Camera Preferences AE Bracketing dialog box entries -->
     <string-array name="pref_camera_ae_bracket_hdr_entries" translatable="false">
-        <item>@string/pref_camera_ae_bracket_hdr_entry_off</item>
-        <item>@string/pref_camera_ae_bracket_hdr_entry_on</item>
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
     </string-array>
 
-    <!-- Do not localize entryvalues -->
     <string-array name="pref_camera_ae_bracket_hdr_entryvalues" translatable="false">
         <item>Off</item>
         <item>AE-Bracket</item>
@@ -262,11 +263,10 @@
 
     <!-- Camera Preferences Touch AF/AEC dialog box entries -->
     <string-array name="pref_camera_touchafaec_entries" translatable="false">
-        <item>@string/pref_camera_touchafaec_entry_off</item>
-        <item>@string/pref_camera_touchafaec_entry_on</item>
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
     </string-array>
 
-    <!-- Do not localize entryvalues -->
     <string-array name="pref_camera_touchafaec_entryvalues" translatable="false">
         <item>touch-off</item>
         <item>touch-on</item>
@@ -274,11 +274,10 @@
 
     <!-- DIS dialog box entries -->
     <string-array name="pref_camera_dis_entries" translatable="false">
-        <item>@string/pref_camera_dis_entry_off</item>
-        <item>@string/pref_camera_dis_entry_on</item>
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
     </string-array>
 
-    <!-- Do not localize entryvalues -->
     <string-array name="pref_camera_dis_entryvalues" translatable="false">
         <item>disable</item>
         <item>enable</item>
@@ -286,15 +285,14 @@
 
     <!-- Face Recognition dialog box entries -->
     <string-array name="pref_camera_facerc_entries" translatable="false">
-        <item>@string/pref_camera_facerc_entry_off</item>
-        <item>@string/pref_camera_facerc_entry_on</item>
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
     </string-array>
 
-    <!-- Do not localize entryvalues -->
     <string-array name="pref_camera_facerc_entryvalues" translatable="false">
         <item>off</item>
         <item>on</item>
-   </string-array>
+    </string-array>
 
     <!-- Camera Preferences MultiLevel dialog box entries -->
     <string-array name="pref_camera_sharpness_entries" translatable="false">
@@ -307,6 +305,17 @@
         <item>@string/pref_camera_sharpness_entry_level6</item>
     </string-array>
 
+    <!-- Entry Valur array for sharpness -->
+    <string-array name="pref_camera_multilevel_sharpness_entryvalues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+    </string-array>
+
     <!-- Camera Preferences MultiLevel dialog box entries -->
     <string-array name="pref_camera_contrast_entries" translatable="false">
         <item>@string/pref_camera_contrast_entry_level0</item>
@@ -337,17 +346,6 @@
         <item>@string/pref_camera_saturation_entry_level10</item>
     </string-array>
 
-    <!-- Entry Valur array for sharpness -->
-    <string-array name="pref_camera_multilevel_sharpness_entryvalues" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-    </string-array>
-
     <!-- Entry values array is shared between Saturation & Contrast -->
     <string-array name="pref_camera_multilevel_entryvalues" translatable="false">
         <item>0</item>
@@ -364,74 +362,99 @@
     </string-array>
 
     <!-- Camera Preferences ISO dialog box entries -->
-     <string-array name="pref_camera_iso_entries" translatable="false">
-         <item>@string/pref_camera_iso_entry_auto</item>
-         <item>@string/pref_camera_iso_entry_isodeblur</item>
-         <item>@string/pref_camera_iso_entry_iso100</item>
-         <item>@string/pref_camera_iso_entry_iso200</item>
-         <item>@string/pref_camera_iso_entry_iso400</item>
-         <item>@string/pref_camera_iso_entry_iso800</item>
-         <item>@string/pref_camera_iso_entry_iso1600</item>
+    <string-array name="pref_camera_iso_entries" translatable="false">
+        <item>@string/pref_camera_iso_entry_auto</item>
+        <item>@string/pref_camera_iso_entry_isodeblur</item>
+        <item>@string/pref_camera_iso_entry_iso50</item>
+        <item>@string/pref_camera_iso_entry_iso100</item>
+        <item>@string/pref_camera_iso_entry_iso125</item>
+        <item>@string/pref_camera_iso_entry_iso200</item>
+        <item>@string/pref_camera_iso_entry_iso250</item>
+        <item>@string/pref_camera_iso_entry_iso320</item>
+        <item>@string/pref_camera_iso_entry_iso400</item>
+        <item>@string/pref_camera_iso_entry_iso500</item>
+        <item>@string/pref_camera_iso_entry_iso640</item>
+        <item>@string/pref_camera_iso_entry_iso800</item>
+        <item>@string/pref_camera_iso_entry_iso1000</item>
+        <item>@string/pref_camera_iso_entry_iso1200</item>
+        <item>@string/pref_camera_iso_entry_iso1250</item>
+        <item>@string/pref_camera_iso_entry_iso1600</item>
+        <item>@string/pref_camera_iso_entry_iso2000</item>
+        <item>@string/pref_camera_iso_entry_iso2500</item>
+        <item>@string/pref_camera_iso_entry_iso3200</item>
+        <item>@string/pref_camera_iso_entry_iso6400</item>
+        <item>@string/pref_camera_iso_entry_iso12800</item>
     </string-array>
 
-    <!-- Do not localize entryvalues -->
     <string-array name="pref_camera_iso_entryvalues" translatable="false">
-         <item>@string/pref_camera_iso_value_auto</item>
-         <item>@string/pref_camera_iso_value_isodeblur</item>
-         <item>@string/pref_camera_iso_value_iso100</item>
-         <item>@string/pref_camera_iso_value_iso200</item>
-         <item>@string/pref_camera_iso_value_iso400</item>
-         <item>@string/pref_camera_iso_value_iso800</item>
-         <item>@string/pref_camera_iso_value_iso1600</item>
-     </string-array>
+        <item>auto</item>
+        <item>ISO_HJR</item>
+        <item>ISO50</item>
+        <item>ISO100</item>
+        <item>ISO125</item>
+        <item>ISO200</item>
+        <item>ISO250</item>
+        <item>ISO320</item>
+        <item>ISO400</item>
+        <item>ISO500</item>
+        <item>ISO640</item>
+        <item>ISO800</item>
+        <item>ISO1000</item>
+        <item>ISO1200</item>
+        <item>ISO1250</item>
+        <item>ISO1600</item>
+        <item>ISO2000</item>
+        <item>ISO2500</item>
+        <item>ISO3200</item>
+        <item>ISO6400</item>
+        <item>ISO12800</item>
+    </string-array>
 
     <!-- Camera Preferences Anti Banding dialog box entries -->
-     <string-array name="pref_camera_antibanding_entries" translatable="false">
-         <item>@string/pref_camera_antibanding_entry_0</item>
-         <item>@string/pref_camera_antibanding_entry_1</item>
-         <item>@string/pref_camera_antibanding_entry_2</item>
-         <item>@string/pref_camera_antibanding_entry_3</item>
-     </string-array>
-
-     <string-array name="pref_camera_antibanding_entryvalues" translatable="false">
-         <item>off</item>
-         <item>50hz</item>
-         <item>60hz</item>
-         <item>auto</item>
-     </string-array>
-
-     <!-- Camera Preferences Histogram dialog box entries -->
-     <string-array name="pref_camera_histogram_entries" translatable="false">
-          <item>@string/pref_camera_histogram_entry_disable</item>
-          <item>@string/pref_camera_histogram_entry_enable</item>
-     </string-array>
-
-     <!-- Video Preferences High Frame Rate dialog box entries -->
-     <string-array name="pref_camera_hfr_entries" translatable="false">
-          <item>@string/pref_camera_hfr_entry_off</item>
-          <item>@string/pref_camera_hfr_entry_2x</item>
-          <item>@string/pref_camera_hfr_entry_3x</item>
-          <item>@string/pref_camera_hfr_entry_4x</item>
-     </string-array>
-
-     <!-- Do not localize entryvalues -->
-     <string-array name="pref_camera_hfr_entryvalues" translatable="false">
-          <item>@string/pref_camera_hfr_value_off</item>
-          <item>@string/pref_camera_hfr_value_2x</item>
-          <item>@string/pref_camera_hfr_value_3x</item>
-          <item>@string/pref_camera_hfr_value_4x</item>
-     </string-array>
-
-     <!-- Do not localize entryvalues -->
-     <string-array name="pref_camera_histogram_entryvalues" translatable="false">
-          <item>@string/pref_camera_histogram_value_disable</item>
-          <item>@string/pref_camera_histogram_value_enable</item>
-     </string-array>
+    <string-array name="pref_camera_antibanding_entries" translatable="false">
+        <item>@string/pref_camera_antibanding_entry_0</item>
+        <item>@string/pref_camera_antibanding_entry_1</item>
+        <item>@string/pref_camera_antibanding_entry_2</item>
+        <item>@string/pref_camera_antibanding_entry_3</item>
+    </string-array>
+
+    <string-array name="pref_camera_antibanding_entryvalues" translatable="false">
+        <item>off</item>
+        <item>50hz</item>
+        <item>60hz</item>
+        <item>auto</item>
+    </string-array>
+
+    <!-- Video Preferences High Frame Rate dialog box entries -->
+    <string-array name="pref_camera_hfr_entries" translatable="false">
+        <item>@string/pref_camera_hfr_entry_off</item>
+        <item>@string/pref_camera_hfr_entry_2x</item>
+        <item>@string/pref_camera_hfr_entry_3x</item>
+        <item>@string/pref_camera_hfr_entry_4x</item>
+    </string-array>
+
+    <string-array name="pref_camera_hfr_entryvalues" translatable="false">
+        <item>off</item>
+        <item>60</item>
+        <item>90</item>
+        <item>120</item>
+    </string-array>
+
+    <!-- Camera Preferences Histogram dialog box entries -->
+    <string-array name="pref_camera_histogram_entries" translatable="false">
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
+    </string-array>
+
+    <string-array name="pref_camera_histogram_entryvalues" translatable="false">
+        <item>disable</item>
+        <item>enable</item>
+    </string-array>
 
     <!-- Camera Preferences Face Detection dialog box entries -->
     <string-array name="pref_camera_facedetection_entries" translatable="false">
-         <item>@string/pref_camera_facedetection_entry_off</item>
-         <item>@string/pref_camera_facedetection_entry_on</item>
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
     </string-array>
 
     <string-array name="pref_camera_facedetection_entryvalues" translatable="false">
@@ -440,39 +463,40 @@
     </string-array>
 
     <!-- Camera Preferences Wavelet Denoise dialog box entries -->
+    <string-array name="pref_camera_denoise_entries" translatable="false">
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
+    </string-array>
+
     <string-array name="pref_camera_denoise_entryvalues" translatable="false">
         <item>denoise-off</item>
         <item>denoise-on</item>
     </string-array>
 
-    <string-array name="pref_camera_denoise_entries" translatable="false">
-    <item>@string/pref_camera_denoise_entry_off</item>
-    <item>@string/pref_camera_denoise_entry_on</item>
-    </string-array>
-
     <!-- Camera Preferences Auto Scene Detection dialog box entries -->
     <string-array name="pref_camera_scenedetect_entries" translatable="false">
-        <item>@string/pref_camera_scenedetect_entry_off</item>
-        <item>@string/pref_camera_scenedetect_entry_on</item>
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
     </string-array>
+
     <string-array name="pref_camera_scenedetect_entryvalues" translatable="false">
         <item>off</item>
         <item>on</item>
     </string-array>
 
     <!-- Camera Preferences Auto Exposure dialog box entries -->
-     <string-array name="pref_camera_autoexposure_entries" translatable="false">
-         <item>@string/pref_camera_autoexposure_entry_frameaverage</item>
-         <item>@string/pref_camera_autoexposure_entry_centerweighted</item>
-         <item>@string/pref_camera_autoexposure_entry_spotmetering</item>
-     </string-array>
-
-     <!-- Do not localize entryvalues -->
-     <string-array name="pref_camera_autoexposure_entryvalues" translatable="false">
-         <item>@string/pref_camera_autoexposure_value_frameaverage</item>
-         <item>@string/pref_camera_autoexposure_value_centerweighted</item>
-         <item>@string/pref_camera_autoexposure_value_spotmetering</item>
-     </string-array>
+    <string-array name="pref_camera_autoexposure_entries" translatable="false">
+        <item>@string/pref_camera_autoexposure_entry_frameaverage</item>
+        <item>@string/pref_camera_autoexposure_entry_centerweighted</item>
+        <item>@string/pref_camera_autoexposure_entry_spotmetering</item>
+    </string-array>
+
+    <string-array name="pref_camera_autoexposure_entryvalues" translatable="false">
+        <item>frame-average</item>
+        <item>center-weighted</item>
+        <item>spot-metering</item>
+    </string-array>
+
     <!-- Camera Preferences Video Encoder dialog box entries -->
     <string-array name="pref_camera_videoencoder_entries" translatable="false">
         <item>@string/pref_camera_videoencoder_entry_0</item>
@@ -497,42 +521,29 @@
         <item>aac</item>
     </string-array>
 
-    <!-- Camera Preferences Video Duration dialog box entries -->
-    <string-array name="pref_camera_video_duration_entries" translatable="false">
-    <item>@string/pref_camera_video_duration_entry_mms</item>
-    <item>@string/pref_camera_video_duration_entry_10</item>
-    <item>@string/pref_camera_video_duration_entry_30</item>
+    <!-- Camera Preferences Skin Tone Enhancement dialog box entries -->
+    <string-array name="pref_camera_skinToneEnhancement_entries" translatable="false">
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
     </string-array>
 
-    <!-- The numbers are in minutes, except -1 means the duration suitable for mms. -->
-    <string-array name="pref_camera_video_duration_entryvalues" translatable="false">
-    <item>-1</item>
-    <item>10</item>
-    <item>30</item>
+    <!-- Do not localize entryvalues -->
+    <string-array name="pref_camera_skinToneEnhancement_entryvalues" translatable="false">
+        <item>disable</item>
+        <item>enable</item>
+    </string-array>
+
+    <!-- Camera Preferences Redeye Reduction dialog box entries -->
+    <string-array name="pref_camera_redeyereduction_entries" translatable="false">
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
+    </string-array>
+
+    <string-array name="pref_camera_redeyereduction_entryvalues" translatable="false">
+        <item>disable</item>
+        <item>enable</item>
     </string-array>
 
-    <!-- Camera Preferences Skin Tone Enhancement dialog box entries -->
-     <string-array name="pref_camera_skinToneEnhancement_entries" translatable="false">
-          <item>@string/pref_camera_skinToneEnhancement_entry_enable</item>
-          <item>@string/pref_camera_skinToneEnhancement_entry_disable</item>
-     </string-array>
-
-     <!-- Do not localize entryvalues -->
-     <string-array name="pref_camera_skinToneEnhancement_entryvalues" translatable="false">
-          <item>@string/pref_camera_skinToneEnhancement_value_enable</item>
-          <item>@string/pref_camera_skinToneEnhancement_value_disable</item>
-     </string-array>
-
-     <!-- Camera Preferences Redeye Reduction dialog box entries -->
-     <string-array name="pref_camera_redeyereduction_entries" translatable="false">
-         <item>@string/pref_camera_redeyereduction_entry_enable</item>
-         <item>@string/pref_camera_redeyereduction_entry_disable</item>
-     </string-array>
-
-     <string-array name="pref_camera_redeyereduction_entryvalues" translatable="false">
-         <item>enable</item>
-         <item>disable</item>
-     </string-array>
     <!-- Camera Preferences Selectable Zone AF dialog box entries -->
     <string-array name="pref_camera_selectablezoneaf_entries" translatable="false">
         <item>@string/pref_camera_selectablezoneaf_entry_auto</item>
@@ -542,21 +553,20 @@
     </string-array>
 
     <string-array name="pref_camera_selectablezoneaf_entryvalues" translatable="false">
-         <item>@string/pref_camera_selectablezoneaf_value_auto</item>
-         <item>@string/pref_camera_selectablezoneaf_value_spotmetering</item>
-         <item>@string/pref_camera_selectablezoneaf_value_centerweighted</item>
-         <item>@string/pref_camera_selectablezoneaf_value_frameaverage</item>
+        <item>auto</item>
+        <item>spot-metering</item>
+        <item>center-weighted</item>
+        <item>frame-average</item>
     </string-array>
 
     <!-- Video HDR dialog box entries -->
     <string-array name="pref_camera_video_hdr_entries" translatable="false">
-        <item>@string/pref_camera_video_hdr_entry_off</item>
-        <item>@string/pref_camera_video_hdr_entry_on</item>
+        <item>@string/setting_off</item>
+        <item>@string/setting_on</item>
     </string-array>
 
     <string-array name="pref_camera_video_hdr_entryvalues" translatable="false">
-        <item>@string/pref_camera_video_hdr_value_off</item>
-        <item>@string/pref_camera_video_hdr_value_on</item>
+        <item>off</item>
+        <item>on</item>
     </string-array>
 </resources>
-
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 919d6be7b..fb782b66e 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -37,84 +37,45 @@
 
     <!-- Settings screen, Power Mode title -->
     <string name="pref_camera_powermode_title">Power mode</string>
+    <string name="pref_camera_powermode_default" translatable="false">Normal_Power</string>
 
     <!-- Settings screen, Power mode dialog radio button choices -->
     <string name="pref_camera_powermode_entry_lp">Low Power</string>
     <string name="pref_camera_powermode_entry_np">Normal Power</string>
 
-    <!-- Settings screen, Power mode dialog radio button choices -->
-    <string name="pref_camera_powermode_value_lp" translatable="false">Low_Power</string>
-    <string name="pref_camera_powermode_value_np" translatable="false">Normal_Power</string>
-
-    <!-- Default Power mode.. -->
-    <string name="pref_camera_powermode_default" translatable="false">Normal_Power</string>
-
-    <!-- Default auto exposure setting. Do not translate. -->
-    <string name="pref_camera_autoexposure_default" translatable="false">frame-average</string>
     <!-- Settings screen, Select auto exposure title -->
     <string name="pref_camera_autoexposure_title">Auto Exposure</string>
+    <string name="pref_camera_autoexposure_default" translatable="false">frame-average</string>
 
     <!-- Settings screen, auto exposure dialog radio button choices -->
     <string name="pref_camera_autoexposure_entry_frameaverage">Frame average</string>
     <string name="pref_camera_autoexposure_entry_centerweighted">Center weighted</string>
     <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
 
-    <!-- Auto exposure entry values. Do not translate. -->
-    <string name="pref_camera_autoexposure_value_frameaverage" translatable="false">frame-average</string>
-    <string name="pref_camera_autoexposure_value_centerweighted" translatable="false">center-weighted</string>
-    <string name="pref_camera_autoexposure_value_spotmetering" translatable="false">spot-metering</string>
-
     <!-- Settings screen, Video encoder title -->
     <string name="pref_camera_videoencoder_title">Video codec</string>
+    <string name="pref_camera_videoencoder_default" translatable="false">h264</string>
 
     <!-- Settings screen, Video encoder dialog radio button choices -->
     <string name="pref_camera_videoencoder_entry_0" translatable="false">MPEG-4</string>
     <string name="pref_camera_videoencoder_entry_1" translatable="false">H.263</string>
     <string name="pref_camera_videoencoder_entry_2" translatable="false">H.264</string>
 
-    <!-- Default video encoder setting. A numerical value. -->
-    <string name="pref_camera_videoencoder_default" translatable="false">h264</string>
-
-    <!-- Default audio encoder setting. A numerical value. -->
-    <string name="pref_camera_audioencoder_default" translatable="false">aac</string>
-
     <!-- Settings screen, Audio encoder title -->
     <string name="pref_camera_audioencoder_title">Audio codec</string>
+    <string name="pref_camera_audioencoder_default" translatable="false">aac</string>
 
     <!-- Settings screen, Audio encoder dialog radio button choices -->
     <string name="pref_camera_audioencoder_entry_0" translatable="false">AMR-NB</string>
     <string name="pref_camera_audioencoder_entry_1" translatable="false">AAC</string>
 
-    <!-- Default video duration setting. A numerical value.-->
-    <string name="pref_camera_video_duration_default" translatable="false">10</string>
-
-    <!-- Settings screen, Video duration title -->
-    <string name="pref_camera_video_duration_title">Video duration</string>
-
-    <!-- Settings screen, Video duration dialog radio button choices -->
-    <string name="pref_camera_video_duration_entry_mms">30 seconds (MMS)</string>
-    <string name="pref_camera_video_duration_entry_10">10 minutes</string>
-    <string name="pref_camera_video_duration_entry_30">30 minutes</string>
-
-    <!-- Default Skin Tone Enhancement setting. Do not translate. -->
-    <string name="pref_camera_skinToneEnhancement_default" translatable="false">disable</string>
-
     <!-- Settings screen, Select Skin Tone Enhancement title -->
     <string name="pref_camera_skinToneEnhancement_title">Skin tone enhancement</string>
-
-    <!-- Settings screen, Skin Tone Enhancement radio button choices -->
-    <string name="pref_camera_skinToneEnhancement_entry_enable">On</string>
-    <string name="pref_camera_skinToneEnhancement_entry_disable">Off</string>
-
-    <!-- Skin Tone Enhancement entry values. Do not translate. -->
-    <string name="pref_camera_skinToneEnhancement_value_enable" translatable="false">enable</string>
-    <string name="pref_camera_skinToneEnhancement_value_disable" translatable="false">disable</string>
-
-    <!-- Default selectable zone af setting. Do not translate. -->
-    <string name="pref_camera_selectablezoneaf_default" translatable="false">auto</string>
+    <string name="pref_camera_skinToneEnhancement_default" translatable="false">disable</string>
 
     <!-- Settings screen, Selectable zone af title -->
     <string name="pref_camera_selectablezoneaf_title">Autofocus zone</string>
+    <string name="pref_camera_selectablezoneaf_default" translatable="false">auto</string>
 
     <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
     <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
@@ -122,43 +83,24 @@
     <string name="pref_camera_selectablezoneaf_entry_centerweighted">Center weighted</string>
     <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame average</string>
 
-    <!-- Auto exposure entry values. Do not translate. -->
-    <string name="pref_camera_selectablezoneaf_value_auto" translatable="false">auto</string>
-    <string name="pref_camera_selectablezoneaf_value_spotmetering" translatable="false">spot-metering</string>
-    <string name="pref_camera_selectablezoneaf_value_centerweighted" translatable="false">center-weighted</string>
-    <string name="pref_camera_selectablezoneaf_value_frameaverage" translatable="false">frame-average</string>
-
-    <!-- Settings screen, Video HDR location dialog choices -->
-    <string name="pref_camera_video_hdr_entry_off">Off</string>
-    <string name="pref_camera_video_hdr_entry_on">On</string>
-
-    <string name="pref_camera_video_hdr_value_off" translatable="false">off</string>
-    <string name="pref_camera_video_hdr_value_on" translatable="false">on</string>
+    <!-- The message is shown in toast when HDR or scene mode is enabled -->
+    <string name="hdr_enable_message">HDR is enabled, only Auto scene mode is supported</string>
+    <string name="scene_enable_message">HDR is not supported in the scene mode other than Auto</string>
 
     <!-- Settings screen, setting title text for Video HDR-->
     <string name="pref_camera_video_hdr_title">Video HDR</string>
-
     <string name="pref_camera_video_hdr_default" translatable="false">off</string>
 
-    <!-- Default face  detection setting. -->
-    <string name="pref_camera_facedetection_default" translatable="false">on</string>
-
     <!-- Settings screen, Select Face Detection -->
     <string name="pref_camera_facedetection_title">Face detection</string>
-
-    <!-- Settings menu, Face Detection choices -->
-    <string name="pref_camera_facedetection_entry_off">Off</string>
-    <string name="pref_camera_facedetection_entry_on">On</string>
-
-    <!-- Default redeye reduction setting. -->
-    <string name="pref_camera_redeyereduction_default" translatable="false">disable</string>
+    <string name="pref_camera_facedetection_default" translatable="false">on</string>
 
     <!-- Settings screen, Select Redeye Reduction -->
     <string name="pref_camera_redeyereduction_title">Red eye reduction</string>
+    <string name="pref_camera_redeyereduction_default" translatable="false">disable</string>
 
-    <!-- Settings menu, redeye reduction choices -->
-    <string name="pref_camera_redeyereduction_entry_enable">On</string>
-    <string name="pref_camera_redeyereduction_entry_disable">Off</string>
+    <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
+    <string name="error_app_unsupported_hfr_selection">HFR is not supported when video stabilization, time lapse or video HDR is on</string>
 
     <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
     <string name="error_app_unsupported_hfr">HFR is not supported for selected resolution</string>
@@ -169,18 +111,16 @@
     <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
     <string name="error_app_unsupported">Unsupported video resolution for this codec type</string>
 
+    <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
+    <string name="error_app_unsupported_dis">Video stabilization is not supported for selected resolution</string>
+
     <!-- Settings screen, AE bracketing and HDR location dialog choices -->
     <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
     <string name="pref_camera_ae_bracket_hdr_default" translatable="false">Off</string>
 
-    <string name="pref_camera_ae_bracket_hdr_entry_on">On</string>
-    <string name="pref_camera_ae_bracket_hdr_entry_off">Off</string>
-
-    <!-- Default hfr setting. Do not translate. -->
-    <string name="pref_camera_hfr_default" translatable="false">off</string>
-
     <!-- Settings screen, Select hfr title -->
     <string name="pref_camera_hfr_title">Slow Motion (HFR)</string>
+    <string name="pref_camera_hfr_default" translatable="false">off</string>
 
     <!-- Settings screen, hfr radio button choices -->
     <string name="pref_camera_hfr_entry_off">Off</string>
@@ -188,48 +128,39 @@
     <string name="pref_camera_hfr_entry_3x">90 FPS</string>
     <string name="pref_camera_hfr_entry_4x">120 FPS</string>
 
-    <!-- HFR entry values. Do not translate. -->
-    <string name="pref_camera_hfr_value_off" translatable="false">off</string>
-    <string name="pref_camera_hfr_value_2x" translatable="false">60</string>
-    <string name="pref_camera_hfr_value_3x" translatable="false">90</string>
-    <string name="pref_camera_hfr_value_4x" translatable="false">120</string>
-
     <!-- Denoise Settings screen, setting title text -->
     <string name="pref_camera_denoise_title">Denoise</string>
     <string name="pref_camera_denoise_default" translatable="false">denoise-off</string>
 
-    <!-- Denoise Settings screen, Record location dialog choices -->
-    <string name="pref_camera_denoise_entry_off">Off</string>
-    <string name="pref_camera_denoise_entry_on">On</string>
-
-    <!-- Default iso setting. Do not translate. -->
-    <string name="pref_camera_iso_default" translatable="false">auto</string>
-
     <!-- Settings screen, Select Iso title -->
     <string name="pref_camera_iso_title">ISO</string>
+    <string name="pref_camera_iso_default" translatable="false">auto</string>
 
     <!-- Settings screen, ISO dialog radio button choices -->
     <string name="pref_camera_iso_entry_auto">Auto</string>
     <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+    <string name="pref_camera_iso_entry_iso50">ISO50</string>
     <string name="pref_camera_iso_entry_iso100">ISO100</string>
+    <string name="pref_camera_iso_entry_iso125">ISO125</string>
     <string name="pref_camera_iso_entry_iso200">ISO200</string>
+    <string name="pref_camera_iso_entry_iso250">ISO250</string>
+    <string name="pref_camera_iso_entry_iso320">ISO320</string>
     <string name="pref_camera_iso_entry_iso400">ISO400</string>
+    <string name="pref_camera_iso_entry_iso500">ISO500</string>
+    <string name="pref_camera_iso_entry_iso640">ISO640</string>
     <string name="pref_camera_iso_entry_iso800">ISO800</string>
+    <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+    <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+    <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
     <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
-
-    <!-- ISO entry values. Do not translate. -->
-    <string name="pref_camera_iso_value_auto" translatable="false">auto</string>
-    <string name="pref_camera_iso_value_isodeblur" translatable="false">ISO_HJR</string>
-    <string name="pref_camera_iso_value_iso100" translatable="false">ISO100</string>
-    <string name="pref_camera_iso_value_iso200" translatable="false">ISO200</string>
-    <string name="pref_camera_iso_value_iso400" translatable="false">ISO400</string>
-    <string name="pref_camera_iso_value_iso800" translatable="false">ISO800</string>
-    <string name="pref_camera_iso_value_iso1600" translatable="false">ISO1600</string>
+    <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+    <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+    <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+    <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+    <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
 
     <!-- Settings screen, Anti Banding title -->
     <string name="pref_camera_antibanding_title">Antibanding</string>
-
-    <!-- Default Anti Banding setting. -->
     <string name="pref_camera_antibanding_default" translatable="false">auto</string>
 
     <!-- Settings screen, Anti Banding entries -->
@@ -238,11 +169,9 @@
     <string name="pref_camera_antibanding_entry_2">60 Hz</string>
     <string name="pref_camera_antibanding_entry_3">Auto</string>
 
-    <!-- Default color effect setting. -->
-    <string name="pref_camera_coloreffect_default" translatable="false">none</string>
-
     <!-- Settings screen, Select Color effect title -->
     <string name="pref_camera_coloreffect_title">Color effect</string>
+    <string name="pref_camera_coloreffect_default" translatable="false">none</string>
 
     <!-- Settings screen, Color effect dialog radio button choices -->
     <string name="pref_camera_coloreffect_entry_none">None</string>
@@ -262,31 +191,21 @@
     <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
     <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
 
-    <!-- Default Touch AF/AEC setting. Do not translate. -->
-    <string name="pref_camera_touchafaec_default" translatable="false">touch-on</string>
-
     <!-- Settings screen, Select Touch AF/AEC title -->
     <string name="pref_camera_touchafaec_title">Touch AF/AEC</string>
-
-    <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
-    <string name="pref_camera_touchafaec_entry_off">Off</string>
-    <string name="pref_camera_touchafaec_entry_on">On</string>
+    <string name="pref_camera_touchafaec_default" translatable="false">touch-on</string>
 
     <!-- Select DIS title -->
     <string name="pref_camera_dis_title">Video stabilization</string>
     <string name="pref_camera_dis_default" translatable="false">disable</string>
 
-    <!-- DIS choices -->
-    <string name="pref_camera_dis_entry_off">Off</string>
-    <string name="pref_camera_dis_entry_on">On</string>
-
     <!-- Select Face Recognition title -->
     <string name="pref_camera_facerc_title">Face recognition</string>
     <string name="pref_camera_facerc_default" translatable="false">off</string>
 
-    <!-- Face Recognition choices -->
-    <string name="pref_camera_facerc_entry_off">Off</string>
-    <string name="pref_camera_facerc_entry_on">On</string>
+    <!-- Settings screen, Select sharpness title -->
+    <string name="pref_camera_sharpness_title">Sharpness</string>
+    <string name="pref_camera_sharpness_default" translatable="false">2</string>
 
     <!-- Settings screen, Multiple levels entries -->
     <string name="pref_camera_sharpness_entry_level0">Level 0</string>
@@ -297,6 +216,10 @@
     <string name="pref_camera_sharpness_entry_level5">Level 5</string>
     <string name="pref_camera_sharpness_entry_level6">Level 6</string>
 
+    <!-- Settings screen, Select contrast title -->
+    <string name="pref_camera_contrast_title">Contrast</string>
+    <string name="pref_camera_contrast_default" translatable="false">5</string>
+
     <!-- Settings screen, Multiple levels entries -->
     <string name="pref_camera_contrast_entry_level0">Level 0</string>
     <string name="pref_camera_contrast_entry_level1">Level 1</string>
@@ -310,6 +233,10 @@
     <string name="pref_camera_contrast_entry_level9">Level 9</string>
     <string name="pref_camera_contrast_entry_level10">Level 10</string>
 
+    <!-- Settings screen, Select saturation title -->
+    <string name="pref_camera_saturation_title">Saturation</string>
+    <string name="pref_camera_saturation_default" translatable="false">5</string>
+
     <!-- Settings screen, Multiple levels entries -->
     <string name="pref_camera_saturation_entry_level0">Level 0</string>
     <string name="pref_camera_saturation_entry_level1">Level 1</string>
@@ -323,29 +250,9 @@
     <string name="pref_camera_saturation_entry_level9">Level 9</string>
     <string name="pref_camera_saturation_entry_level10">Level 10</string>
 
-    <!-- Default sharpness setting. Do not translate. -->
-    <string name="pref_camera_sharpness_default" translatable="false">2</string>
-
-    <!-- Settings screen, Select sharpness title -->
-    <string name="pref_camera_sharpness_title">Sharpness</string>
-
-    <!-- Default contrast setting. Do not translate. -->
-    <string name="pref_camera_contrast_default" translatable="false">5</string>
-
-    <!-- Settings screen, Select contrast title -->
-    <string name="pref_camera_contrast_title">Contrast</string>
-
-    <!-- Default saturation setting. Do not translate. -->
-    <string name="pref_camera_saturation_default" translatable="false">5</string>
-
-    <!-- Settings screen, Select saturation title -->
-    <string name="pref_camera_saturation_title">Saturation</string>
-
-    <!-- Default Picture format setting. Do not translate. -->
-    <string name="pref_camera_picture_format_default" translatable="false">jpeg</string>
-
     <!-- Settings screen, Select Picture format title -->
     <string name="pref_camera_picture_format_title">Picture format</string>
+    <string name="pref_camera_picture_format_default" translatable="false">jpeg</string>
 
     <!-- Settings screen, picture format dialog radio button choices -->
     <string name="pref_camera_picture_format_entry_jpeg" translatable="false">JPEG</string>
@@ -420,85 +327,9 @@
     <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12rggb" translatable="false">BayerIP1612RGGB</string>
     <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12bggr" translatable="false">BayerIP1612BGGR</string>
 
-    <!-- Picture format entry values. Do not translate. -->
-    <string name="pref_camera_picture_format_value_jpeg" translatable="false">jpeg</string>
-    <string name="pref_camera_picture_format_value_raw" translatable="false">raw</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_422_sp" translatable="false">yuv422sp</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_8bit_yuyv" translatable="false">yuv-raw8-yuyv</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_8bit_yvyu" translatable="false">yuv-raw8-yvyu</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_8bit_uyvy" translatable="false">yuv-raw8-uyvy</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_8bit_vyuy" translatable="false">yuv-raw8-vyuy</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8gbrg" translatable="false">bayer-qcom-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8grbg" translatable="false">bayer-qcom-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8rggb" translatable="false">bayer-qcom-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8bggr" translatable="false">bayer-qcom-8bgrr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10gbrg" translatable="false">bayer-qcom-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10grbg" translatable="false">bayer-qcom-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10rggb" translatable="false">bayer-qcom-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10bggr" translatable="false">bayer-qcom-10bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12gbrg" translatable="false">bayer-qcom-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12grbg" translatable="false">bayer-qcom-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12rggb" translatable="false">bayer-qcom-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12bggr" translatable="false">bayer-qcom-12bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8gbrg" translatable="false">bayer-mipi-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8grbg" translatable="false">bayer-mipi-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8rggb" translatable="false">bayer-mipi-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8bggr" translatable="false">bayer-mipi-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10gbrg" translatable="false">bayer-mipi-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10grbg" translatable="false">bayer-mipi-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10rggb" translatable="false">bayer-mipi-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10bggr" translatable="false">bayer-mipi-10bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12gbrg" translatable="false">bayer-mipi-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12grbg" translatable="false">bayer-mipi-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12rggb" translatable="false">bayer-mipi-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12bggr" translatable="false">bayer-mipi-12bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8gbrg" translatable="false">bayer-ideal-qcom-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8grbg" translatable="false">bayer-ideal-qcom-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8rggb" translatable="false">bayer-ideal-qcom-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8bggr" translatable="false">bayer-ideal-qcom-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10gbrg" translatable="false">bayer-ideal-qcom-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10grbg" translatable="false">bayer-ideal-qcom-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10rggb" translatable="false">bayer-ideal-qcom-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10bggr" translatable="false">bayer-ideal-qcom-10bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12gbrg" translatable="false">bayer-ideal-qcom-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12grbg" translatable="false">bayer-ideal-qcom-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12rggb" translatable="false">bayer-ideal-qcom-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12bggr" translatable="false">bayer-ideal-qcom-12bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8gbrg" translatable="false">bayer-ideal-mipi-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8grbg" translatable="false">bayer-ideal-mipi-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8rggb" translatable="false">bayer-ideal-mipi-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8bggr" translatable="false">bayer-ideal-mipi-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10gbrg" translatable="false">bayer-ideal-mipi-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10grbg" translatable="false">bayer-ideal-mipi-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10rggb" translatable="false">bayer-ideal-mipi-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10bggr" translatable="false">bayer-ideal-mipi-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12gbrg" translatable="false">bayer-ideal-mipi-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12grbg" translatable="false">bayer-ideal-mipi-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12rggb" translatable="false">bayer-ideal-mipi-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12bggr" translatable="false">bayer-ideal-mipi-12bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8gbrg" translatable="false">bayer-ideal-plain8-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8grbg" translatable="false">bayer-ideal-plain8-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8rggb" translatable="false">bayer-ideal-plain8-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8bggr" translatable="false">bayer-ideal-plain8-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8gbrg" translatable="false">bayer-ideal-plain16-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8grbg" translatable="false">bayer-ideal-plain16-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8rggb" translatable="false">bayer-ideal-plain16-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8bggr" translatable="false">bayer-ideal-plain16-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10gbrg" translatable="false">bayer-ideal-plain16-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10grbg" translatable="false">bayer-ideal-plain16-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10rggb" translatable="false">bayer-ideal-plain16-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10bggr" translatable="false">bayer-ideal-plain16-10bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12gbrg" translatable="false">bayer-ideal-plain16-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12grbg" translatable="false">bayer-ideal-plain16-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12rggb" translatable="false">bayer-ideal-plain16-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12bggr" translatable="false">bayer-ideal-plain16-12bggr</string>
-
-    <!-- Default picture quality setting. See
-         pref_camera_jpegquality_entryvalues for possible values -->
-    <string name="pref_camera_jpegquality_default" translatable="false">85</string>
-
     <!-- Settings screen, Picture quality title -->
     <string name="pref_camera_jpegquality_title">Picture quality</string>
+    <string name="pref_camera_jpegquality_default" translatable="false">85</string>
 
     <!-- Settings screen, Picture quality dialog radio button choices -->
     <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -508,30 +339,13 @@
     <string name="pref_camera_jpegquality_entry_4">95%</string>
     <string name="pref_camera_jpegquality_entry_5">100%</string>
 
-    <!-- Default auto histogram setting. Do not translate. -->
-    <string name="pref_camera_histogram_default" translatable="false">disable</string>
-
     <!-- Settings screen, Select Histogram title -->
     <string name="pref_camera_histogram_title">Histogram</string>
-
-    <!-- Settings screen, Histogram radio button choices -->
-    <string name="pref_camera_histogram_entry_disable">Off</string>
-    <string name="pref_camera_histogram_entry_enable">On</string>
-
-    <!-- Histogram entry values. Do not translate. -->
-    <string name="pref_camera_histogram_value_disable" translatable="false">disable</string>
-    <string name="pref_camera_histogram_value_enable" translatable="false">enable</string>
-
-    <!-- Default auto scene detection setting. -->
-    <string name="pref_camera_scenedetect_default" translatable="false">off</string>
+    <string name="pref_camera_histogram_default" translatable="false">disable</string>
 
     <!-- Settings screen, Select Auto Scene Detection -->
     <string name="pref_camera_scenedetect_title">Auto Scene Detection</string>
-
-    <!-- Settings menu, auto scene detection choices -->
-    <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
-    <string name="pref_camera_scenedetect_entry_on">On</string>
-    <string name="pref_camera_scenedetect_entry_off">Off</string>
+    <string name="pref_camera_scenedetect_default" translatable="false">off</string>
 
     <string name="pref_camera_videosnapsize_default" translatable="false">1920x1080</string>
 </resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 8001b7307..1544b564b 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -35,6 +35,7 @@
             camera:key="pref_camera_scenemode_key"
             camera:defaultValue="@string/pref_camera_scenemode_default"
             camera:title="@string/pref_camera_scenemode_title"
+            camera:icon="@drawable/ic_sce"
             camera:entries="@array/pref_camera_scenemode_entries"
             camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
     <IconListPreference
@@ -58,9 +59,10 @@
     <ListPreference
             camera:key="pref_camera_picturesize_key"
             camera:title="@string/pref_camera_picturesize_title"
+            camera:icon="@drawable/ic_imagesize"
             camera:entries="@array/pref_camera_picturesize_entries"
             camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
-     <ListPreference
+    <ListPreference
             camera:key="pref_camera_storage_key"
             camera:title="@string/pref_camera_storage_title" />
     <ListPreference
@@ -127,6 +129,7 @@
             camera:key="pref_camera_coloreffect_key"
             camera:defaultValue="@string/pref_camera_coloreffect_default"
             camera:title="@string/pref_camera_coloreffect_title"
+            camera:icon="@drawable/ic_tint"
             camera:entries="@array/pref_camera_coloreffect_entries"
             camera:entryValues="@array/pref_camera_coloreffect_entryvalues" />
     <ListPreference
@@ -225,7 +228,7 @@
             camera:defaultValue="@string/pref_camera_videosnapsize_default"
             camera:entries="@array/pref_camera_picturesize_entries"
             camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
-     <ListPreference
+    <ListPreference
             camera:key="pref_camera_focustime_key"
             camera:defaultValue="@string/pref_camera_focustime_default"
             camera:title="@string/pref_camera_focustime_title"
@@ -250,6 +253,7 @@
             camera:key="pref_camera_slow_shutter"
             camera:defaultValue="@string/pref_camera_slow_shutter_default"
             camera:title="@string/pref_camera_slow_shutter_title"
+            camera:icon="@drawable/ic_slowshutter_off"
             camera:entries="@array/pref_camera_slow_shutter_entries"
             camera:entryValues="@array/pref_camera_slow_shutter_entryvalues" />
     <IconListPreference
@@ -268,6 +272,12 @@
             camera:entries="@array/pref_switch_entries"
             camera:entryValues="@array/pref_switch_entryvalues" />
     <ListPreference
+            camera:key="pref_max_brightness"
+            camera:defaultValue="@string/pref_camera_max_brightness_default"
+            camera:title="@string/pref_camera_max_brightness_title"
+            camera:entries="@array/pref_switch_entries"
+            camera:entryValues="@array/pref_switch_entryvalues" />
+    <ListPreference
             camera:key="pref_camera_superzoom"
             camera:defaultValue="@string/pref_superzoom_default"
             camera:title="@string/pref_superzoom_title"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 7f73aa5d3..9270187d9 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -20,6 +20,7 @@
     <ListPreference
             camera:key="pref_video_quality_key"
             camera:title="@string/pref_video_quality_title"
+            camera:icon="@drawable/ic_imagesize"
             camera:entries="@array/pref_video_quality_entries"
             camera:entryValues="@array/pref_video_quality_entryvalues"/>
     <ListPreference
@@ -35,12 +36,6 @@
             camera:entries="@array/pref_camera_audioencoder_entries"
             camera:entryValues="@array/pref_camera_audioencoder_entryvalues" />
     <ListPreference
-            camera:key="pref_camera_video_duration_key"
-            camera:defaultValue="@string/pref_camera_video_duration_default"
-            camera:title="@string/pref_camera_video_duration_title"
-            camera:entries="@array/pref_camera_video_duration_entries"
-            camera:entryValues="@array/pref_camera_video_duration_entryvalues" />
-    <ListPreference
             camera:key="pref_camera_storage_key"
             camera:title="@string/pref_camera_storage_title" />
     <IconListPreference
@@ -113,6 +108,7 @@
             camera:key="pref_camera_video_coloreffect_key"
             camera:defaultValue="@string/pref_camera_coloreffect_default"
             camera:title="@string/pref_camera_coloreffect_title"
+            camera:icon="@drawable/ic_tint"
             camera:entries="@array/pref_camera_coloreffect_entries"
             camera:entryValues="@array/pref_camera_coloreffect_entryvalues" />
     <ListPreference
@@ -151,4 +147,10 @@
             camera:title="@string/pref_camera_power_shutter_title"
             camera:entries="@array/pref_switch_entries"
             camera:entryValues="@array/pref_switch_entryvalues" />
+    <ListPreference
+            camera:key="pref_max_brightness"
+            camera:defaultValue="@string/pref_camera_max_brightness_default"
+            camera:title="@string/pref_camera_max_brightness_title"
+            camera:entries="@array/pref_switch_entries"
+            camera:entryValues="@array/pref_switch_entryvalues" />
 </PreferenceGroup>
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 17d69794b..6fb0ec836 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -170,6 +170,8 @@ public class CameraActivity extends Activity
     private boolean mInCameraApp = true;
     // Keep track of powershutter state
     public static boolean mPowerShutter = false;
+    // Keep track of max brightness state
+    public static boolean mMaxBrightness = false;
     // This is a hack to speed up the start of SecureCamera.
     private static boolean sFirstStartAfterScreenOn = true;
     private int mLastRawOrientation;
@@ -183,6 +185,7 @@ public class CameraActivity extends Activity
     private ViewGroup mUndoDeletionBar;
     private boolean mIsUndoingDeletion = false;
     private boolean mIsEditActivityInProgress = false;
+    protected boolean mIsModuleSwitchInProgress = false;
 
     private Uri[] mNfcPushUris = new Uri[1];
 
@@ -1327,9 +1330,7 @@ public class CameraActivity extends Activity
             // Prevent software keyboard or voice search from showing up.
             if (keyCode == KeyEvent.KEYCODE_SEARCH
                     || keyCode == KeyEvent.KEYCODE_MENU) {
-                if (event.isLongPress()) {
-                    return true;
-                }
+                return true;
             }
         }
 
@@ -1432,6 +1433,24 @@ public class CameraActivity extends Activity
         }
     }
 
+    protected void initMaxBrightness(ComboPreferences prefs) {
+        String val = prefs.getString(CameraSettings.KEY_MAX_BRIGHTNESS,
+                getResources().getString(R.string.pref_camera_max_brightness_default));
+
+        Window win = getWindow();
+        WindowManager.LayoutParams params = win.getAttributes();
+
+        mMaxBrightness = val.equals(CameraSettings.VALUE_ON);
+
+        if (mMaxBrightness && mInCameraApp) {
+            params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL;
+        } else {
+            params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE;
+        }
+
+        win.setAttributes(params);
+    }
+
     protected void setResultEx(int resultCode) {
         mResultCodeForTesting = resultCode;
         setResult(resultCode);
@@ -1465,6 +1484,7 @@ public class CameraActivity extends Activity
             return;
         }
 
+        mIsModuleSwitchInProgress = true;
         CameraHolder.instance().keep();
         closeModule(mCurrentModule);
         setModuleFromIndex(moduleIndex);
@@ -1479,6 +1499,7 @@ public class CameraActivity extends Activity
         // starts up.
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         prefs.edit().putInt(CameraSettings.KEY_STARTUP_MODULE_INDEX, moduleIndex).apply();
+        mIsModuleSwitchInProgress = false;
     }
 
     /**
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 013d09093..08aa9e20c 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2009 The Android Open Source Project
- * Copyright (C) 2013 The CyanogenMod Project
+ * Copyright (C) 2013-2014 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,9 +83,9 @@ public class CameraSettings {
     public static final String KEY_SUPERZOOM = "pref_camera_superzoom";
 
     public static final String KEY_POWER_SHUTTER = "pref_power_shutter";
+    public static final String KEY_MAX_BRIGHTNESS = "pref_max_brightness";
     public static final String KEY_VIDEO_ENCODER = "pref_camera_videoencoder_key";
     public static final String KEY_AUDIO_ENCODER = "pref_camera_audioencoder_key";
-    public static final String KEY_VIDEO_DURATION = "pref_camera_video_duration_key";
     public static final String KEY_POWER_MODE = "pref_camera_powermode_key";
     public static final String KEY_PICTURE_FORMAT = "pref_camera_pictureformat_key";
     public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key";
@@ -133,9 +133,6 @@ public class CameraSettings {
     public static final String FLIP_MODE_VH = "flip-vh";
 
     private static final String KEY_QC_PICTURE_FORMAT = "picture-format-values";
-    private static final String VIDEO_QUALITY_HIGH = "high";
-    private static final String VIDEO_QUALITY_MMS = "mms";
-    private static final String VIDEO_QUALITY_YOUTUBE = "youtube";
 
     public static final String KEY_BURST_MODE = "pref_camera_burst_key";
     public static final String KEY_BEAUTY_MODE = "pref_camera_beauty_mode";
@@ -149,11 +146,6 @@ public class CameraSettings {
     public static final int CURRENT_VERSION = 7;
     public static final int CURRENT_LOCAL_VERSION = 3;
 
-    public static final int DEFAULT_VIDEO_DURATION = 0; // no limit
-    private static final int MMS_VIDEO_DURATION = (CamcorderProfile.get(CamcorderProfile.QUALITY_LOW) != null) ?
-          CamcorderProfile.get(CamcorderProfile.QUALITY_LOW).duration :30;
-    private static final int YOUTUBE_VIDEO_DURATION = 15 * 60; // 15 mins
-
     private static final String TAG = "CameraSettings";
 
     private final Context mContext;
@@ -283,7 +275,7 @@ public class CameraSettings {
     private List<String> getSupportedPictureFormatLists() {
         String str = mParameters.get(KEY_QC_PICTURE_FORMAT);
         if (str == null) {
-            str = "jpeg,raw"; // if not set, fall back to default behavior
+            return null;
         }
         return split(str);
     }
@@ -441,6 +433,7 @@ public class CameraSettings {
         ListPreference asd = group.findPreference(KEY_ASD);
         ListPreference storage = group.findPreference(KEY_STORAGE);
         ListPreference superZoom = group.findPreference(KEY_SUPERZOOM);
+        ListPreference videoHdr = group.findPreference(KEY_VIDEO_HDR);
 
         // Since the screen could be loaded from different resources, we need
         // to check if the preference is available here
@@ -497,6 +490,9 @@ public class CameraSettings {
                 !GcamHelper.hasGcamCapture() || isFrontCamera)) {
             removePreference(group, cameraHdrPlus.getKey());
         }
+        if (videoHdr != null) {
+            filterUnsupportedOptions(group, videoHdr, mParameters.getSupportedVideoHDRModes());
+        }
         if (powerShutter != null && CameraUtil.hasCameraKey()) {
             removePreference(group, powerShutter.getKey());
         }
@@ -730,7 +726,6 @@ public class CameraSettings {
             // Just use video quality to replace it and
             // ignore the current settings.
             editor.remove("pref_camera_videoquality_key");
-            editor.remove("pref_camera_video_duration_key");
             version = 4;
         }
         if (version == 4) {
@@ -932,15 +927,6 @@ public class CameraSettings {
               supported.add(Integer.toString(CamcorderProfile.QUALITY_QCIF));
            }
         }
-
-    }
-    public static int getVideoDurationInMillis(String quality) {
-        if (VIDEO_QUALITY_MMS.equals(quality)) {
-            return MMS_VIDEO_DURATION * 1000;
-        } else if (VIDEO_QUALITY_YOUTUBE.equals(quality)) {
-            return YOUTUBE_VIDEO_DURATION * 1000;
-        }
-        return DEFAULT_VIDEO_DURATION * 1000;
     }
 
     /**
@@ -961,21 +947,6 @@ public class CameraSettings {
         return isBeautyModeSupported(params) && (Integer.valueOf(params.get("face-beautify")) > 0);
     }
 
-    /**
-     * Enable video mode for certain cameras.
-     *
-     * @param params
-     * @param on
-     */
-    public static void setVideoMode(Parameters params, boolean on) {
-        if (CameraUtil.useSamsungCamMode()) {
-            params.set("cam_mode", on ? "1" : "0");
-        }
-        if (CameraUtil.useHTCCamMode()) {
-            params.set("cam-mode", on ? "1" : "0");
-        }
-    }
-
     public static List<String> getSupportedSlowShutter(Parameters params) {
         String p = params.get("exposure-time-values");
         if (p != null) {
@@ -995,11 +966,6 @@ public class CameraSettings {
                 !"0".equals(params.get("exposure-time"));
     }
 
-    public static boolean useZSLBurst(Parameters params) {
-        return CameraUtil.isZSLEnabled() &&
-                params.get("num-snaps-per-shutter") != null;
-    }
-
     public static void setSuperZoom(Parameters params, boolean on) {
         if (isSuperZoomSupported(params)) {
             params.set("high-resolution", on ? "1" : "0");
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java
index efb9968cf..00e0d5853 100644
--- a/src/com/android/camera/ComboPreferences.java
+++ b/src/com/android/camera/ComboPreferences.java
@@ -154,6 +154,7 @@ public class ComboPreferences implements
                 || key.equals(CameraSettings.KEY_TIMER_SOUND_EFFECTS)
                 || key.equals(CameraSettings.KEY_PHOTOSPHERE_PICTURESIZE)
                 || key.equals(CameraSettings.KEY_POWER_SHUTTER)
+                || key.equals(CameraSettings.KEY_MAX_BRIGHTNESS)
                 || key.equals(CameraSettings.KEY_STORAGE);
     }
 
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 1ff375203..202b408d4 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -42,8 +42,8 @@ public class ListPreference extends CameraPreference {
 
     private CharSequence[] mEntries;
     private CharSequence[] mEntryValues;
-    private CharSequence[] mUnfilteredEntryValues;
     private CharSequence[] mLabels;
+    private int mIconId;
     private boolean mLoaded = false;
 
     public ListPreference(Context context, AttributeSet attrs) {
@@ -74,6 +74,8 @@ public class ListPreference extends CameraPreference {
                 R.styleable.ListPreference_entryValues));
         setLabels(a.getTextArray(
                 R.styleable.ListPreference_labelList));
+        mIconId = a.getResourceId(
+                R.styleable.ListPreference_icon, 0);
         a.recycle();
     }
 
@@ -93,13 +95,16 @@ public class ListPreference extends CameraPreference {
         return mLabels;
     }
 
+    public int getIcon() {
+        return mIconId;
+    }
+
     public void setEntries(CharSequence entries[]) {
         mEntries = entries == null ? new CharSequence[0] : entries;
     }
 
     public void setEntryValues(CharSequence values[]) {
         mEntryValues = values == null ? new CharSequence[0] : values;
-        mUnfilteredEntryValues = values == null ? new CharSequence[0] : values;
     }
 
     public void setLabels(CharSequence labels[]) {
@@ -148,21 +153,10 @@ public class ListPreference extends CameraPreference {
         return -1;
     }
 
-    public int findUnfilteredIndexOfValue(String value) {
-        for (int i = 0, n = mUnfilteredEntryValues.length; i < n; ++i) {
-            if (CameraUtil.equals(mUnfilteredEntryValues[i], value)) return i;
-        }
-        return -1;
-    }
-
     public int getCurrentIndex() {
         return findIndexOfValue(getValue());
     }
 
-    public int getCurrentUnfilteredIndex() {
-        return findUnfilteredIndexOfValue(getValue());
-    }
-
     public String getEntry() {
         return mEntries[findIndexOfValue(getValue())].toString();
     }
@@ -186,49 +180,29 @@ public class ListPreference extends CameraPreference {
     public void filterUnsupported(List<String> supported) {
         ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
         ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>();
-        ArrayList<CharSequence> labels = null;
-        if (mLabels.length > 0) {
-            labels = new ArrayList<CharSequence>();
-        }
         for (int i = 0, len = mEntryValues.length; i < len; i++) {
             if (supported.indexOf(mEntryValues[i].toString()) >= 0) {
                 entries.add(mEntries[i]);
                 entryValues.add(mEntryValues[i]);
-                if (labels != null) {
-                    labels.add(mLabels[i]);
-                }
             }
         }
         int size = entries.size();
         mEntries = entries.toArray(new CharSequence[size]);
         mEntryValues = entryValues.toArray(new CharSequence[size]);
-        if (labels != null) {
-            mLabels = labels.toArray(new CharSequence[size]);
-        }
     }
 
     public void filterDuplicated() {
         ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
         ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>();
-        ArrayList<CharSequence> labels = null;
-        if (mLabels.length > 0) {
-            labels = new ArrayList<CharSequence>();
-        }
         for (int i = 0, len = mEntryValues.length; i < len; i++) {
             if (!entries.contains(mEntries[i])) {
                 entries.add(mEntries[i]);
                 entryValues.add(mEntryValues[i]);
-                if (labels != null) {
-                    labels.add(mLabels[i]);
-                }
             }
         }
         int size = entries.size();
         mEntries = entries.toArray(new CharSequence[size]);
         mEntryValues = entryValues.toArray(new CharSequence[size]);
-        if (labels != null) {
-            mLabels = labels.toArray(new CharSequence[size]);
-        }
     }
 
     public void print() {
diff --git a/src/com/android/camera/PhotoController.java b/src/com/android/camera/PhotoController.java
index c1c3a8562..b08f8c088 100644
--- a/src/com/android/camera/PhotoController.java
+++ b/src/com/android/camera/PhotoController.java
@@ -23,7 +23,7 @@ import com.android.camera.ShutterButton.OnShutterButtonListener;
 
 
 public interface PhotoController extends OnShutterButtonListener {
-
+    public static final int INIT = -1;
     public static final int PREVIEW_STOPPED = 0;
     public static final int IDLE = 1;  // preview is active
     // Focus is in progress. The exact focus state is in Focus.java.
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 2246dc127..79a1708c8 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.hardware.Camera.Parameters;
 import android.view.LayoutInflater;
+import android.widget.Toast;
 
 import com.android.camera.ui.AbstractSettingPopup;
 import com.android.camera.ui.CountdownTimerPopup;
@@ -43,13 +44,15 @@ public class PhotoMenu extends PieController
     private final String mSettingOff;
 
     private PhotoUI mUI;
-    private String[] mOtherKeys;
+    private String[] mSettingsKeys;
     private AbstractSettingPopup mPopup;
+    private MoreSettingPopup mSettingsPopup;
 
     private static final int POPUP_NONE = 0;
     private static final int POPUP_FIRST_LEVEL = 1;
     private static final int POPUP_SECOND_LEVEL = 2;
     private int mPopupStatus;
+
     private CameraActivity mActivity;
 
     public PhotoMenu(CameraActivity activity, PhotoUI ui, PieRenderer pie) {
@@ -62,6 +65,7 @@ public class PhotoMenu extends PieController
     public void initialize(PreferenceGroup group) {
         super.initialize(group);
         mPopup = null;
+        mSettingsPopup = null;
         mPopupStatus = POPUP_NONE;
         PieItem item = null;
         final Resources res = mActivity.getResources();
@@ -97,21 +101,11 @@ public class PhotoMenu extends PieController
         final ListPreference slowShutterPref =
                 group.findPreference(CameraSettings.KEY_SLOW_SHUTTER);
         if (slowShutterPref != null) {
-            item = makeItem(R.drawable.ic_slowshutter_off);
-            item.setLabel(res.getString(
-                    R.string.pref_camera_slow_shutter_title).toUpperCase(locale));
+            item = makeListItem(CameraSettings.KEY_SLOW_SHUTTER);
             item.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(PieItem item) {
-                    ListPrefSettingPopup popup =
-                            (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
-                            R.layout.list_pref_setting_popup, null, false);
-                    popup.initialize(slowShutterPref);
-                    popup.setSettingChangedListener(PhotoMenu.this);
-                    mUI.dismissPopup();
-                    mPopup = popup;
-                    mPopupStatus = POPUP_SECOND_LEVEL;
-                    mUI.showPopup(mPopup);
+                    showListPopup(slowShutterPref);
                 }
             });
             enhance.addItem(item);
@@ -124,21 +118,11 @@ public class PhotoMenu extends PieController
         // color effect
         final ListPreference colorPref = group.findPreference(CameraSettings.KEY_COLOR_EFFECT);
         if (colorPref != null) {
-            item = makeItem(R.drawable.ic_tint);
-            item.setLabel(res.getString(
-                    R.string.pref_camera_coloreffect_title).toUpperCase(locale));
+            item = makeListItem(CameraSettings.KEY_COLOR_EFFECT);
             item.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(PieItem item) {
-                    ListPrefSettingPopup popup =
-                            (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
-                            R.layout.list_pref_setting_popup, null, false);
-                    popup.initialize(colorPref);
-                    popup.setSettingChangedListener(PhotoMenu.this);
-                    mUI.dismissPopup();
-                    mPopup = popup;
-                    mPopupStatus = POPUP_SECOND_LEVEL;
-                    mUI.showPopup(mPopup);
+                    showListPopup(colorPref);
                 }
             });
             enhance.addItem(item);
@@ -201,7 +185,6 @@ public class PhotoMenu extends PieController
                 timerPopup.setSettingChangedListener(PhotoMenu.this);
                 mUI.dismissPopup();
                 mPopup = timerPopup;
-                mPopupStatus = POPUP_SECOND_LEVEL;
                 mUI.showPopup(mPopup);
             }
         });
@@ -209,21 +192,11 @@ public class PhotoMenu extends PieController
         // image size
         final ListPreference sizePref = group.findPreference(CameraSettings.KEY_PICTURE_SIZE);
         if (sizePref != null) {
-            item = makeItem(R.drawable.ic_imagesize);
-            item.setLabel(res.getString(
-                    R.string.pref_camera_picturesize_title).toUpperCase(locale));
+            item = makeListItem(CameraSettings.KEY_PICTURE_SIZE);
             item.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(PieItem item) {
-                    ListPrefSettingPopup popup =
-                            (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
-                            R.layout.list_pref_setting_popup, null, false);
-                    popup.initialize(sizePref);
-                    popup.setSettingChangedListener(PhotoMenu.this);
-                    mUI.dismissPopup();
-                    mPopup = popup;
-                    mPopupStatus = POPUP_SECOND_LEVEL;
-                    mUI.showPopup(mPopup);
+                    showListPopup(sizePref);
                 }
             });
             more.addItem(item);
@@ -237,28 +210,20 @@ public class PhotoMenu extends PieController
         // scene mode
         final ListPreference scenePref = group.findPreference(CameraSettings.KEY_SCENE_MODE);
         if (scenePref != null) {
-            item = makeItem(R.drawable.ic_sce);
-            item.setLabel(res.getString(R.string.pref_camera_scenemode_title).toUpperCase(locale));
+            item = makeListItem(CameraSettings.KEY_SCENE_MODE);
             item.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(PieItem item) {
-                    LayoutInflater inflater = mActivity.getLayoutInflater();
-                    ListPrefSettingPopup popup = (ListPrefSettingPopup) inflater.inflate(
-                            R.layout.list_pref_setting_popup, null, false);
-                    popup.initialize(scenePref);
-                    popup.setSettingChangedListener(PhotoMenu.this);
-                    mUI.dismissPopup();
-                    mPopup = popup;
-                    mPopupStatus = POPUP_SECOND_LEVEL;
-                    mUI.showPopup(mPopup);
+                    showListPopup(scenePref);
                 }
             });
             enhance.addItem(item);
         }
         // extra settings popup
-        mOtherKeys = new String[] {
+        mSettingsKeys = new String[] {
                 CameraSettings.KEY_STORAGE,
                 CameraSettings.KEY_POWER_SHUTTER,
+                CameraSettings.KEY_MAX_BRIGHTNESS,
                 CameraSettings.KEY_FOCUS_MODE,
                 CameraSettings.KEY_FOCUS_TIME,
                 CameraSettings.KEY_ISO,
@@ -270,47 +235,103 @@ public class PhotoMenu extends PieController
                 CameraSettings.KEY_HISTOGRAM,
                 CameraSettings.KEY_SUPERZOOM
         };
-        item = makeItem(R.drawable.ic_settings_holo_light);
-        item.setLabel(res.getString(R.string.camera_menu_more_label).toUpperCase(locale));
-        item.setOnClickListener(new OnClickListener() {
+        PieItem settings = makeItem(R.drawable.ic_settings_holo_light);
+        settings.setLabel(res.getString(R.string.camera_menu_more_label).toUpperCase(locale));
+        settings.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(PieItem item) {
-                if (mPopup == null || mPopupStatus != POPUP_FIRST_LEVEL) {
-                    LayoutInflater inflater = mActivity.getLayoutInflater();
-                    MoreSettingPopup popup = (MoreSettingPopup) inflater.inflate(
-                            R.layout.more_setting_popup, null, false);
-                    popup.initialize(mPreferenceGroup, mOtherKeys);
-                    popup.setSettingChangedListener(PhotoMenu.this);
-                    mPopup = popup;
+                if (mSettingsPopup == null || mPopupStatus != POPUP_FIRST_LEVEL) {
+                    initializeSettingsPopup();
                     mPopupStatus = POPUP_FIRST_LEVEL;
                 }
-                mUI.showPopup(mPopup);
+                mUI.showPopup(mSettingsPopup);
             }
         });
-        more.addItem(item);
+        more.addItem(settings);
         // burst mode
         final ListPreference burstPref = group.findPreference(CameraSettings.KEY_BURST_MODE);
         mUI.updateBurstModeIcon(Integer.valueOf(burstPref.getValue()));
     }
 
+    public void popupDismissed() {
+        if (mPopupStatus == POPUP_SECOND_LEVEL) {
+            initializeSettingsPopup();
+            mPopupStatus = POPUP_FIRST_LEVEL;
+            mUI.showPopup(mSettingsPopup);
+            if (mSettingsPopup != null) {
+                mSettingsPopup = null;
+            }
+        } else {
+            initializeSettingsPopup();
+            if (mPopup != null) {
+                mPopup = null;
+            }
+        }
+    }
+
+    @Override
+    public void reloadPreferences() {
+        super.reloadPreferences();
+        if (mSettingsPopup != null) {
+            mSettingsPopup.reloadPreference();
+        }
+    }
+
+    @Override
+    public void overrideSettings(final String ... keyvalues) {
+        super.overrideSettings(keyvalues);
+        if (mSettingsPopup == null) {
+            initializeSettingsPopup();
+        }
+        mSettingsPopup.overrideSettings(keyvalues);
+    }
+
     @Override
-    // Hit when an item in the second-level popup gets selected
+    // Hit when an item in a popup gets selected
     public void onListPrefChanged(ListPreference pref) {
-        if (mPopup != null) {
-            if (mPopupStatus == POPUP_SECOND_LEVEL) {
-                mUI.dismissPopup();
-            }
+        if (mPopup != null && mSettingsPopup != null) {
+            mUI.dismissPopup();
         }
         onSettingChanged(pref);
     }
 
-    public void popupDismissed() {
-        // if the 2nd level popup gets dismissed
-        if (mPopup != null) {
-            if (mPopupStatus == POPUP_SECOND_LEVEL) {
-                mPopup = null;
-            }
-        }
+    @Override
+    // Hit when an item in the first-level popup gets selected, then bring up
+    // the second-level popup
+    public void onPreferenceClicked(ListPreference pref) {
+        if (mPopupStatus != POPUP_FIRST_LEVEL) return;
+
+        ListPrefSettingPopup basic =
+                (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
+                R.layout.list_pref_setting_popup, null, false);
+        basic.initialize(pref);
+        basic.setSettingChangedListener(this);
+        mUI.dismissPopup();
+        mPopup = basic;
+        mUI.showPopup(mPopup);
+        mPopupStatus = POPUP_SECOND_LEVEL;
+    }
+
+    // Initialize the second-level settings popup
+    protected void initializeSettingsPopup() {
+        MoreSettingPopup popup =
+                (MoreSettingPopup) mActivity.getLayoutInflater().inflate(
+                R.layout.more_setting_popup, null, false);
+        popup.initialize(mPreferenceGroup, mSettingsKeys);
+        popup.setSettingChangedListener(PhotoMenu.this);
+        mSettingsPopup = popup;
+    }
+
+    // Show a popup options list
+    protected void showListPopup(ListPreference pref) {
+        ListPrefSettingPopup popup =
+                (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
+                R.layout.list_pref_setting_popup, null, false);
+        popup.initialize(pref);
+        popup.setSettingChangedListener(PhotoMenu.this);
+        mUI.dismissPopup();
+        mPopup = popup;
+        mUI.showPopup(mPopup);
     }
 
     // Return true if the preference has the specified key but not the value.
@@ -332,6 +353,12 @@ public class PhotoMenu extends PieController
         // set to non-auto. Also disable beautify when HDR is active.
         // Disable burst mode if it causes damage or doesn't make sense.
         if (notSame(pref, CameraSettings.KEY_CAMERA_HDR, mSettingOff)) {
+            ListPreference scenePref =
+                    mPreferenceGroup.findPreference(CameraSettings.KEY_SCENE_MODE);
+            if (scenePref != null && notSame(scenePref, CameraSettings.KEY_SCENE_MODE,
+                    Parameters.SCENE_MODE_AUTO)) {
+                Toast.makeText(mActivity, R.string.hdr_enable_message, Toast.LENGTH_LONG).show();
+            }
             setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO);
             setPreference(CameraSettings.KEY_BEAUTY_MODE, mSettingOff);
             setPreference(CameraSettings.KEY_SLOW_SHUTTER, "0");
@@ -339,11 +366,16 @@ public class PhotoMenu extends PieController
             disableBurstMode();
         } else if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO) ||
                    notSame(pref, CameraSettings.KEY_ASD, mSettingOff)) {
-            setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
             setPreference(CameraSettings.KEY_SLOW_SHUTTER, "0");
             if (!notSame(pref, CameraSettings.KEY_ASD, mSettingOff)) {
                 setPreference(CameraSettings.KEY_ASD, mSettingOff);
             }
+            ListPreference hdrPref =
+                    mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_HDR);
+            if (hdrPref != null && notSame(hdrPref, CameraSettings.KEY_CAMERA_HDR, mSettingOff)) {
+                Toast.makeText(mActivity, R.string.scene_enable_message, Toast.LENGTH_LONG).show();
+            }
+            setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
         } else if (notSame(pref, CameraSettings.KEY_BEAUTY_MODE, mSettingOff)) {
             setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
             setPreference(CameraSettings.KEY_SLOW_SHUTTER, "0");
@@ -371,21 +403,4 @@ public class PhotoMenu extends PieController
         mUI.updateBurstModeIcon(1);
     }
 
-    @Override
-    // Hit when an item in the first-level popup gets selected, then bring up
-    // the second-level popup
-    public void onPreferenceClicked(ListPreference pref) {
-        if (mPopupStatus != POPUP_FIRST_LEVEL) return;
-
-        LayoutInflater inflater = mActivity.getLayoutInflater();
-        ListPrefSettingPopup basic = (ListPrefSettingPopup) inflater.inflate(
-                R.layout.list_pref_setting_popup, null, false);
-        basic.initialize(pref);
-        basic.setSettingChangedListener(this);
-        mUI.dismissPopup();
-        mPopup = basic;
-        mUI.showPopup(mPopup);
-        mPopupStatus = POPUP_SECOND_LEVEL;
-    }
-
 }
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 3e59b3694..5a1013b63 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2014 The Android Open Source Project
- * Copyright (C) 2014 The CyanogenMod Project
+ * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2013-2014 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,6 +135,7 @@ public class PhotoModule
     private static final int SET_PHOTO_UI_PARAMS = 12;
     private static final int SWITCH_TO_GCAM_MODULE = 13;
     private static final int CONFIGURE_SKIN_TONE_FACTOR = 14;
+    private static final int ON_PREVIEW_STARTED = 15;
     private static final int UPDATE_ASD_ICON = 16;
     private static final int CLEAR_ASD_ICON = 17;
 
@@ -227,6 +228,15 @@ public class PhotoModule
         }
     };
 
+    private class OpenCameraThread extends Thread {
+        @Override
+        public void run() {
+            openCamera();
+            startPreview();
+        }
+    }
+
+    private OpenCameraThread mOpenCameraThread = null;
     /**
      * An unpublished intent flag requesting to return as soon as capturing
      * is completed.
@@ -250,7 +260,7 @@ public class PhotoModule
     private boolean mFirstTimeInitialized;
     private boolean mIsImageCaptureIntent;
 
-    private int mCameraState = PREVIEW_STOPPED;
+    private int mCameraState = INIT;
     private boolean mSnapshotOnIdle = false;
 
     private ContentResolver mContentResolver;
@@ -454,6 +464,10 @@ public class PhotoModule
                     }
                     break;
                 }
+                case ON_PREVIEW_STARTED: {
+                    onPreviewStarted();
+                    break;
+                }
                 case UPDATE_ASD_ICON: {
                     if (!mSceneDetection) {
                         mUI.updateSceneDetectionIcon(null);
@@ -503,9 +517,13 @@ public class PhotoModule
         // Power shutter
         mActivity.initPowerShutter(mPreferences);
 
-        // we need to reset exposure for the preview
-        resetExposureCompensation();
+        // Max brightness
+        mActivity.initMaxBrightness(mPreferences);
 
+        if (mOpenCameraThread == null && !mActivity.mIsModuleSwitchInProgress) {
+            mOpenCameraThread = new OpenCameraThread();
+            mOpenCameraThread.start();
+        }
         initializeControlByIntent();
         mQuickCapture = mActivity.getIntent().getBooleanExtra(EXTRA_QUICK_CAPTURE, false);
         mLocationManager = new LocationManager(mActivity, mUI);
@@ -530,8 +548,10 @@ public class PhotoModule
 
     private void onPreviewStarted() {
         setCameraState(IDLE);
+        mFocusManager.onPreviewStarted();
         startFaceDetection();
         locationFirstRun();
+        mUI.enableShutter(true);
     }
 
     // Prompt the user to pick to record location for the very first run of
@@ -558,7 +578,20 @@ public class PhotoModule
 
     @Override
     public void onPreviewUIReady() {
-        startPreview();
+        if (mPaused || mCameraDevice == null) {
+            return;
+        }
+        Log.v(TAG, "onPreviewUIReady");
+        if (mCameraState == PREVIEW_STOPPED) {
+            startPreview();
+        } else {
+            SurfaceTexture st = mUI.getSurfaceTexture();
+            if (st == null) {
+                Log.w(TAG, "startPreview: surfaceTexture is not ready.");
+                return;
+            }
+            mCameraDevice.setPreviewTexture(st);
+        }
     }
 
     @Override
@@ -566,6 +599,7 @@ public class PhotoModule
         if (mCameraDevice == null) {
             return;
         }
+        Log.v(TAG, "onPreviewUIDestroyed");
         stopPreview();
         mCameraDevice.setPreviewTexture(null);
     }
@@ -580,12 +614,10 @@ public class PhotoModule
     }
 
     private void onCameraOpened() {
-        View root = mUI.getRootView();
-        // These depend on camera parameters.
-
-        int width = root.getWidth();
-        int height = root.getHeight();
-        mFocusManager.setPreviewSize(width, height);
+        if (mPaused) {
+            return;
+        }
+        Log.v(TAG, "onCameraOpened");
         openCameraCommon();
         resizeForPreviewAspectRatio();
     }
@@ -617,6 +649,7 @@ public class PhotoModule
             return;
         }
         mParameters = mCameraDevice.getParameters();
+        mInitialParams = mParameters;
         initializeCapabilities();
         CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
         mMirror = (info.facing == CameraInfo.CAMERA_FACING_FRONT);
@@ -650,8 +683,6 @@ public class PhotoModule
         }
         updateSceneMode();
         showTapToFocusToastIfNeeded();
-
-
     }
 
     @Override
@@ -743,8 +774,6 @@ public class PhotoModule
         mFirstTimeInitialized = true;
         Log.d(TAG, "addIdleHandler in first time initialization");
         addIdleHandler();
-
-        mActivity.updateStorageSpaceAndHint();
     }
 
     // If the activity is paused and resumed, this method will be called in
@@ -800,6 +829,8 @@ public class PhotoModule
 
     @Override
     public void startFaceDetection() {
+        if (mCameraDevice == null) return;
+
         if (mFaceDetectionEnabled == false
                || mFaceDetectionStarted || mCameraState != IDLE) return;
         if (mParameters.getMaxNumDetectedFaces() > 0) {
@@ -1062,6 +1093,10 @@ public class PhotoModule
 
             if (needRestartPreview) {
                 setupPreview();
+                if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(
+                    mFocusManager.getFocusMode())) {
+                    mCameraDevice.cancelAutoFocus();
+                }
             }else if ((mReceivedSnapNum == mBurstSnapNum)
                         && (mCameraState != LONGSHOT)) {
                 mFocusManager.restartTouchFocusTimer();
@@ -1072,7 +1107,9 @@ public class PhotoModule
                 }
                 mUI.resumeFaceDetection();
                 mCameraDevice.startPreview();
-                setCameraState(IDLE);
+                if (!mIsImageCaptureIntent) {
+                    setCameraState(IDLE);
+                }
             }
 
             final ExifInterface exif = Exif.getExif(jpegData);
@@ -1175,8 +1212,13 @@ public class PhotoModule
                     }
                 }
                 // Animate capture with real jpeg data instead of a preview frame.
-                if (!mBurstShotInProgress && mCameraState != LONGSHOT
-                        && (mReceivedSnapNum == mBurstSnapNum)) {
+                if (!mBurstShotInProgress && mCameraState != LONGSHOT) {
+                    Size pic_size = mParameters.getPictureSize();
+                    if ((pic_size.width <= 352) && (pic_size.height <= 288)) {
+                        mUI.setDownFactor(2); //Downsample by 2 for CIF & below
+                    } else {
+                        mUI.setDownFactor(4);
+                    }
                     mUI.animateCapture(jpegData, orientation, mMirror,
                             (mSnapshotMode == CameraInfo.CAMERA_SUPPORT_MODE_ZSL) &&
                             (mSceneMode != CameraUtil.SCENE_MODE_HDR));
@@ -1216,7 +1258,8 @@ public class PhotoModule
             }
             if (mSnapshotMode == CameraInfo.CAMERA_SUPPORT_MODE_ZSL &&
                 mCameraState != LONGSHOT &&
-                mReceivedSnapNum == mBurstSnapNum) {
+                mReceivedSnapNum == mBurstSnapNum &&
+                !mIsImageCaptureIntent) {
                 cancelAutoFocus();
             }
 
@@ -1429,11 +1472,11 @@ public class PhotoModule
                         new JpegPictureCallback(loc));
             }
         } else {
+            setCameraState(SNAPSHOT_IN_PROGRESS);
             mCameraDevice.takePicture(mHandler,
                     new ShutterCallback(!animateBefore),
                     mRawPictureCallback, mPostViewPictureCallback,
                     new JpegPictureCallback(loc));
-            setCameraState(SNAPSHOT_IN_PROGRESS);
         }
 
         mNamedImages.nameNewImage(mCaptureStartTime);
@@ -1471,20 +1514,17 @@ public class PhotoModule
         // read settings from preferences so we retain user preferences.
         if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode) ||
             CameraSettings.isSlowShutterEnabled(mParameters)) {
-            String flashMode = mPreferences.getString(
-                    CameraSettings.KEY_FLASH_MODE,
-                    mActivity.getString(R.string.pref_camera_flashmode_default));
-            String whiteBalance = mPreferences.getString(
-                    CameraSettings.KEY_WHITE_BALANCE,
-                    mActivity.getString(R.string.pref_camera_whitebalance_default));
+            String flashMode = mParameters.getFlashMode();
+            String whiteBalance = Parameters.WHITE_BALANCE_AUTO;
             String focusMode = mFocusManager.getFocusMode();
 
             overrideCameraSettings(flashMode, whiteBalance, focusMode,
                     Integer.toString(mParameters.getExposureCompensation()),
                     mParameters.getAutoExposure(),
-                    getSaturationSafe(), getContrastSafe());
+                    getSaturationSafe(), getContrastSafe(),
+                    mParameters.getColorEffect());
         } else {
-            overrideCameraSettings(null, null, null, null, null, null, null);
+            overrideCameraSettings(null, null, null, null, null, null, null, null);
         }
     }
 
@@ -1492,7 +1532,7 @@ public class PhotoModule
             final String whiteBalance, final String focusMode,
             final String exposureMode,
             final String autoExposure, final String saturation,
-            final String contrast) {
+            final String contrast, final String colorEffect) {
         mUI.overrideSettings(
                 CameraSettings.KEY_FLASH_MODE, flashMode,
                 CameraSettings.KEY_WHITE_BALANCE, whiteBalance,
@@ -1500,7 +1540,8 @@ public class PhotoModule
                 CameraSettings.KEY_EXPOSURE, exposureMode,
                 CameraSettings.KEY_AUTOEXPOSURE, autoExposure,
                 CameraSettings.KEY_SATURATION, saturation,
-                CameraSettings.KEY_CONTRAST, contrast);
+                CameraSettings.KEY_CONTRAST, contrast,
+                CameraSettings.KEY_COLOR_EFFECT, colorEffect);
         if (CameraUtil.needSamsungHDRFormat()){
             if (mSceneMode == CameraUtil.SCENE_MODE_HDR) {
                 mUI.overrideSettings(CameraSettings.KEY_EXPOSURE,
@@ -1528,10 +1569,12 @@ public class PhotoModule
         if (orientation == OrientationEventListener.ORIENTATION_UNKNOWN) return;
         int oldOrientation = mOrientation;
         mOrientation = CameraUtil.roundOrientation(orientation, mOrientation);
-        if (oldOrientation != mOrientation) {
+        if (oldOrientation != mOrientation &&
+            oldOrientation != OrientationEventListener.ORIENTATION_UNKNOWN) {
             Log.v(TAG, "onOrientationChanged, update parameters");
             if (mParameters != null && mCameraDevice != null) {
-                onSharedPreferenceChanged();
+                setFlipValue();
+                mCameraDevice.setParameters(mParameters);
             }
         }
 
@@ -1681,7 +1724,12 @@ public class PhotoModule
         if (pressed && !canTakePicture()) return;
 
         if (pressed) {
-            mFocusManager.onShutterDown();
+            String timer = mPreferences.getString(
+                CameraSettings.KEY_TIMER,
+                mActivity.getString(R.string.pref_camera_timer_default));
+            if (timer.equals("0")) {
+                mFocusManager.onShutterDown();
+            }
         } else {
             // for countdown mode, we need to postpone the shutter release
             // i.e. lock the focus during countdown.
@@ -1693,7 +1741,7 @@ public class PhotoModule
 
     @Override
     public void onShutterButtonClick() {
-        int nbBurstShots = CameraSettings.useZSLBurst(mParameters) ? 1 :
+        int nbBurstShots =
                 Integer.valueOf(mPreferences.getString(CameraSettings.KEY_BURST_MODE, "1"));
 
         if (mPaused || mUI.collapseCameraControls()
@@ -1787,28 +1835,28 @@ public class PhotoModule
         mPaused = false;
     }
 
-    private boolean prepareCamera() {
+    private void openCamera() {
         // We need to check whether the activity is paused before long
         // operations to ensure that onPause() can be done ASAP.
+        if (mPaused) {
+            return;
+        }
         Log.v(TAG, "Open camera device.");
         mCameraDevice = CameraUtil.openCamera(
                 mActivity, mCameraId, mHandler,
                 mActivity.getCameraOpenErrorCallback());
         if (mCameraDevice == null) {
             Log.e(TAG, "Failed to open camera:" + mCameraId);
-            return false;
+            mHandler.sendEmptyMessage(OPEN_CAMERA_FAIL);
+            return;
         }
         mParameters = mCameraDevice.getParameters();
-
-        initializeCapabilities();
-        if (mFocusManager == null) initializeFocusManager();
-        setCameraParameters(UPDATE_PARAM_ALL);
-        mHandler.sendEmptyMessage(CAMERA_OPEN_DONE);
         mCameraPreviewParamsReady = true;
-        startPreview();
-        mOnResumeTime = SystemClock.uptimeMillis();
-        checkDisplayRotation();
-        return true;
+        mInitialParams = mParameters;
+        if (mFocusManager == null) initializeFocusManager();
+        initializeCapabilities();
+        mHandler.sendEmptyMessageDelayed(CAMERA_OPEN_DONE,100);
+        return;
     }
 
     @Override
@@ -1837,13 +1885,14 @@ public class PhotoModule
         Log.v(TAG, "Executing onResumeTasks.");
         if (mOpenCameraFail || mCameraDisabled) return;
 
+        if (mOpenCameraThread == null) {
+            mOpenCameraThread = new OpenCameraThread();
+            mOpenCameraThread.start();
+        }
+
         mJpegPictureCallbackTime = 0;
         mZoomValue = 0;
         resetExposureCompensation();
-        if (!prepareCamera()) {
-            // Camera failure.
-            return;
-        }
 
         if (mSkinToneSeekBar != true)
         {
@@ -1859,6 +1908,8 @@ public class PhotoModule
         }
         mUI.initDisplayChangeListener();
         keepScreenOnAwhile();
+        mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup,
+                        mPreferences);
 
         UsageStatistics.onContentViewChanged(
                 UsageStatistics.COMPONENT_CAMERA, "PhotoModule");
@@ -1872,6 +1923,9 @@ public class PhotoModule
         if (msensor != null) {
             mSensorManager.registerListener(this, msensor, SensorManager.SENSOR_DELAY_NORMAL);
         }
+
+        mOnResumeTime = SystemClock.uptimeMillis();
+        checkDisplayRotation();
     }
 
     @Override
@@ -1896,6 +1950,14 @@ public class PhotoModule
         Log.v(TAG, "On pause.");
         mUI.showPreviewCover();
 
+        try {
+            if (mOpenCameraThread != null) {
+                mOpenCameraThread.join();
+            }
+        } catch (InterruptedException ex) {
+            // ignore
+        }
+        mOpenCameraThread = null;
         // Reset the focus first. Camera CTS does not guarantee that
         // cancelAutoFocus is allowed after preview stops.
         if (mCameraDevice != null && mCameraState != PREVIEW_STOPPED) {
@@ -1909,6 +1971,9 @@ public class PhotoModule
         // Load the power shutter
         mActivity.initPowerShutter(mPreferences);
 
+        // Load max brightness
+        mActivity.initMaxBrightness(mPreferences);
+
         mNamedImages = null;
 
         if (mLocationManager != null) mLocationManager.recordLocation(false);
@@ -1953,6 +2018,12 @@ public class PhotoModule
                     mInitialParams, this, mMirror,
                     mActivity.getMainLooper(), mUI);
         }
+        View root = mUI.getRootView();
+        // These depend on camera parameters.
+
+        int width = root.getWidth();
+        int height = root.getHeight();
+        mFocusManager.setPreviewSize(width, height);
     }
 
     @Override
@@ -2044,6 +2115,7 @@ public class PhotoModule
         }
         switch (keyCode) {
             case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_MEDIA_NEXT:
                 if (mFirstTimeInitialized && (mUI.mMenuInitialized)) {
                     if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
                         onShutterButtonFocus(true);
@@ -2053,8 +2125,9 @@ public class PhotoModule
                 }
                 return true;
             case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
                 if (mFirstTimeInitialized && (mUI.mMenuInitialized)) {
-                   if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
+                    if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
                         onShutterButtonFocus(true);
                     } else {
                         mUI.onScaleStepResize(false);
@@ -2070,6 +2143,7 @@ public class PhotoModule
                 }
                 return false;
             case KeyEvent.KEYCODE_CAMERA:
+            case KeyEvent.KEYCODE_HEADSETHOOK:
                 if (mFirstTimeInitialized && event.getRepeatCount() == 0) {
                     onShutterButtonClick();
                 }
@@ -2100,6 +2174,8 @@ public class PhotoModule
         switch (keyCode) {
             case KeyEvent.KEYCODE_VOLUME_UP:
             case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_MEDIA_NEXT:
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
                 if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()
                         && mFirstTimeInitialized) {
                     onShutterButtonClick();
@@ -2137,7 +2213,9 @@ public class PhotoModule
             mFaceDetectionStarted = false;
             mCameraDevice = null;
             setCameraState(PREVIEW_STOPPED);
-            mFocusManager.onCameraReleased();
+            if (mFocusManager != null) {
+                mFocusManager.onCameraReleased();
+            }
         }
     }
 
@@ -2161,19 +2239,17 @@ public class PhotoModule
         startPreview();
     }
 
-    /** This can run on a background thread, post any view updates to MainHandler. */
+    /** This can run on a background thread, so don't do UI updates here. Post any
+             view updates to MainHandler or do it on onPreviewStarted() .  */
     private void startPreview() {
         if (mPaused || mCameraDevice == null) {
             return;
         }
 
-         // Any decisions we make based on the surface texture state
-         // need to be protected.
+        Log.v(TAG, "startPreview");
+
         SurfaceTexture st = mUI.getSurfaceTexture();
-        if (st == null) {
-            Log.w(TAG, "startPreview: surfaceTexture is not ready.");
-            return;
-        }
+        mCameraDevice.setPreviewTexture(st);
 
         if (!mCameraPreviewParamsReady) {
             Log.w(TAG, "startPreview: parameters for preview is not ready.");
@@ -2182,11 +2258,16 @@ public class PhotoModule
         mCameraDevice.setErrorCallback(mErrorCallback);
 
         // Preview needs to be stopped when changing resolution
-        if (mRestartPreview && mCameraState != PREVIEW_STOPPED) {
+        if (mRestartPreview && mCameraState != PREVIEW_STOPPED && mCameraState != INIT) {
             stopPreview();
             mRestartPreview = false;
         }
 
+        setCameraParameters(UPDATE_PARAM_ALL);
+
+        mCameraDevice.startPreview();
+        mHandler.sendEmptyMessage(ON_PREVIEW_STARTED);
+
         setDisplayOrientation();
 
         if (!mSnapshotOnIdle) {
@@ -2199,10 +2280,6 @@ public class PhotoModule
                 }
             }
             mFocusManager.setAeAwbLock(false); // Unlock AE and AWB.
-        }
-        setCameraParameters(UPDATE_PARAM_ALL);
-        // Let UI set its expected aspect ratio
-        mCameraDevice.setPreviewTexture(st);
 
         // Callback for automatic scene detection, if supported.
         // Will run on UI thread
@@ -2211,16 +2288,7 @@ public class PhotoModule
             mCameraDevice.setMetadataCallback(mHandler, mASDCallback);
         }
 
-        Log.v(TAG, "startPreview");
-        mCameraDevice.startPreview();
-        mFocusManager.onPreviewStarted();
-        onPreviewStarted();
-
-        // Set camera mode
-        CameraSettings.setVideoMode(mParameters, false);
-        mCameraDevice.setParameters(mParameters);
-
-        if (mSnapshotOnIdle && mBurstShotsDone > 0) {
+        } else if (mBurstShotsDone > 0) {
             mHandler.post(mDoSnapRunnable);
         }
     }
@@ -2298,6 +2366,7 @@ public class PhotoModule
         return ret;
     }
 
+    /** This can run on a background thread, so don't do UI updates here.*/
     private void qcomUpdateCameraParametersPreference() {
         // Set Picture Format
         // Picture Formats specified in UI should be consistent with
@@ -2430,12 +2499,12 @@ public class PhotoModule
         String hdr = mPreferences.getString(CameraSettings.KEY_CAMERA_HDR,
                 mActivity.getString(R.string.pref_camera_hdr_default));
         String format = mPreferences.getString(CameraSettings.KEY_PICTURE_FORMAT,
-                mActivity.getString(R.string.pref_camera_picture_format_value_jpeg));
+                PIXEL_FORMAT_JPEG);
         String slowShutter = mPreferences.getString(CameraSettings.KEY_SLOW_SHUTTER,
                 "0");
 
         if (zsl && (!CameraUtil.isHDRWithZSLEnabled() && hdr.equals(mActivity.getString(R.string.setting_on_value))
-                || !format.equals(mActivity.getString(R.string.pref_camera_picture_format_value_jpeg)))
+                || !format.equals(PIXEL_FORMAT_JPEG))
                 || !slowShutter.equals("0")) {
             // Turn off ZSL when taking HDR or RAW or Slow Shutter shots
             zsl = false;
@@ -2511,6 +2580,11 @@ public class PhotoModule
                 mCameraDevice.setHistogramMode(null);
             }
         }
+
+        setFlipValue();
+    }
+
+    private void setFlipValue() {
         // Read Flip mode from adb command
         //value: 0(default) - FLIP_MODE_OFF
         //value: 1 - FLIP_MODE_H
@@ -2552,6 +2626,7 @@ public class PhotoModule
             mParameters.set(CameraSettings.KEY_QC_SNAPSHOT_PICTURE_FLIP, picture_flip);
         }
     }
+
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     private void setAutoExposureLockIfSupported() {
         if (mAeLockSupported) {
@@ -2578,6 +2653,7 @@ public class PhotoModule
         }
     }
 
+    /** This can run on a background thread, so don't do UI updates here.*/
     private boolean updateCameraParametersPreference() {
         setAutoExposureLockIfSupported();
         setAutoWhiteBalanceLockIfSupported();
@@ -2642,12 +2718,6 @@ public class PhotoModule
         CameraSettings.setSlowShutter(mParameters, mPreferences.getString(CameraSettings.KEY_SLOW_SHUTTER,
                 mActivity.getString(R.string.pref_camera_slow_shutter_default)));
 
-        // ZSL burst, set before enabling HDR
-        if (CameraSettings.useZSLBurst(mParameters)) {
-            mParameters.set("snapshot-burst-num",
-                    mPreferences.getString(CameraSettings.KEY_BURST_MODE, "1"));
-        }
-
         // SuperZoom
         CameraSettings.setSuperZoom(mParameters, mPreferences.getString(CameraSettings.KEY_SUPERZOOM,
                 mActivity.getString(R.string.pref_superzoom_default)).equals("on"));
@@ -2674,6 +2744,12 @@ public class PhotoModule
         } else {
             if (hdrOn) {
                 mSceneMode = CameraUtil.SCENE_MODE_HDR;
+                if (!(Parameters.SCENE_MODE_AUTO).equals(mParameters.getSceneMode())
+                    && !(Parameters.SCENE_MODE_HDR).equals(mParameters.getSceneMode())) {
+                    mParameters.setSceneMode(Parameters.SCENE_MODE_AUTO);
+                    mCameraDevice.setParameters(mParameters);
+                    mParameters = mCameraDevice.getParameters();
+                }
             } else if (asdOn) {
                 mSceneMode = CameraUtil.SCENE_MODE_ASD;
             } else {
@@ -2754,6 +2830,15 @@ public class PhotoModule
 
         } else {
             mFocusManager.overrideFocusMode(mParameters.getFocusMode());
+            if (hdrOn) {
+                mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
+            } else {
+                mParameters.setFlashMode(Parameters.FLASH_MODE_AUTO);
+            }
+            if (CameraUtil.isSupported(Parameters.WHITE_BALANCE_AUTO,
+                    mParameters.getSupportedWhiteBalance())) {
+                mParameters.setWhiteBalance(Parameters.WHITE_BALANCE_AUTO);
+            }
         }
 
         if (mContinuousFocusSupported && ApiHelper.HAS_AUTO_FOCUS_MOVE_CALLBACK) {
@@ -2778,13 +2863,14 @@ public class PhotoModule
     // the subsets actually need updating. The PREFERENCE set needs extra
     // locking because the preference can be changed from GLThread as well.
     private void setCameraParameters(int updateSet) {
+        if (mCameraDevice == null) {
+            return;
+        }
         synchronized (mCameraDevice) {
             boolean doModeSwitch = false;
 
             if ((updateSet & UPDATE_PARAM_INITIALIZE) != 0) {
                 updateCameraParametersInitialize();
-                // Set camera mode
-                CameraSettings.setVideoMode(mParameters, false);
             }
 
             if ((updateSet & UPDATE_PARAM_ZOOM) != 0) {
@@ -2894,6 +2980,7 @@ public class PhotoModule
             mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup,
                 mPreferences);
             mActivity.initPowerShutter(mPreferences);
+            mActivity.initMaxBrightness(mPreferences);
         } else {
             mHandler.sendEmptyMessage(SET_PHOTO_UI_PARAMS);
         }
@@ -2971,7 +3058,6 @@ public class PhotoModule
     }
 
     private void initializeCapabilities() {
-        mInitialParams = mCameraDevice.getParameters();
         mFocusAreaSupported = CameraUtil.isFocusAreaSupported(mInitialParams);
         mMeteringAreaSupported = CameraUtil.isMeteringAreaSupported(mInitialParams);
         mAeLockSupported = CameraUtil.isAutoExposureLockSupported(mInitialParams);
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 9b97a34ba..2b0f355f9 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -74,7 +74,7 @@ public class PhotoUI implements PieListener,
 
     private static final String TAG = "CAM_UI";
     private static final String PERSIST_LONG_ENABLE = "persist.camera.longshot.enable";
-    private static final int DOWN_SAMPLE_FACTOR = 4;
+    private int mDownSampleFactor = 4;
     private final AnimationManager mAnimationManager;
     private CameraActivity mActivity;
     private PhotoController mController;
@@ -176,7 +176,7 @@ public class PhotoUI implements PieListener,
         @Override
         protected Bitmap doInBackground(Void... params) {
             // Decode image in background.
-            Bitmap bitmap = CameraUtil.downSample(mData, DOWN_SAMPLE_FACTOR);
+            Bitmap bitmap = CameraUtil.downSample(mData, mDownSampleFactor);
             if ((mOrientation != 0 || mMirror) && (bitmap != null)) {
                 Matrix m = new Matrix();
                 if (mMirror) {
@@ -218,6 +218,29 @@ public class PhotoUI implements PieListener,
         }
     }
 
+    private class SettingsPopup extends PopupWindow {
+        public SettingsPopup(View popup) {
+            super(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+            setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            setOutsideTouchable(true);
+            setFocusable(true);
+            popup.setVisibility(View.VISIBLE);
+            setContentView(popup);
+            showAtLocation(mRootView, Gravity.CENTER, 0, 0);
+        }
+
+        public void dismiss() {
+            super.dismiss();
+            popupDismissed();
+            showUI();
+            mMenu.popupDismissed();
+
+            // Switch back into fullscreen/lights-out mode after popup
+            // is dimissed.
+            mActivity.setSystemBarsVisibility(false);
+        }
+    }
+
     public PhotoUI(CameraActivity activity, PhotoController controller, View parent) {
         mActivity = activity;
         mController = controller;
@@ -257,6 +280,10 @@ public class PhotoUI implements PieListener,
         mPrevOrientationResize = false;
     }
 
+    public void setDownFactor(int factor) {
+        mDownSampleFactor = factor;
+    }
+
      public void cameraOrientationPreviewResize(boolean orientation){
         mPrevOrientationResize = mOrientationResize;
         mOrientationResize = orientation;
@@ -269,10 +296,12 @@ public class PhotoUI implements PieListener,
             ratio = 1 / ratio;
         }
 
-        Log.d(TAG,"setAspectRatio() ratio["+ratio+"] mAspectRatio["+mAspectRatio+"]");
-        mAspectRatio = ratio;
-        mAspectRatioResize = true;
-        mTextureView.requestLayout();
+        if (mAspectRatio != ratio) {
+            Log.d(TAG,"setAspectRatio() ratio["+ratio+"] mAspectRatio["+mAspectRatio+"]");
+            mAspectRatio = ratio;
+            mAspectRatioResize = true;
+            mTextureView.requestLayout();
+        }
     }
 
     public void setSurfaceTextureSizeChangedListener(SurfaceTextureSizeChangedListener listener) {
@@ -293,15 +322,11 @@ public class PhotoUI implements PieListener,
             }
         } else {
             if (width > height) {
-                scaledTextureWidth = Math.max(width,
-                        (int) (height * mAspectRatio));
-                scaledTextureHeight = Math.max(height,
-                        (int)(width / mAspectRatio));
+                scaledTextureWidth = Math.max(width, height * mAspectRatio);
+                scaledTextureHeight = Math.max(height, width / mAspectRatio);
             } else {
-                scaledTextureWidth = Math.max(width,
-                        (int) (height / mAspectRatio));
-                scaledTextureHeight = Math.max(height,
-                        (int) (width * mAspectRatio));
+                scaledTextureWidth = Math.max(width, height / mAspectRatio);
+                scaledTextureHeight = Math.max(height, width * mAspectRatio);
             }
         }
 
@@ -594,12 +619,18 @@ public class PhotoUI implements PieListener,
         mOnScreenIndicators.updateExposureOnScreenIndicator(params,
                 CameraSettings.readExposure(prefs));
         mOnScreenIndicators.updateFlashOnScreenIndicator(params.getFlashMode());
-        int wbIndex = 2;
+        int wbIndex = -1;
+        String wb = Camera.Parameters.WHITE_BALANCE_AUTO;
+        if (Camera.Parameters.SCENE_MODE_AUTO.equals(params.getSceneMode())) {
+            wb = params.getWhiteBalance();
+        }
         ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE);
         if (pref != null) {
-            wbIndex = pref.getCurrentUnfilteredIndex();
+            wbIndex = pref.findIndexOfValue(wb);
         }
-        mOnScreenIndicators.updateWBIndicator(wbIndex);
+        // make sure the correct value was found
+        // otherwise use auto index
+        mOnScreenIndicators.updateWBIndicator(wbIndex < 0 ? 2 : wbIndex);
         boolean location = RecordLocationPreference.get(
                 prefs, mActivity.getContentResolver());
         mOnScreenIndicators.updateLocationIndicator(location);
@@ -669,27 +700,10 @@ public class PhotoUI implements PieListener,
     public void showPopup(AbstractSettingPopup popup) {
         hideUI();
 
-        if (mPopup == null) {
-            mPopup = new PopupWindow(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-            mPopup.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            mPopup.setOutsideTouchable(true);
-            mPopup.setFocusable(true);
-            mPopup.setOnDismissListener(new PopupWindow.OnDismissListener() {
-                @Override
-                public void onDismiss() {
-                    mPopup = null;
-                    mMenu.popupDismissed();
-                    showUI();
-
-                    // Switch back into fullscreen/lights-out mode after popup
-                    // is dimissed.
-                    mActivity.setSystemBarsVisibility(false);
-                }
-            });
+        if (mPopup != null) {
+            mPopup.dismiss();
         }
-        popup.setVisibility(View.VISIBLE);
-        mPopup.setContentView(popup);
-        mPopup.showAtLocation(mRootView, Gravity.CENTER, 0, 0);
+        mPopup = new SettingsPopup(popup);
     }
 
     public void dismissPopup() {
@@ -698,6 +712,10 @@ public class PhotoUI implements PieListener,
         }
     }
 
+    private void popupDismissed() {
+        mPopup = null;
+    }
+
     public void onShowSwitcherPopup() {
         if (mPieRenderer != null && mPieRenderer.showsItems()) {
             mPieRenderer.hide();
@@ -917,17 +935,20 @@ public class PhotoUI implements PieListener,
 
     @Override
     public void onFocusStarted() {
-        getFocusIndicator().showStart();
+        FocusIndicator indicator = getFocusIndicator();
+        if (indicator != null) indicator.showStart();
     }
 
     @Override
     public void onFocusSucceeded(boolean timeout) {
-        getFocusIndicator().showSuccess(timeout);
+        FocusIndicator indicator = getFocusIndicator();
+        if (indicator != null) indicator.showSuccess(timeout);
     }
 
     @Override
     public void onFocusFailed(boolean timeout) {
-        getFocusIndicator().showFail(timeout);
+        FocusIndicator indicator = getFocusIndicator();
+        if (indicator != null) indicator.showFail(timeout);
     }
 
     @Override
diff --git a/src/com/android/camera/PieController.java b/src/com/android/camera/PieController.java
index 622440151..5a0aa9caf 100644
--- a/src/com/android/camera/PieController.java
+++ b/src/com/android/camera/PieController.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2014 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +34,7 @@ import java.util.Map;
 
 public class PieController {
 
-    private static String TAG = "CAM_piecontrol";
+    private static String TAG = "CAM_PieController";
 
     protected static final int MODE_PHOTO = 0;
     protected static final int MODE_VIDEO = 1;
@@ -46,8 +47,11 @@ public class PieController {
     protected OnPreferenceChangedListener mListener;
     protected PieRenderer mRenderer;
     private List<IconListPreference> mPreferences;
+    private List<ListPreference> mListPreferences;
     private Map<IconListPreference, PieItem> mPreferenceMap;
+    private Map<ListPreference, PieItem> mListPreferenceMap;
     private Map<IconListPreference, String> mOverrides;
+    private Map<ListPreference, String> mListOverrides;
 
     public void setListener(OnPreferenceChangedListener listener) {
         mListener = listener;
@@ -57,14 +61,20 @@ public class PieController {
         mActivity = activity;
         mRenderer = pie;
         mPreferences = new ArrayList<IconListPreference>();
+        mListPreferences = new ArrayList<ListPreference>();
         mPreferenceMap = new HashMap<IconListPreference, PieItem>();
+        mListPreferenceMap = new HashMap<ListPreference, PieItem>();
         mOverrides = new HashMap<IconListPreference, String>();
+        mListOverrides = new HashMap<ListPreference, String>();
     }
 
     public void initialize(PreferenceGroup group) {
         mRenderer.clearItems();
         mPreferenceMap.clear();
+        mListPreferenceMap.clear();
         setPreferenceGroup(group);
+        mPreferences.clear();
+        mOverrides.clear();
     }
 
     public void onSettingChanged(ListPreference pref) {
@@ -132,6 +142,18 @@ public class PieController {
         return item;
     }
 
+    public PieItem makeListItem(final String prefKey) {
+        final ListPreference pref =
+                (ListPreference) mPreferenceGroup.findPreference(prefKey);
+        if (pref == null) return null;
+        // The preference only has a single icon to represent it.
+        PieItem item = makeItem(pref.getIcon());
+        item.setLabel(pref.getTitle().toUpperCase());
+        mListPreferences.add(pref);
+        mListPreferenceMap.put(pref, item);
+        return item;
+    }
+
     public PieItem makeSwitchItem(final String prefKey, boolean addListener) {
         final IconListPreference pref =
                 (IconListPreference) mPreferenceGroup.findPreference(prefKey);
@@ -176,7 +198,6 @@ public class PieController {
         return item;
     }
 
-
     public PieItem makeDialItem(ListPreference pref, int iconId, float center, float sweep) {
         PieItem item = makeItem(iconId);
         return item;
@@ -243,6 +264,9 @@ public class PieController {
         for (IconListPreference pref : mPreferenceMap.keySet()) {
             override(pref, keyvalues);
         }
+        for (ListPreference pref : mListPreferenceMap.keySet()) {
+            overrideList(pref, keyvalues);
+        }
     }
 
     private void override(IconListPreference pref, final String ... keyvalues) {
@@ -259,4 +283,18 @@ public class PieController {
         }
         reloadPreference(pref);
     }
+
+    private void overrideList(ListPreference pref, final String ... keyvalues) {
+        mListOverrides.remove(pref);
+        for (int i = 0; i < keyvalues.length; i += 2) {
+            String key = keyvalues[i];
+            String value = keyvalues[i + 1];
+            if (key.equals(pref.getKey())) {
+                mListOverrides.put(pref, value);
+                PieItem item = mListPreferenceMap.get(pref);
+                item.setEnabled(value == null);
+                break;
+            }
+        }
+    }
 }
diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java
index 340bf5b07..e748af5f3 100644
--- a/src/com/android/camera/Storage.java
+++ b/src/com/android/camera/Storage.java
@@ -71,12 +71,12 @@ public class Storage {
         mRoot = root;
     }
 
-    public void writeFile(String path, byte[] jpeg, ExifInterface exif,
+    public int writeFile(String path, byte[] jpeg, ExifInterface exif,
             String mimeType) {
         if (exif != null && (mimeType == null ||
             mimeType.equalsIgnoreCase("jpeg"))) {
             try {
-                exif.writeExif(jpeg, path);
+                return exif.writeExif(jpeg, path);
             } catch (Exception e) {
                 Log.e(TAG, "Failed to write data", e);
             }
@@ -85,8 +85,9 @@ public class Storage {
                  File dir = new File(generateRawDirectory());
                  dir.mkdirs();
             }
-            writeFile(path, jpeg);
+            return jpeg.length;
         }
+        return 0;
     }
 
     public void writeFile(String path, byte[] data) {
@@ -111,9 +112,9 @@ public class Storage {
             int height, String mimeType) {
 
         String path = generateFilepath(title, mimeType);
-        writeFile(path, jpeg, exif, mimeType);
+        int size = writeFile(path, jpeg, exif, mimeType);
         return addImage(resolver, title, date, location, orientation,
-                jpeg.length, path, width, height, mimeType);
+                size, path, width, height, mimeType);
     }
 
     // Get a ContentValues object for the given photo data
@@ -123,7 +124,9 @@ public class Storage {
         // Insert into MediaStore.
         ContentValues values = new ContentValues(9);
         values.put(ImageColumns.TITLE, title);
-        if (mimeType.equalsIgnoreCase("jpeg") || mimeType == null) {
+        if (mimeType.equalsIgnoreCase("jpeg") ||
+            mimeType.equalsIgnoreCase("image/jpeg") ||
+            mimeType == null) {
             values.put(ImageColumns.DISPLAY_NAME, title + ".jpg");
         } else {
             values.put(ImageColumns.DISPLAY_NAME, title + ".raw");
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 3ed6b5875..41a99a590 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 The Android Open Source Project
- * Copyright (C) 2013 The CyanogenMod Project
+ * Copyright (C) 2013-2014 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,13 +40,15 @@ public class VideoMenu extends PieController
     private static String TAG = "CAM_VideoMenu";
 
     private VideoUI mUI;
-    private String[] mOtherKeys;
+    private String[] mSettingsKeys;
     private AbstractSettingPopup mPopup;
+    private MoreSettingPopup mSettingsPopup;
 
     private static final int POPUP_NONE = 0;
     private static final int POPUP_FIRST_LEVEL = 1;
     private static final int POPUP_SECOND_LEVEL = 2;
     private int mPopupStatus;
+
     private CameraActivity mActivity;
 
     public VideoMenu(CameraActivity activity, VideoUI ui, PieRenderer pie) {
@@ -58,6 +60,7 @@ public class VideoMenu extends PieController
     public void initialize(PreferenceGroup group) {
         super.initialize(group);
         mPopup = null;
+        mSettingsPopup = null;
         mPopupStatus = POPUP_NONE;
         PieItem item = null;
         final Resources res = mActivity.getResources();
@@ -88,21 +91,11 @@ public class VideoMenu extends PieController
         final ListPreference colorPref =
                 group.findPreference(CameraSettings.KEY_VIDEOCAMERA_COLOR_EFFECT);
         if (colorPref != null) {
-            item = makeItem(R.drawable.ic_tint);
-            item.setLabel(res.getString(
-                    R.string.pref_camera_coloreffect_title).toUpperCase(locale));
+            item = makeListItem(CameraSettings.KEY_VIDEOCAMERA_COLOR_EFFECT);
             item.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(PieItem item) {
-                    ListPrefSettingPopup popup =
-                            (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
-                            R.layout.list_pref_setting_popup, null, false);
-                    popup.initialize(colorPref);
-                    popup.setSettingChangedListener(VideoMenu.this);
-                    mUI.dismissPopup();
-                    mPopup = popup;
-                    mPopupStatus = POPUP_SECOND_LEVEL;
-                    mUI.showPopup(mPopup);
+                    showListPopup(colorPref);
                 }
             });
             enhance.addItem(item);
@@ -156,7 +149,6 @@ public class VideoMenu extends PieController
                 timeInterval.setSettingChangedListener(VideoMenu.this);
                 mUI.dismissPopup();
                 mPopup = timeInterval;
-                mPopupStatus = POPUP_SECOND_LEVEL;
                 mUI.showPopup(mPopup);
             }
         });
@@ -164,21 +156,11 @@ public class VideoMenu extends PieController
         // video size
         final ListPreference sizePref = group.findPreference(CameraSettings.KEY_VIDEO_QUALITY);
         if (sizePref != null) {
-            item = makeItem(R.drawable.ic_imagesize);
-            item.setLabel(res.getString(
-                    R.string.pref_video_quality_title).toUpperCase(locale));
+            item = makeListItem(CameraSettings.KEY_VIDEO_QUALITY);
             item.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(PieItem item) {
-                    ListPrefSettingPopup popup =
-                            (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
-                            R.layout.list_pref_setting_popup, null, false);
-                    popup.initialize(sizePref);
-                    popup.setSettingChangedListener(VideoMenu.this);
-                    mUI.dismissPopup();
-                    mPopup = popup;
-                    mPopupStatus = POPUP_SECOND_LEVEL;
-                    mUI.showPopup(mPopup);
+                    showListPopup(sizePref);
                 }
             });
             more.addItem(item);
@@ -190,9 +172,10 @@ public class VideoMenu extends PieController
             more.addItem(item);
         }
         // extra settings popup
-        mOtherKeys = new String[] {
+        mSettingsKeys = new String[] {
                 CameraSettings.KEY_STORAGE,
                 CameraSettings.KEY_POWER_SHUTTER,
+                CameraSettings.KEY_MAX_BRIGHTNESS,
                 CameraSettings.KEY_DIS,
                 CameraSettings.KEY_VIDEO_ENCODER,
                 CameraSettings.KEY_AUDIO_ENCODER,
@@ -200,44 +183,61 @@ public class VideoMenu extends PieController
                 CameraSettings.KEY_JPEG_QUALITY,
                 CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,
         };
-        item = makeItem(R.drawable.ic_settings_holo_light);
-        item.setLabel(res.getString(R.string.camera_menu_more_label).toUpperCase(locale));
-        item.setOnClickListener(new OnClickListener() {
+        PieItem settings = makeItem(R.drawable.ic_settings_holo_light);
+        settings.setLabel(res.getString(R.string.camera_menu_more_label).toUpperCase(locale));
+        settings.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(PieItem item) {
-                if (mPopup == null || mPopupStatus != POPUP_FIRST_LEVEL) {
-                    LayoutInflater inflater = mActivity.getLayoutInflater();
-                    MoreSettingPopup popup = (MoreSettingPopup) inflater.inflate(
-                            R.layout.more_setting_popup, null, false);
-                    popup.initialize(mPreferenceGroup, mOtherKeys);
-                    popup.setSettingChangedListener(VideoMenu.this);
-                    mPopup = popup;
+                if (mSettingsPopup == null || mPopupStatus != POPUP_FIRST_LEVEL) {
+                    initializeSettingsPopup();
                     mPopupStatus = POPUP_FIRST_LEVEL;
                 }
-                mUI.showPopup(mPopup);
+                mUI.showPopup(mSettingsPopup);
             }
         });
-        more.addItem(item);
+        more.addItem(settings);
     }
 
-    @Override
-    // Hit when an item in the second-level popup gets selected
-    public void onListPrefChanged(ListPreference pref) {
-        if (mPopup != null) {
-            if (mPopupStatus == POPUP_SECOND_LEVEL) {
-                mUI.dismissPopup();
+    public void popupDismissed() {
+        if (mPopupStatus == POPUP_SECOND_LEVEL) {
+            initializeSettingsPopup();
+            mPopupStatus = POPUP_FIRST_LEVEL;
+            mUI.showPopup(mSettingsPopup);
+            if (mSettingsPopup != null) {
+                mSettingsPopup = null;
+            }
+        } else {
+            initializeSettingsPopup();
+            if (mPopup != null) {
+                mPopup = null;
             }
         }
-        onSettingChanged(pref);
     }
 
-    public void popupDismissed() {
-        // if the 2nd level popup gets dismissed
-        if (mPopup != null) {
-            if (mPopupStatus == POPUP_SECOND_LEVEL) {
-                mPopup = null;
-            }
+    @Override
+    public void reloadPreferences() {
+        super.reloadPreferences();
+        if (mSettingsPopup != null) {
+            mSettingsPopup.reloadPreference();
+        }
+    }
+
+    @Override
+    public void overrideSettings(final String ... keyvalues) {
+        super.overrideSettings(keyvalues);
+        if (mSettingsPopup == null) {
+            initializeSettingsPopup();
+        }
+        mSettingsPopup.overrideSettings(keyvalues);
+    }
+
+    @Override
+    // Hit when an item in a popup gets selected
+    public void onListPrefChanged(ListPreference pref) {
+        if (mPopup != null && mSettingsPopup != null) {
+            mUI.dismissPopup();
         }
+        onSettingChanged(pref);
     }
 
     @Override
@@ -246,8 +246,8 @@ public class VideoMenu extends PieController
     public void onPreferenceClicked(ListPreference pref) {
         if (mPopupStatus != POPUP_FIRST_LEVEL) return;
 
-        LayoutInflater inflater = mActivity.getLayoutInflater();
-        ListPrefSettingPopup basic = (ListPrefSettingPopup) inflater.inflate(
+        ListPrefSettingPopup basic =
+                (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
                 R.layout.list_pref_setting_popup, null, false);
         basic.initialize(pref);
         basic.setSettingChangedListener(this);
@@ -257,4 +257,26 @@ public class VideoMenu extends PieController
         mPopupStatus = POPUP_SECOND_LEVEL;
     }
 
+    // Initialize the second-level settings popup
+    protected void initializeSettingsPopup() {
+        MoreSettingPopup popup =
+                (MoreSettingPopup) mActivity.getLayoutInflater().inflate(
+                R.layout.more_setting_popup, null, false);
+        popup.initialize(mPreferenceGroup, mSettingsKeys);
+        popup.setSettingChangedListener(VideoMenu.this);
+        mSettingsPopup = popup;
+    }
+
+    // Show a popup options list
+    protected void showListPopup(ListPreference pref) {
+        ListPrefSettingPopup popup =
+                (ListPrefSettingPopup) mActivity.getLayoutInflater().inflate(
+                R.layout.list_pref_setting_popup, null, false);
+        popup.initialize(pref);
+        popup.setSettingChangedListener(VideoMenu.this);
+        mUI.dismissPopup();
+        mPopup = popup;
+        mUI.showPopup(mPopup);
+    }
+
 }
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 6d4ddc4e6..72e5b32dd 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 The Android Open Source Project
- * Copyright (C) 2013 The CyanogenMod Project
+ * Copyright (C) 2013-2014 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -242,7 +242,7 @@ public class VideoModule implements CameraModule,
             return;
         }
         mParameters = mCameraDevice.getParameters();
-        mPreviewFocused = true;
+        mPreviewFocused = arePreviewControlsVisible();
         initializeCapabilities();
     }
 
@@ -312,6 +312,7 @@ public class VideoModule implements CameraModule,
     boolean mUnsupportedResolution = false;
     private boolean mUnsupportedHFRVideoSize = false;
     private boolean mUnsupportedHFRVideoCodec = false;
+    private String mDefaultAntibanding = null;
 
     public void onScreenSizeChanged(int width, int height, int previewWidth, int previewHeight) {
         if (mFocusManager != null) mFocusManager.setPreviewSize(width, height);
@@ -444,6 +445,9 @@ public class VideoModule implements CameraModule,
         // Power shutter
         mActivity.initPowerShutter(mPreferences);
 
+        // Max brightness
+        mActivity.initMaxBrightness(mPreferences);
+
         /*
          * To reduce startup time, we start the preview in another thread.
          * We make sure the preview is started at the end of onCreate.
@@ -603,8 +607,10 @@ public class VideoModule implements CameraModule,
         if (mOrientation != newOrientation) {
             mOrientation = newOrientation;
             Log.v(TAG, "onOrientationChanged, update parameters");
-            if ((mParameters != null) && (true == mPreviewing) && !mMediaRecorderRecording){
-                setCameraParameters();
+            if ((mCameraDevice != null) && (mParameters != null)
+                    && (true == mPreviewing) && !mMediaRecorderRecording){
+                setFlipValue();
+                mCameraDevice.setParameters(mParameters);
             }
         }
 
@@ -757,26 +763,13 @@ public class VideoModule implements CameraModule,
 
         Log.v(TAG, "Audio Encoder selected = " +mAudioEncoder);
 
-        String minutesStr = mPreferences.getString(
-              CameraSettings.KEY_VIDEO_DURATION,
-              mActivity.getString(R.string.pref_camera_video_duration_default));
-        int minutes = -1;
-        try {
-            minutes = Integer.parseInt(minutesStr);
-        } catch(NumberFormatException npe) {
-            // use default value continue
-            minutes = Integer.parseInt(mActivity.getString(
-                         R.string.pref_camera_video_duration_default));
-        }
-        if (minutes == -1) {
-            // User wants lowest, set 30s */
-            mMaxVideoDurationInMs = 30000;
-        } else {
-            // 1 minute = 60000ms
-            mMaxVideoDurationInMs = 60000 * minutes;
+        // Set wavelet denoise mode
+        if (mParameters.getSupportedDenoiseModes() != null) {
+            String denoise = mPreferences.getString(CameraSettings.KEY_DENOISE,
+                    mActivity.getString(R.string.pref_camera_denoise_default));
+            mParameters.setDenoise(denoise);
         }
-
-   }
+    }
 
     private final class AutoFocusCallback
             implements CameraAFCallback {
@@ -1069,6 +1062,7 @@ public class VideoModule implements CameraModule,
         mCameraDevice.stopPreview();
         mPreviewing = false;
         mStopPrevPending = false;
+        mUI.enableShutter(false);
     }
 
     private void closeCamera() {
@@ -1186,6 +1180,7 @@ public class VideoModule implements CameraModule,
 
         switch (keyCode) {
             case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_MEDIA_NEXT:
                 if (event.getRepeatCount() == 0 && !CameraActivity.mPowerShutter &&
                         !CameraUtil.hasCameraKey()) {
                     mUI.clickShutter();
@@ -1194,6 +1189,7 @@ public class VideoModule implements CameraModule,
                 }
                 return true;
             case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
                 if (event.getRepeatCount() == 0 && !CameraActivity.mPowerShutter &&
                         !CameraUtil.hasCameraKey()) {
                     mUI.clickShutter();
@@ -1202,6 +1198,7 @@ public class VideoModule implements CameraModule,
                 }
                 return true;
             case KeyEvent.KEYCODE_CAMERA:
+            case KeyEvent.KEYCODE_HEADSETHOOK:
                 if (event.getRepeatCount() == 0) {
                     mUI.clickShutter();
                 }
@@ -1230,16 +1227,19 @@ public class VideoModule implements CameraModule,
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         switch (keyCode) {
             case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_MEDIA_NEXT:
                 if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
                     mUI.pressShutter(false);
                 }
                 return true;
             case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
                 if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
                     mUI.pressShutter(false);
                 }
                 return true;
             case KeyEvent.KEYCODE_CAMERA:
+            case KeyEvent.KEYCODE_HEADSETHOOK:
                 mUI.pressShutter(false);
                 return true;
             case KeyEvent.KEYCODE_POWER:
@@ -1500,7 +1500,11 @@ public class VideoModule implements CameraModule,
 
     private void saveVideo() {
         if (mVideoFileDescriptor == null) {
-            long duration = SystemClock.uptimeMillis() - mRecordingStartTime + mRecordingTotalTime;
+            long duration = 0L;
+            if (mMediaRecorderPausing == false)
+                duration = SystemClock.uptimeMillis() - mRecordingStartTime + mRecordingTotalTime;
+            else
+                duration = mRecordingTotalTime;
             if (duration > 0) {
                 if (mCaptureTimeLapse) {
                     duration = getTimeLapseVideoLength(duration);
@@ -1516,6 +1520,20 @@ public class VideoModule implements CameraModule,
                 return;
             }
 
+            /* Change the duration as per HFR selection */
+            String hfr = mParameters.getVideoHighFrameRate();
+            int defaultFps = 30;
+            int hfrRatio = 1;
+            if (!("off".equals(hfr))) {
+                try {
+                   int hfrFps = Integer.parseInt(hfr);
+                   hfrRatio = hfrFps / defaultFps;
+                } catch(Exception ex) {
+                    // Do nothing
+                }
+            }
+            duration = duration * hfrRatio;
+
             mActivity.getMediaSaveService().addVideo(mCurrentVideoFilename,
                     duration, mCurrentVideoValues,
                     mOnVideoSavedListener, mContentResolver);
@@ -1805,6 +1823,7 @@ public class VideoModule implements CameraModule,
         UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
                 fail ? UsageStatistics.ACTION_CAPTURE_FAIL :
                     UsageStatistics.ACTION_CAPTURE_DONE, "Video",
+                mMediaRecorderPausing ? mRecordingTotalTime :
                     SystemClock.uptimeMillis() - mRecordingStartTime + mRecordingTotalTime);
         mStopRecPending = false;
         return fail;
@@ -1935,6 +1954,53 @@ public class VideoModule implements CameraModule,
         return supported == null ? false : supported.indexOf(value) >= 0;
     }
 
+    private void setFlipValue() {
+
+        // Read Flip mode from adb command
+        //value: 0(default) - FLIP_MODE_OFF
+        //value: 1 - FLIP_MODE_H
+        //value: 2 - FLIP_MODE_V
+        //value: 3 - FLIP_MODE_VH
+        int preview_flip_value = SystemProperties.getInt("debug.camera.preview.flip", 0);
+        int video_flip_value = SystemProperties.getInt("debug.camera.video.flip", 0);
+        int picture_flip_value = SystemProperties.getInt("debug.camera.picture.flip", 0);
+        int rotation = CameraUtil.getJpegRotation(mCameraId, mOrientation);
+        mParameters.setRotation(rotation);
+        if (rotation == 90 || rotation == 270) {
+            // in case of 90 or 270 degree, V/H flip should reverse
+            if (preview_flip_value == 1) {
+                preview_flip_value = 2;
+            } else if (preview_flip_value == 2) {
+                preview_flip_value = 1;
+            }
+            if (video_flip_value == 1) {
+                video_flip_value = 2;
+            } else if (video_flip_value == 2) {
+                video_flip_value = 1;
+            }
+            if (picture_flip_value == 1) {
+                picture_flip_value = 2;
+            } else if (picture_flip_value == 2) {
+                picture_flip_value = 1;
+            }
+        }
+        String preview_flip = CameraUtil.getFilpModeString(preview_flip_value);
+        String video_flip = CameraUtil.getFilpModeString(video_flip_value);
+        String picture_flip = CameraUtil.getFilpModeString(picture_flip_value);
+
+        if(CameraUtil.isSupported(preview_flip, CameraSettings.getSupportedFlipMode(mParameters))){
+            mParameters.set(CameraSettings.KEY_QC_PREVIEW_FLIP, preview_flip);
+        }
+        if(CameraUtil.isSupported(video_flip, CameraSettings.getSupportedFlipMode(mParameters))){
+            mParameters.set(CameraSettings.KEY_QC_VIDEO_FLIP, video_flip);
+        }
+        if(CameraUtil.isSupported(picture_flip, CameraSettings.getSupportedFlipMode(mParameters))){
+            mParameters.set(CameraSettings.KEY_QC_SNAPSHOT_PICTURE_FLIP, picture_flip);
+        }
+
+
+    }
+
      private void qcomSetCameraParameters(){
         // add QCOM Parameters here
         // Set color effect parameter.
@@ -1955,6 +2021,23 @@ public class VideoModule implements CameraModule,
             mParameters.set(CameraSettings.KEY_QC_DIS_MODE, disMode);
         }
 
+        if (mDefaultAntibanding == null) {
+            mDefaultAntibanding = mParameters.getAntibanding();
+            Log.d(TAG, "default antibanding value = " + mDefaultAntibanding);
+        }
+
+        if (disMode.equals("enable")) {
+            Log.d(TAG, "dis is enabled, set antibanding to auto.");
+            if (isSupported(Parameters.ANTIBANDING_AUTO, mParameters.getSupportedAntibanding())) {
+                mParameters.setAntibanding(Parameters.ANTIBANDING_AUTO);
+            }
+        } else {
+            if (isSupported(mDefaultAntibanding, mParameters.getSupportedAntibanding())) {
+                mParameters.setAntibanding(mDefaultAntibanding);
+            }
+        }
+        Log.d(TAG, "antiBanding value = " + mParameters.getAntibanding());
+
         mUnsupportedHFRVideoSize = false;
         mUnsupportedHFRVideoCodec = false;
         // To set preview format as YV12 , run command
@@ -1991,6 +2074,30 @@ public class VideoModule implements CameraModule,
                 Log.e(TAG, "supported hfr sizes is null");
             }
 
+            int hfrFps = Integer.parseInt(highFrameRate);
+            int inputBitrate = videoWidth*videoHeight*hfrFps;
+
+            //check if codec supports the resolution, otherwise throw toast
+            List<VideoEncoderCap> videoEncoders = EncoderCapabilities.getVideoEncoders();
+            for (VideoEncoderCap videoEncoder: videoEncoders) {
+                if (videoEncoder.mCodec == mVideoEncoder){
+                    int maxBitrate = (videoEncoder.mMaxHFRFrameWidth *
+                                     videoEncoder.mMaxHFRFrameHeight *
+                                     videoEncoder.mMaxHFRMode);
+                    if (inputBitrate > maxBitrate ){
+                            Log.e(TAG,"Selected codec "+mVideoEncoder+
+                                " does not support HFR " + highFrameRate + " with "+ videoWidth
+                                + "x" + videoHeight +" resolution");
+                            Log.e(TAG, "Codec capabilities: " +
+                                "mMaxHFRFrameWidth = " + videoEncoder.mMaxHFRFrameWidth + " , "+
+                                "mMaxHFRFrameHeight = " + videoEncoder.mMaxHFRFrameHeight + " , "+
+                                "mMaxHFRMode = " + videoEncoder.mMaxHFRMode);
+                            mUnsupportedHFRVideoSize = true;
+                    }
+                    break;
+                }
+            }
+
             if(mUnsupportedHFRVideoSize)
                 Log.v(TAG,"Unsupported hfr resolution");
 
@@ -2005,48 +2112,7 @@ public class VideoModule implements CameraModule,
             mParameters.setVideoHighFrameRate("off");
         }
 
-        // Read Flip mode from adb command
-        //value: 0(default) - FLIP_MODE_OFF
-        //value: 1 - FLIP_MODE_H
-        //value: 2 - FLIP_MODE_V
-        //value: 3 - FLIP_MODE_VH
-        int preview_flip_value = SystemProperties.getInt("debug.camera.preview.flip", 0);
-        int video_flip_value = SystemProperties.getInt("debug.camera.video.flip", 0);
-        int picture_flip_value = SystemProperties.getInt("debug.camera.picture.flip", 0);
-        int rotation = CameraUtil.getJpegRotation(mCameraId, mOrientation);
-        mParameters.setRotation(rotation);
-        if (rotation == 90 || rotation == 270) {
-            // in case of 90 or 270 degree, V/H flip should reverse
-            if (preview_flip_value == 1) {
-                preview_flip_value = 2;
-            } else if (preview_flip_value == 2) {
-                preview_flip_value = 1;
-            }
-            if (video_flip_value == 1) {
-                video_flip_value = 2;
-            } else if (video_flip_value == 2) {
-                video_flip_value = 1;
-            }
-            if (picture_flip_value == 1) {
-                picture_flip_value = 2;
-            } else if (picture_flip_value == 2) {
-                picture_flip_value = 1;
-            }
-        }
-        String preview_flip = CameraUtil.getFilpModeString(preview_flip_value);
-        String video_flip = CameraUtil.getFilpModeString(video_flip_value);
-        String picture_flip = CameraUtil.getFilpModeString(picture_flip_value);
-
-        if(CameraUtil.isSupported(preview_flip, CameraSettings.getSupportedFlipMode(mParameters))){
-            mParameters.set(CameraSettings.KEY_QC_PREVIEW_FLIP, preview_flip);
-        }
-        if(CameraUtil.isSupported(video_flip, CameraSettings.getSupportedFlipMode(mParameters))){
-            mParameters.set(CameraSettings.KEY_QC_VIDEO_FLIP, video_flip);
-        }
-        if(CameraUtil.isSupported(picture_flip, CameraSettings.getSupportedFlipMode(mParameters))){
-            mParameters.set(CameraSettings.KEY_QC_SNAPSHOT_PICTURE_FLIP, picture_flip);
-        }
-
+        setFlipValue();
         // Set Video HDR.
         String videoHDR = mPreferences.getString(
                 CameraSettings.KEY_VIDEO_HDR,
@@ -2056,6 +2122,39 @@ public class VideoModule implements CameraModule,
              mParameters.setVideoHDRMode(videoHDR);
         } else
              mParameters.setVideoHDRMode("off");
+
+        //HFR recording not supported with DIS,TimeLapse,HDR option
+        String hfr = mParameters.getVideoHighFrameRate();
+        String hdr = mParameters.getVideoHDRMode();
+        if ((hfr != null) && (!hfr.equals("off"))) {
+             // Read time lapse recording interval.
+             String frameIntervalStr = mPreferences.getString(
+                    CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL,
+                    mActivity.getString(R.string.pref_video_time_lapse_frame_interval_default));
+             int timeLapseInterval = Integer.parseInt(frameIntervalStr);
+             if ( (timeLapseInterval != 0) ||
+                  (disMode.equals("enable")) ||
+                  ((hdr != null) && (!hdr.equals("off"))) ) {
+                Log.v(TAG,"HDR/DIS/Time Lapse ON for HFR selection, turning HFR off");
+                Toast.makeText(mActivity, R.string.error_app_unsupported_hfr_selection,
+                          Toast.LENGTH_LONG).show();
+                mParameters.setVideoHighFrameRate("off");
+                mUI.overrideSettings(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,"off");
+             }
+        }
+
+        //getSupportedPictureSizes will always send a sorted a list in descending order
+        Size biggestSize = mParameters.getSupportedPictureSizes().get(0);
+
+        if (biggestSize.width <= videoWidth || biggestSize.height <= videoHeight) {
+            if (disMode.equals("enable")) {
+                Log.v(TAG,"DIS is not supported for this video quality");
+                Toast.makeText(mActivity, R.string.error_app_unsupported_dis,
+                               Toast.LENGTH_LONG).show();
+                mParameters.set(CameraSettings.KEY_QC_DIS_MODE, "disable");
+                mUI.overrideSettings(CameraSettings.KEY_DIS,"disable");
+            }
+        }
     }
     @SuppressWarnings("deprecation")
     private void setCameraParameters() {
@@ -2071,9 +2170,6 @@ public class VideoModule implements CameraModule,
             mParameters.setPreviewFrameRate(mProfile.videoFrameRate);
         }
 
-        // Set video mode
-        CameraSettings.setVideoMode(mParameters, true);
-
         forceFlashOffIfSupported(!mPreviewFocused);
 
         videoWidth = mProfile.videoFrameWidth;
@@ -2235,6 +2331,7 @@ public class VideoModule implements CameraModule,
             }
             mUI.updateOnScreenIndicators(mParameters, mPreferences);
             mActivity.initPowerShutter(mPreferences);
+            mActivity.initMaxBrightness(mPreferences);
         }
     }
 
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 0d4c0f854..5d5b1c427 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -307,15 +307,11 @@ public class VideoUI implements PieRenderer.PieListener,
             }
         } else {
             if (width > height) {
-                scaledTextureWidth = Math.max(width,
-                        (int) (height * mAspectRatio));
-                scaledTextureHeight = Math.max(height,
-                        (int)(width / mAspectRatio));
+                scaledTextureWidth = Math.max(width, height * mAspectRatio);
+                scaledTextureHeight = Math.max(height, width / mAspectRatio);
             } else {
-                scaledTextureWidth = Math.max(width,
-                        (int) (height / mAspectRatio));
-                scaledTextureHeight = Math.max(height,
-                        (int) (width * mAspectRatio));
+                scaledTextureWidth = Math.max(width, height / mAspectRatio);
+                scaledTextureHeight = Math.max(height, width * mAspectRatio);
             }
         }
 
@@ -433,7 +429,8 @@ public class VideoUI implements PieRenderer.PieListener,
         ((CameraRootView) mRootView).removeDisplayChangeListener();
     }
 
-    public void overrideSettings(final String... keyvalues) {
+    public void overrideSettings(final String ... keyvalues) {
+        if (mVideoMenu == null) return;
         mVideoMenu.overrideSettings(keyvalues);
     }
 
@@ -556,6 +553,15 @@ public class VideoUI implements PieRenderer.PieListener,
         }
     }
 
+    public void showPopup(AbstractSettingPopup popup) {
+        hideUI();
+
+        if (mPopup != null) {
+            mPopup.dismiss();
+        }
+        mPopup = new SettingsPopup(popup);
+    }
+
     public void dismissPopup() {
         // In review mode, we do not want to bring up the camera UI
         if (mController.isInReviewMode()) return;
@@ -568,15 +574,6 @@ public class VideoUI implements PieRenderer.PieListener,
         mPopup = null;
     }
 
-    public void showPopup(AbstractSettingPopup popup) {
-        hideUI();
-
-        if (mPopup != null) {
-            mPopup.dismiss();
-        }
-        mPopup = new SettingsPopup(popup);
-    }
-
     public void onShowSwitcherPopup() {
         hidePieRenderer();
     }
@@ -674,6 +671,8 @@ public class VideoUI implements PieRenderer.PieListener,
     }
 
     private void setShowMenu(boolean show) {
+        if (mController.isVideoCaptureIntent())
+            return;
         if (mOnScreenIndicators != null) {
             mOnScreenIndicators.setVisibility(show ? View.VISIBLE : View.GONE);
         }
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index e9acd5a0e..5601b61e0 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -532,9 +532,11 @@ public class WideAnglePanoramaModule
                     float progressX, float progressY) {
                 float accumulatedHorizontalAngle = progressX * mHorizontalViewAngle;
                 float accumulatedVerticalAngle = progressY * mVerticalViewAngle;
+                boolean isRotated = !(mDeviceOrientationAtCapture == mDeviceOrientation);
                 if (isFinished
                         || (Math.abs(accumulatedHorizontalAngle) >= DEFAULT_SWEEP_ANGLE)
-                        || (Math.abs(accumulatedVerticalAngle) >= DEFAULT_SWEEP_ANGLE)) {
+                        || (Math.abs(accumulatedVerticalAngle) >= DEFAULT_SWEEP_ANGLE)
+                        || isRotated) {
                     stopCapture(false);
                 } else {
                     float panningRateXInDegree = panningRateX * mHorizontalViewAngle;
@@ -906,7 +908,7 @@ public class WideAnglePanoramaModule
 
         // Check if another panorama instance is using the mosaic frame processor.
         mUI.dismissAllDialogs();
-        if (!mThreadRunning && mMosaicFrameProcessor.isMosaicMemoryAllocated()) {
+        if (mThreadRunning && mMosaicFrameProcessor.isMosaicMemoryAllocated()) {
             mUI.showWaitingDialog(mDialogWaitingPreviousString);
             // If stitching is still going on, make sure switcher and shutter button
             // are not showing
@@ -1121,8 +1123,11 @@ public class WideAnglePanoramaModule
         switch (keyCode) {
             case KeyEvent.KEYCODE_VOLUME_UP:
             case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_MEDIA_NEXT:
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
                 return true;
             case KeyEvent.KEYCODE_CAMERA:
+            case KeyEvent.KEYCODE_HEADSETHOOK:
                 if (event.getRepeatCount() == 0) {
                     onShutterButtonClick();
                 }
@@ -1138,6 +1143,8 @@ public class WideAnglePanoramaModule
         switch (keyCode) {
             case KeyEvent.KEYCODE_VOLUME_UP:
             case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_MEDIA_NEXT:
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
                 if (!CameraActivity.mPowerShutter && !CameraUtil.hasCameraKey()) {
                     onShutterButtonClick();
                 }
diff --git a/src/com/android/camera/exif/ExifInterface.java b/src/com/android/camera/exif/ExifInterface.java
index 340f19e1c..f353f3586 100644
--- a/src/com/android/camera/exif/ExifInterface.java
+++ b/src/com/android/camera/exif/ExifInterface.java
@@ -850,14 +850,14 @@ public class ExifInterface {
      * @throws FileNotFoundException
      * @throws IOException
      */
-    public void writeExif(byte[] jpeg, String exifOutFileName) throws FileNotFoundException,
+    public int writeExif(byte[] jpeg, String exifOutFileName) throws FileNotFoundException,
             IOException {
         if (jpeg == null || exifOutFileName == null) {
             throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
         }
-        OutputStream s = null;
+        ExifOutputStream s = null;
         try {
-            s = getExifWriterStream(exifOutFileName);
+            s = (ExifOutputStream) getExifWriterStream(exifOutFileName);
             s.write(jpeg, 0, jpeg.length);
             s.flush();
         } catch (IOException e) {
@@ -865,6 +865,7 @@ public class ExifInterface {
             throw e;
         }
         s.close();
+        return s.size();
     }
 
     /**
diff --git a/src/com/android/camera/exif/ExifOutputStream.java b/src/com/android/camera/exif/ExifOutputStream.java
index 191e8280c..90d432769 100644
--- a/src/com/android/camera/exif/ExifOutputStream.java
+++ b/src/com/android/camera/exif/ExifOutputStream.java
@@ -82,6 +82,8 @@ class ExifOutputStream extends FilterOutputStream {
     private ByteBuffer mBuffer = ByteBuffer.allocate(4);
     private final ExifInterface mInterface;
 
+    private int mSize = 0;
+
     protected ExifOutputStream(OutputStream ou, ExifInterface iRef) {
         super(new BufferedOutputStream(ou, STREAMBUFFER_SIZE));
         mInterface = iRef;
@@ -127,6 +129,7 @@ class ExifOutputStream extends FilterOutputStream {
             if (mByteToCopy > 0) {
                 int byteToProcess = length > mByteToCopy ? mByteToCopy : length;
                 out.write(buffer, offset, byteToProcess);
+                mSize += byteToProcess;
                 length -= byteToProcess;
                 mByteToCopy -= byteToProcess;
                 offset += byteToProcess;
@@ -147,6 +150,7 @@ class ExifOutputStream extends FilterOutputStream {
                         throw new IOException("Not a valid jpeg image, cannot write exif");
                     }
                     out.write(mBuffer.array(), 0, 2);
+                    mSize += 2;
                     mState = STATE_FRAME_HEADER;
                     mBuffer.rewind();
                     writeExifData();
@@ -162,6 +166,7 @@ class ExifOutputStream extends FilterOutputStream {
                         short tag = mBuffer.getShort();
                         if (tag == JpegHeader.EOI) {
                             out.write(mBuffer.array(), 0, 2);
+                            mSize += 2;
                             mBuffer.rewind();
                         }
                     }
@@ -175,9 +180,11 @@ class ExifOutputStream extends FilterOutputStream {
                         mState = STATE_JPEG_DATA;
                     } else if (!JpegHeader.isSofMarker(marker)) {
                         out.write(mBuffer.array(), 0, 4);
+                        mSize += 4;
                         mByteToCopy = (mBuffer.getShort() & 0x0000ffff) - 2;
                     } else {
                         out.write(mBuffer.array(), 0, 4);
+                        mSize += 4;
                         mState = STATE_JPEG_DATA;
                     }
                     mBuffer.rewind();
@@ -185,6 +192,7 @@ class ExifOutputStream extends FilterOutputStream {
         }
         if (length > 0) {
             out.write(buffer, offset, length);
+            mSize += length;
         }
     }
 
@@ -238,6 +246,7 @@ class ExifOutputStream extends FilterOutputStream {
         for (ExifTag t : nullTags) {
             mExifData.addTag(t);
         }
+        mSize += dataOutputStream.size();
     }
 
     private ArrayList<ExifTag> stripNullValueTags(ExifData data) {
@@ -515,4 +524,8 @@ class ExifOutputStream extends FilterOutputStream {
                 break;
         }
     }
+
+    int size() {
+        return mSize;
+    }
 }
diff --git a/src/com/android/camera/exif/OrderedDataOutputStream.java b/src/com/android/camera/exif/OrderedDataOutputStream.java
index 1a1b31be4..abc0a6eb1 100644
--- a/src/com/android/camera/exif/OrderedDataOutputStream.java
+++ b/src/com/android/camera/exif/OrderedDataOutputStream.java
@@ -24,6 +24,7 @@ import java.nio.ByteOrder;
 
 class OrderedDataOutputStream extends FilterOutputStream {
     private final ByteBuffer mByteBuffer = ByteBuffer.allocate(4);
+    private int mSize = 0;
 
     public OrderedDataOutputStream(OutputStream out) {
         super(out);
@@ -38,6 +39,7 @@ class OrderedDataOutputStream extends FilterOutputStream {
         mByteBuffer.rewind();
         mByteBuffer.putShort(value);
         out.write(mByteBuffer.array(), 0, 2);
+        mSize += 2;
         return this;
     }
 
@@ -45,6 +47,7 @@ class OrderedDataOutputStream extends FilterOutputStream {
         mByteBuffer.rewind();
         mByteBuffer.putInt(value);
         out.write(mByteBuffer.array());
+        mSize += 4;
         return this;
     }
 
@@ -53,4 +56,8 @@ class OrderedDataOutputStream extends FilterOutputStream {
         writeInt((int) rational.getDenominator());
         return this;
     }
+
+    public int size() {
+        return mSize;
+    }
 }
diff --git a/src/com/android/camera/ui/PieItem.java b/src/com/android/camera/ui/PieItem.java
index 47fe06758..e62486a76 100644
--- a/src/com/android/camera/ui/PieItem.java
+++ b/src/com/android/camera/ui/PieItem.java
@@ -139,7 +139,7 @@ public class PieItem {
     }
 
     public void performClick() {
-        if (mOnClickListener != null) {
+        if (mOnClickListener != null && mEnabled) {
             mOnClickListener.onClick(this);
         }
     }
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 9c42194a0..eab9177b4 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -222,12 +222,6 @@ public class CameraUtil {
     // Get available hardware keys
     private static int sDeviceKeysPresent;
 
-    // Samsung camcorder mode
-    private static boolean sSamsungCamMode;
-
-    // HTC camcorder mode
-    private static boolean sHTCCamMode;
-
     private CameraUtil() {
     }
 
@@ -247,8 +241,6 @@ public class CameraUtil {
         sSamsungHDRFormat = context.getResources().getBoolean(R.bool.needsSamsungHDRFormat);
         sDeviceKeysPresent = context.getResources().getInteger(
                 com.android.internal.R.integer.config_deviceHardwareKeys);
-        sSamsungCamMode = context.getResources().getBoolean(R.bool.needsSamsungCamMode);
-        sHTCCamMode = context.getResources().getBoolean(R.bool.needsHTCCamMode);
         sASDModes = context.getResources().getStringArray(R.array.asdModes);
         sEnableHDRWithZSL = context.getResources().getBoolean(R.bool.enableHDRWithZSL);
         sEnableHistogram = context.getResources().getBoolean(R.bool.enableHistogram);
@@ -266,14 +258,6 @@ public class CameraUtil {
         return sNoFocusModeChangeForTouch;
     }
 
-    public static boolean useHTCCamMode() {
-        return sHTCCamMode;
-    }
-
-    public static boolean useSamsungCamMode() {
-        return sSamsungCamMode;
-    }
-
     public static boolean isHDRWithZSLEnabled() {
         return sEnableHDRWithZSL;
     }