Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0b

Change-Id: Ie3958652f1c32d9b70049a4e6c963719a3e06180

76 files changed, 282 insertions, 961 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index ce6d50def..cec99657d 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">VERBETER</string>
   <string name="camera_menu_slow_shutter_label">STADIGE SLUITER</string>
   <string name="camera_menu_beauty_mode_label">VERFRAAI</string>
-  <string name="camera_menu_colorize_label">VERKLEUR</string>
-  <string name="camera_menu_effects_label">EFFEKTE</string>
   <string name="camera_menu_asd_label">MOOI TONEEL</string>
   <string name="pref_camera_power_shutter_title">Krag knoppie</string>
   <string name="pref_superzoom_title">Vergroot</string>
diff --git a/res/values-af/qcomstrings.xml b/res/values-af/qcomstrings.xml
index 1172b7079..1cd353867 100644
--- a/res/values-af/qcomstrings.xml
+++ b/res/values-af/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Krag Modus</string>
   <string name="pref_camera_powermode_entry_lp">Lae_Krag</string>
   <string name="pref_camera_powermode_entry_np">Normale_Krag</string>
-  <string name="pref_camera_autoexposure_title">Kies Auto Beligtingsinstelling</string>
+  <string name="pref_camera_autoexposure_title">Outo beligting</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Foto raam Gemiddeld</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Geweegdegemiddelde</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Kol Meting</string>
   <string name="pref_camera_videoencoder_title">Video enkodeerder</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Video enkodeerder</string>
   <string name="pref_camera_audioencoder_title">Oudio enkodeerder</string>
   <string name="pref_camera_video_duration_title">Video tydsduur</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekondes(MMS)</string>
   <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">Aktiveer</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Deaktiveer</string>
-  <string name="pref_camera_zsl_title">ZSL</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_zsl_entry_off">Af</string>
-  <string name="pref_camera_zsl_entry_on">Aan</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>
@@ -53,27 +49,21 @@
   <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">Aktiveer</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Deaktiveer</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="error_app_unsupported_raw">Raw foto-formaat word nie in ZSL modus ondersteun nie</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR word nie in ZSL modus ondersteun nie</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Afdeling</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="err_app_unsupport_ae_bracket_code">Geen ae afdeling ondersteuning deur programme op die oomblik nie</string>
-  <string name="snapshot_lower_than_video">Video kitsblik grootte laer as video grootte. Beperking tot Video grootte. Kies \'n resolusie hoër of gelyk aan die huidige video grootte.</string>
-  <string name="snapshotsize_low_powermode">Ons ondersteun nie die foto resolusie in Lae Krag Modus. Video grootte kitsblik sal geneem word. Kies Hoë krag modus vir die foto grootte.</string>
-  <string name="snapshot_qcif_and_d1">Slegs Video grootte kitsblik ondersteuning vir huidige resolusie.</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">Wavelet Denoise Modus</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>
@@ -108,7 +98,7 @@
   <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">DIS</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>
@@ -155,14 +145,9 @@
   <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">Aktiveer</string>
-  <string name="pref_camera_histogram_entry_disable">Deaktiveer</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normaal</string>
-  <string name="pref_camera_focusmode_entry_continuous">CAF</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_off">Af</string>
   <string name="pref_camera_scenedetect_entry_on">Aan</string>
-  <string name="time_lapse_error">Ongeldig video-grootte vir tydsverloop opnames.</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 d443c877f..787145121 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">تعزيز</string>
   <string name="camera_menu_slow_shutter_label">مصراع بطيئة</string>
   <string name="camera_menu_beauty_mode_label">تجميل</string>
-  <string name="camera_menu_colorize_label">تلوين</string>
-  <string name="camera_menu_effects_label">آثار</string>
   <string name="camera_menu_asd_label">المشهد الذكية</string>
   <string name="pref_camera_power_shutter_title">مصراع قوي</string>
   <string name="pref_superzoom_title">تكبير</string>
diff --git a/res/values-ar/qcomstrings.xml b/res/values-ar/qcomstrings.xml
index 65a3c33f4..3ec4143fa 100644
--- a/res/values-ar/qcomstrings.xml
+++ b/res/values-ar/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">وضع الطاقة</string>
   <string name="pref_camera_powermode_entry_lp">طاقة منخفضة</string>
   <string name="pref_camera_powermode_entry_np">طاقة عادية</string>
-  <string name="pref_camera_autoexposure_title">وضع التعرض التلقائي</string>
+  <string name="pref_camera_autoexposure_title">تعريض التلقائي</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">الإطار المتوسط</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">مركز الموازن</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">بقعة القياس</string>
   <string name="pref_camera_videoencoder_title">ترميز الفيديو</string>
-  <string name="pref_camera_videoencoder_dialogtitle">ترميز الفيديو</string>
   <string name="pref_camera_audioencoder_title">ترميز الصوت</string>
   <string name="pref_camera_video_duration_title">مدة الفيديو</string>
   <string name="pref_camera_video_duration_entry_mms">30 ثانية (MMS)</string>
   <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_zsl_title">مصراع الشوش صفر (ZSL)</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_zsl_entry_off">مغلق</string>
-  <string name="pref_camera_zsl_entry_on">يعمل</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>
@@ -53,27 +49,21 @@
   <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="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="error_app_unsupported_raw">تنسيق صورة RAW غير معتمد في وضع ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR غير مدعوم في وضع ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-قوس</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="err_app_unsupport_ae_bracket_code">AE قواس غير معتمد حتى الآن</string>
-  <string name="snapshot_lower_than_video">حجم لقطة الفيديو أقل من حجم الفيديو، وضع حد أقصى لحجم الفيديو. الرجاء تحديد دقة أعلى أو مساوياً لحجم الفيديو الحالي.</string>
-  <string name="snapshotsize_low_powermode">تغيير حجم الصورة غير معتمد في وضع \"الطاقة المنخفضة\"، وسوف تؤخذ لقطة حجم الفيديو. الرجاء تحديد وضع \"الطاقة العادية\" لسماح بتغيير حجم الصورة.</string>
-  <string name="snapshot_qcif_and_d1">فقط حجم لقطة الفيديو مدعون لهاذا القرار.</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">وضع مويجات Denoise</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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -155,14 +145,9 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">عادي</string>
-  <string name="pref_camera_focusmode_entry_continuous">المستمر</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_off">مغلق</string>
   <string name="pref_camera_scenedetect_entry_on">يعمل</string>
-  <string name="time_lapse_error">غير صحيح حجم الفيديو لتسجيل الوقت الفاصل بينه.</string>
+  <string name="pref_camera_scenedetect_entry_off">مغلق</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index cff3556b4..9dd66baf4 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">MILLORA</string>
   <string name="camera_menu_slow_shutter_label">OBTURADOR LENT</string>
   <string name="camera_menu_beauty_mode_label">FES BONIC</string>
-  <string name="camera_menu_colorize_label">ACOLOREIX</string>
-  <string name="camera_menu_effects_label">EFECTES</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_superzoom_title">Magnifica</string>
diff --git a/res/values-ca/qcomstrings.xml b/res/values-ca/qcomstrings.xml
index 3b946f268..79a64a500 100644
--- a/res/values-ca/qcomstrings.xml
+++ b/res/values-ca/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Mode d\'energia</string>
   <string name="pref_camera_powermode_entry_lp">Baix consum</string>
   <string name="pref_camera_powermode_entry_np">Consum normal</string>
-  <string name="pref_camera_autoexposure_title">Selecciona el mode d\'Auto Exposició</string>
+  <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_videoencoder_title">Codificador de vídeo</string>
-  <string name="pref_camera_videoencoder_dialogtitle">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>
   <string name="pref_camera_video_duration_entry_mms">30 segons (MMS)</string>
   <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">Activa</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desactiva</string>
-  <string name="pref_camera_zsl_title">Obturador instantani (ZSL)</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_centerweighted">Ponderada al centre</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Mitjana del marc</string>
-  <string name="pref_camera_zsl_entry_off">Desactivat</string>
-  <string name="pref_camera_zsl_entry_on">Encès</string>
   <string name="pref_camera_video_hdr_entry_off">Desactivat</string>
   <string name="pref_camera_video_hdr_entry_on">Encès</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
@@ -53,27 +49,21 @@
   <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">Activa</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desactiva</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">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_raw">El format d\'imatge Raw no està suportat en el\nmode zsl</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR no suportat en el mode zsl</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</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="err_app_unsupport_ae_bracket_code">Ara no hi ha suport per AE bracket per part de les Apps</string>
-  <string name="snapshot_lower_than_video">La mida de la captura de vídeo és més baixa que la mida del vídeo. Redimensionant a la mida del vídeo. Si us plau selecciona una resolució més gran o igual a la mida del vídeo actual.</string>
-  <string name="snapshotsize_low_powermode">No està suportada aquesta resolució de fotografia en el mode d\'estalvi energètic. Es prendrà una captura\nde la mida del vídeo. Si us plau selecciona el mode d\'alt rendiment per aquesta mida de fotografia.</string>
-  <string name="snapshot_qcif_and_d1">Només estan suportats les captures en la mida de vídeo per aquesta resolució</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">Mode de neteja de soroll d\'ondeta</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>
@@ -108,7 +98,7 @@
   <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ó d\'imatge digital</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>
@@ -155,14 +145,9 @@
   <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">Activa</string>
-  <string name="pref_camera_histogram_entry_disable">Desactiva</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Continu</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_off">Desactivat</string>
   <string name="pref_camera_scenedetect_entry_on">Encès</string>
-  <string name="time_lapse_error">Mida del vídeo invàlida per a la gravació time-lapse.</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 53fe19e80..c93cd475d 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">VYLEPŠIT</string>
   <string name="camera_menu_slow_shutter_label">POMALÁ ZÁVĚRKA</string>
   <string name="camera_menu_beauty_mode_label">ZKRÁŠLENÍ</string>
-  <string name="camera_menu_colorize_label">OBARVENÍ</string>
-  <string name="camera_menu_effects_label">EFEKTY</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_superzoom_title">Zvětšit</string>
diff --git a/res/values-cs/qcomstrings.xml b/res/values-cs/qcomstrings.xml
index afa3a7ae1..fd8b5a00d 100644
--- a/res/values-cs/qcomstrings.xml
+++ b/res/values-cs/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Režim napájení</string>
   <string name="pref_camera_powermode_entry_lp">Nízký výkon</string>
   <string name="pref_camera_powermode_entry_np">Normální výkon</string>
-  <string name="pref_camera_autoexposure_title">Režim automatické expozice</string>
+  <string name="pref_camera_autoexposure_title">Automatická expozice</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Průměrový</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Se zvýrazněným středem</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Bodový</string>
   <string name="pref_camera_videoencoder_title">Video kodek</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Video kodek</string>
   <string name="pref_camera_audioencoder_title">Zvukový kodek</string>
   <string name="pref_camera_video_duration_title">Délka videa</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekund (MMS)</string>
   <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">Povolit</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Zakázat</string>
-  <string name="pref_camera_zsl_title">Nulové zpoždění závěrky (ZSL)</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_zsl_entry_off">Vyp</string>
-  <string name="pref_camera_zsl_entry_on">Zap</string>
   <string name="pref_camera_video_hdr_entry_off">Vyp</string>
   <string name="pref_camera_video_hdr_entry_on">Zap</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
@@ -53,27 +49,21 @@
   <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">Povolit</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Zakázat</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">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_raw">Formát obrázku RAW není podporován v režimu ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR není v režimu ZSL podporováno</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE bracketing</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="err_app_unsupport_ae_bracket_code">AE bracketing není zatím podporován</string>
-  <string name="snapshot_lower_than_video">Rozlišení snímků z videa je nižší než vlastní rozlišení videa. Zvolte rozlišení vyšší nebo stejné jako snímané video.</string>
-  <string name="snapshotsize_low_powermode">Změna velikosti obrázku není povolena v režimu nízkého výkonu, velikost bude stejná jako snímané video. Zvolte normální výkon pro umožnění změny velikosti rozlišení obrázku.</string>
-  <string name="snapshot_qcif_and_d1">V tomto rozlišení je pro snímek z videa povolena pouze velikost snímaného videa.</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">Režim vlnového odstranění šumu</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>
@@ -108,7 +98,7 @@
   <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">Digitální stabilizace obrazu</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>
@@ -155,14 +145,9 @@
   <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">Povolit</string>
-  <string name="pref_camera_histogram_entry_disable">Zakázat</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normální</string>
-  <string name="pref_camera_focusmode_entry_continuous">Sekvenční</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_off">Vyp</string>
   <string name="pref_camera_scenedetect_entry_on">Zap</string>
-  <string name="time_lapse_error">Neplatná velikost videa pro časosběrné nahrávání.</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 d7f2a3013..e97c017b5 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">FORBEDR</string>
   <string name="camera_menu_slow_shutter_label">LANGSOM UDLØSER</string>
   <string name="camera_menu_beauty_mode_label">FORSKØN</string>
-  <string name="camera_menu_colorize_label">FARVELÆG</string>
-  <string name="camera_menu_effects_label">EFFEKTER</string>
   <string name="camera_menu_asd_label">SMART SCENE</string>
   <string name="pref_camera_power_shutter_title">Strømudløser</string>
   <string name="pref_superzoom_title">Forstør</string>
diff --git a/res/values-da/qcomstrings.xml b/res/values-da/qcomstrings.xml
index 8b3f6bb4f..12314e57a 100644
--- a/res/values-da/qcomstrings.xml
+++ b/res/values-da/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Strømtilstand</string>
   <string name="pref_camera_powermode_entry_lp">Lav strøm</string>
   <string name="pref_camera_powermode_entry_np">Normal strøm</string>
-  <string name="pref_camera_autoexposure_title">Autoeksponeringstilstand</string>
+  <string name="pref_camera_autoexposure_title">Auto-eksponering</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Rammegennemsnit</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Centervægtet</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Spotmåling</string>
   <string name="pref_camera_videoencoder_title">Video-codec</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Video-codec</string>
   <string name="pref_camera_audioencoder_title">Lyd-codec</string>
   <string name="pref_camera_video_duration_title">Varighed for video</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekunder (MMS)</string>
   <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">Aktivér</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Deaktivér</string>
-  <string name="pref_camera_zsl_title">Zero Shutter Lag (ZSL)</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_zsl_entry_off">Fra</string>
-  <string name="pref_camera_zsl_entry_on">Til</string>
   <string name="pref_camera_video_hdr_entry_off">Fra</string>
   <string name="pref_camera_video_hdr_entry_on">Til</string>
   <string name="pref_camera_video_hdr_title">Video-HDR</string>
@@ -53,27 +49,21 @@
   <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">Aktivér</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Deaktivér</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">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_raw">Raw-billedformat understøttes ikke i ZSL-tilstand</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR understøttes ikke i ZSL-tilstand</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-bracketing</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="err_app_unsupport_ae_bracket_code">AE-bracketing understøttes ikke endnu</string>
-  <string name="snapshot_lower_than_video">Størrelse på videosnapshot er mindre end videoens størrelse, loftet er videostørrelsen. Vælg en opløsning højere eller magen til den aktuelle videostørrelse.</string>
-  <string name="snapshotsize_low_powermode">Skift af billedstørrelse understøttes ikke i Lav strømtilstand, et snapshot i videostørrelsen vil blive taget. Vælg Normal strømtilstand for at tillade ændring af billedstørrelse.</string>
-  <string name="snapshot_qcif_and_d1">Kun størrelsen på videosnapshot understøttes for denne opløsning.</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">Wavelet Denoise-tilstand</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>
@@ -108,7 +98,7 @@
   <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">Digital billedstabilisering</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>
@@ -155,14 +145,9 @@
   <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">Aktivér</string>
-  <string name="pref_camera_histogram_entry_disable">Deaktivér</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Fortløbende</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_off">Fra</string>
   <string name="pref_camera_scenedetect_entry_on">Til</string>
-  <string name="time_lapse_error">Ugyldig videostørrelse for tidsforskudt optagelse.</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 8df3e38ca..d599e38c4 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">VERBESSERN</string>
   <string name="camera_menu_slow_shutter_label">LANGE BELICHTEN</string>
   <string name="camera_menu_beauty_mode_label">VERSCHÖNERN</string>
-  <string name="camera_menu_colorize_label">EINFÄRBEN</string>
-  <string name="camera_menu_effects_label">EFFEKTE</string>
   <string name="camera_menu_asd_label">AUTOM. SZENE</string>
   <string name="pref_camera_power_shutter_title">Auslöser</string>
   <string name="pref_superzoom_title">Vergrößern</string>
diff --git a/res/values-de/qcomstrings.xml b/res/values-de/qcomstrings.xml
index 30c672836..a7804f82b 100644
--- a/res/values-de/qcomstrings.xml
+++ b/res/values-de/qcomstrings.xml
@@ -24,12 +24,11 @@
   <string name="pref_camera_powermode_title">Energiemodus</string>
   <string name="pref_camera_powermode_entry_lp">Energiesparen</string>
   <string name="pref_camera_powermode_entry_np">Normal</string>
-  <string name="pref_camera_autoexposure_title">Belichtungsautomatik</string>
+  <string name="pref_camera_autoexposure_title">Automatische Belichtung</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Integral</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Mittenbetont</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Spot</string>
   <string name="pref_camera_videoencoder_title">Video-Encoder</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Video-Encoder</string>
   <string name="pref_camera_audioencoder_title">Audio-Encoder</string>
   <string name="pref_camera_video_duration_title">Videodauer</string>
   <string name="pref_camera_video_duration_entry_mms">30 Sekunden (MMS)</string>
@@ -38,14 +37,11 @@
   <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_zsl_title">Zero Shutter Lag (ZSL)</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_zsl_entry_off">Aus</string>
-  <string name="pref_camera_zsl_entry_on">An</string>
   <string name="pref_camera_video_hdr_entry_off">Aus</string>
   <string name="pref_camera_video_hdr_entry_on">An</string>
   <string name="pref_camera_video_hdr_title">Video (HDR)</string>
@@ -58,22 +54,16 @@
   <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_raw">Im ZSL-Modus wird das RAW-Format nicht unterstützt</string>
-  <string name="error_app_unsupported_hdr_zsl">Im ZSL-Modus wird der HDR-Modus nicht unterstützt</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Belichtungsreihe</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="err_app_unsupport_ae_bracket_code">Belichtungsreihen werden noch nicht unterstützt</string>
-  <string name="snapshot_lower_than_video">Die Auflösung des Schnappschusses ist geringer als die Videoauflösung. Bitte wählen Sie die gleiche oder eine höhere Auflösung wie die Videoauflösung</string>
-  <string name="snapshotsize_low_powermode">Ändern der Bildgröße wird im Energiesparmodus nicht unterstützt. Wählen Sie den Normalen Energiemodus um die Bildgröße einstellen zu können</string>
-  <string name="snapshot_qcif_and_d1">Schnappschüsse werden nur in der Videoauflösung unterstützt</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 (Wavelet)</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>
@@ -108,7 +98,7 @@
   <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">Digitale Bildstabilisierung</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>
@@ -157,12 +147,7 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Kontinuierlich</string>
   <string name="pref_camera_scenedetect_title">Automatische Szenenerkennung</string>
-  <string name="pref_camera_scenedetect_entry_off">Aus</string>
   <string name="pref_camera_scenedetect_entry_on">An</string>
-  <string name="time_lapse_error">Unzulässige Videogröße für Zeitrafferaufnahme</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 91c8b1d24..e456d19e7 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">ΒΕΛΤΙΩΣΗ</string>
   <string name="camera_menu_slow_shutter_label">ΑΡΓΟ ΚΛΕΙΣΤΡΟ</string>
   <string name="camera_menu_beauty_mode_label">ΟΜΟΡΦΙΑ</string>
-  <string name="camera_menu_colorize_label">ΧΡΩΜΑΤΙΣΜΟΣ</string>
-  <string name="camera_menu_effects_label">ΕΦΕ</string>
   <string name="camera_menu_asd_label">ΕΞΥΠΝΗ ΣΚΗΝΗ</string>
   <string name="pref_camera_power_shutter_title">Κλείστρο power</string>
   <string name="pref_superzoom_title">Μεγέθυνση</string>
diff --git a/res/values-el/qcomstrings.xml b/res/values-el/qcomstrings.xml
index eeba3aa5e..00c770622 100644
--- a/res/values-el/qcomstrings.xml
+++ b/res/values-el/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Λειτουργία ισχύος</string>
   <string name="pref_camera_powermode_entry_lp">Χαμηλή ισχύς</string>
   <string name="pref_camera_powermode_entry_np">Κανονική ισχύς</string>
-  <string name="pref_camera_autoexposure_title">Λειτουργία αυτόματης έκθεσης</string>
+  <string name="pref_camera_autoexposure_title">Αυτόματη έκθεση</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Μέσος όρος κάδρου</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Βάρος προς το κέντρο</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Σημειακή μέτρηση</string>
   <string name="pref_camera_videoencoder_title">Κωδικοποιητής βίντεο</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Κωδικοποιητής βίντεο</string>
   <string name="pref_camera_audioencoder_title">Κωδικοποιητής ήχου</string>
   <string name="pref_camera_video_duration_title">Διάρκεια βίντεο</string>
   <string name="pref_camera_video_duration_entry_mms">30 δευτερόλεπτα (MMS)</string>
   <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_zsl_title">Μηδενική καθυστέρηση κλείστρου (ZSL)</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_zsl_entry_off">Ανενεργή</string>
-  <string name="pref_camera_zsl_entry_on">Ενεργή</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">Video HDR</string>
@@ -53,27 +49,21 @@
   <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="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">Υποστηρίζεται μόνο η κωδικοποίηση H.264 κατά τη λήψη βίντεο υψηλού ρυθμού καρέ</string>
   <string name="error_app_unsupported">Μη υποστηριζόμενη ανάλυση βίντεο για αυτόν τον τύπο κωδικοποιητή</string>
-  <string name="error_app_unsupported_raw">Δεν υποστηρίζεται Raw τύπος εικόνας κατά την λειτουργία ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">Δεν υποστηρίζεται το HDR κατά την λειτουργία ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Bracket ΑΕ</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="err_app_unsupport_ae_bracket_code">Το Bracketing ΑΕ δεν υποστηρίζεται ακόμη</string>
-  <string name="snapshot_lower_than_video">Το μέγεθος στιγμιότυπου βίντεο είναι μικρότερο από το μέγεθος βίντεο, κλείδωμα στο μέγεθος βίντεο. Παρακαλώ επιλέξτε ένα μέγεθος μεγαλύτερο ή ίσο με το τρέχον μέγεθος βίντεο.</string>
-  <string name="snapshotsize_low_powermode">Δεν υποστηρίζεται η αλλαγή μεγέθους φωτογραφίας κατά την λειτουργία Χαμηλής ισχύος, θα ληφθεί στιγμιότυπο στο μέγεθος του βίντεο. Παρακαλώ επιλέξτε την λειτουργία Κανονικής ισχύος για να μπορείτε να αλλάξετε το μέγεθος της εικόνας.</string>
-  <string name="snapshot_qcif_and_d1">Υποστηρίζεται μόνο στιγμιότυπο στο μέγεθος του βίντεο για αυτή την ανάλυση.</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">Λειτουργία Wavelet Denoise</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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -155,14 +145,9 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Κανονική</string>
-  <string name="pref_camera_focusmode_entry_continuous">Συνεχής</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_off">Ανενεργός</string>
   <string name="pref_camera_scenedetect_entry_on">Ενεργός</string>
-  <string name="time_lapse_error">Μη έγκυρο μέγεθος βίντεο για καταγραφή time-lapse.</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 34c8b1c12..6fb501689 100644
--- a/res/values-es-rXA/cm_strings.xml
+++ b/res/values-es-rXA/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">MEYORES</string>
   <string name="camera_menu_slow_shutter_label">OBTURADOR LENTU</string>
   <string name="camera_menu_beauty_mode_label">EMBELLECER</string>
-  <string name="camera_menu_colorize_label">DAR COLOR</string>
-  <string name="camera_menu_effects_label">EFEUTOS</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_superzoom_title">Ampliar</string>
diff --git a/res/values-es-rXA/qcomstrings.xml b/res/values-es-rXA/qcomstrings.xml
index e47f99b7c..99f933d6b 100644
--- a/res/values-es-rXA/qcomstrings.xml
+++ b/res/values-es-rXA/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Mou d\'enerxía</string>
   <string name="pref_camera_powermode_entry_lp">Batería baxa</string>
   <string name="pref_camera_powermode_entry_np">Batería normal</string>
-  <string name="pref_camera_autoexposure_title">Mou d\'Autoesposición</string>
+  <string name="pref_camera_autoexposure_title">Esposición automática</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Media de marcos</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada al centru</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Midición puntual</string>
   <string name="pref_camera_videoencoder_title">Códec de videu</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Códec de videu</string>
   <string name="pref_camera_audioencoder_title">Códec d\'audiu</string>
   <string name="pref_camera_video_duration_title">Duración del videu</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">Meyora del tonu la piel</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Habilitáu</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Deshabilitáu</string>
-  <string name="pref_camera_zsl_title">Disparador instantaneu (ZSL)</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_zsl_entry_off">Desactiváu</string>
-  <string name="pref_camera_zsl_entry_on">Activáu</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="pref_camera_video_hdr_title">Videu HDR</string>
@@ -58,22 +54,16 @@
   <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_raw">El formatu d\'imaxe Raw nun ta sofitáu nel mou ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR ensin sofitu nel mou ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</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="err_app_unsupport_ae_bracket_code">La esposición HDR automática nun ta sofitada pola aplicación</string>
-  <string name="snapshot_lower_than_video">El tamañu d\'instantánea ye menor que\'l tamañu de videu. Por favor, seleiciona una resolución igual o mayor al tamañu actual de videu.</string>
-  <string name="snapshotsize_low_powermode">Nun ta disponible la resolución d\'imaxe pal mou d\'aforru d\'enerxía. Va capturase una instantánea a la resolución de videu. Por favor, seleiciona\'l mou normal pa usar el tamañu d\'imaxe.</string>
-  <string name="snapshot_qcif_and_d1">Namái tán sofitaes les captures de tamañu de videu pa esta resolución.</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">Mou reductor de ruiu</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>
@@ -108,7 +98,7 @@
   <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 dixital d\'imaxe</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>
@@ -155,14 +145,9 @@
   <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">Habilitáu</string>
-  <string name="pref_camera_histogram_entry_disable">Deshabilitáu</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Continuu</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_off">Desactivada</string>
   <string name="pref_camera_scenedetect_entry_on">Activada</string>
-  <string name="time_lapse_error">Tamañu de videu inválidu pal tiempu de grabación.</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 022c19c0d..27729dad1 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">MEJORAS</string>
   <string name="camera_menu_slow_shutter_label">OBTURADOR LENTO</string>
   <string name="camera_menu_beauty_mode_label">EMBELLECER</string>
-  <string name="camera_menu_colorize_label">COLOREAR</string>
-  <string name="camera_menu_effects_label">EFECTOS</string>
   <string name="camera_menu_asd_label">ESCENA INTELIGENTE</string>
   <string name="pref_camera_power_shutter_title">Disparador alternativo</string>
   <string name="pref_superzoom_title">Zoom</string>
diff --git a/res/values-es/qcomstrings.xml b/res/values-es/qcomstrings.xml
index 2befd3c4a..56435c60d 100644
--- a/res/values-es/qcomstrings.xml
+++ b/res/values-es/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Modo de energía</string>
   <string name="pref_camera_powermode_entry_lp">Baja energía</string>
   <string name="pref_camera_powermode_entry_np">Energía normal</string>
-  <string name="pref_camera_autoexposure_title">Medición de exposición</string>
+  <string name="pref_camera_autoexposure_title">Exposición automática</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Matricial</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada al centro</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Puntual</string>
   <string name="pref_camera_videoencoder_title">Codec de vídeo</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Codec de vídeo</string>
   <string name="pref_camera_audioencoder_title">Códec de audio</string>
   <string name="pref_camera_video_duration_title">Duración de vídeo</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">Mejora tono de piel</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Habilitado</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Deshabilitado</string>
-  <string name="pref_camera_zsl_title">Disparador instantáneo</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_zsl_entry_off">Desactivado</string>
-  <string name="pref_camera_zsl_entry_on">Activado</string>
   <string name="pref_camera_video_hdr_entry_off">Desactivado</string>
   <string name="pref_camera_video_hdr_entry_on">Activado</string>
   <string name="pref_camera_video_hdr_title">Vídeo de alto rango dinámico</string>
@@ -58,22 +54,16 @@
   <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_raw">El formato de imagen RAW no está soportado con el disparador instantáneo activado</string>
-  <string name="error_app_unsupported_hdr_zsl">El modo de alto rango dinámico no está soportado con el disparador instantáneo activado</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Exposición HDR</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="err_app_unsupport_ae_bracket_code">Por ahora la exposición HDR automática no está soportada por la aplicación</string>
-  <string name="snapshot_lower_than_video">El tamaño de instantánea es menor que el tamaño de vídeo. Por favor, selecciona una resolución igual o mayor al tamaño actual de vídeo.</string>
-  <string name="snapshotsize_low_powermode">No está disponible la resolución de imagen para el modo de baja energía. Será capturada una instantánea a la resolución de vídeo. Por favor, selecciona el modo normal para usar el tamaño de imagen.</string>
-  <string name="snapshot_qcif_and_d1">Solamente está soportado el tamaño de vídeo para esta resolución.</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">Modo reductor de ruido</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>
@@ -108,7 +98,7 @@
   <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">DIS</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>
@@ -155,14 +145,9 @@
   <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">Habilitado</string>
-  <string name="pref_camera_histogram_entry_disable">Deshabilitado</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Continuo</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_off">Desactivada</string>
   <string name="pref_camera_scenedetect_entry_on">Activada</string>
-  <string name="time_lapse_error">Tamaño de vídeo inválido para el tiempo de grabación.</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 2bd809228..9e9346cc5 100644
--- a/res/values-et/cm_strings.xml
+++ b/res/values-et/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">SUURENDA</string>
   <string name="camera_menu_slow_shutter_label">AEGLANE KATIK</string>
   <string name="camera_menu_beauty_mode_label">KAUNISTA</string>
-  <string name="camera_menu_colorize_label">VÄRVI</string>
-  <string name="camera_menu_effects_label">EFEKTID</string>
   <string name="camera_menu_asd_label">TARK STSEEN</string>
   <string name="pref_camera_power_shutter_title">Sisselülitusnupu katik</string>
   <string name="pref_superzoom_title">Suurenda</string>
diff --git a/res/values-et/qcomstrings.xml b/res/values-et/qcomstrings.xml
index 1bfad037d..7d58b5949 100644
--- a/res/values-et/qcomstrings.xml
+++ b/res/values-et/qcomstrings.xml
@@ -24,28 +24,21 @@
   <string name="pref_camera_powermode_title">Energiarežiim</string>
   <string name="pref_camera_powermode_entry_lp">Madal Võimsus</string>
   <string name="pref_camera_powermode_entry_np">Normaalne Võimsus</string>
-  <string name="pref_camera_autoexposure_title">Automaatse Säri režiim</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Keskraam</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Keskele kaalutud</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Punktmõõtmine</string>
   <string name="pref_camera_videoencoder_title">Video koodek</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Video koodek</string>
   <string name="pref_camera_audioencoder_title">Heli koodek</string>
   <string name="pref_camera_video_duration_title">Video kestus</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekundit (MMS)</string>
   <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">Luba</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Keela</string>
-  <string name="pref_camera_zsl_title">Null Katiku Aeg (ZSL)</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_zsl_entry_off">Väljas</string>
-  <string name="pref_camera_zsl_entry_on">Sees</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>
@@ -53,27 +46,18 @@
   <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">Luba</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Keela</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="error_app_unsupported_raw">Töötlemata pildivorming ei ole toetatud ZSL režiimis</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR ei ole toetatud ZSL režiimis</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Nihe</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="err_app_unsupport_ae_bracket_code">AE Nihestamine ei ole veel toetatud</string>
-  <string name="snapshot_lower_than_video">Video ülesvõtte suurus on väiksem kui video suurus, piiran video suuruseni. Palun valige suurem või võrdne resolutsioon praeguse video suuruse jaoks.</string>
-  <string name="snapshotsize_low_powermode">Pildi suuruse muutmine ei ole toetatud Madala Energiatarbega olekus, video suurusega ülesvõte jäädvustatakse. Palun valige Tavaline Energiatarbe et lubada muuta pildu suurust.</string>
-  <string name="snapshot_qcif_and_d1">Ainult video suurusega ülesvõte on toetatud sellel resolutsioonil.</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_title">Minilainete Vähendamise režiim</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>
@@ -108,7 +92,6 @@
   <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">Digitaalne Pildistabilisaator</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>
@@ -155,14 +138,7 @@
   <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">Luba</string>
-  <string name="pref_camera_histogram_entry_disable">Keela</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normaalne</string>
-  <string name="pref_camera_focusmode_entry_continuous">Pidev</string>
   <string name="pref_camera_scenedetect_title">Automaatne Stseeni Tuvastus</string>
-  <string name="pref_camera_scenedetect_entry_off">Väljas</string>
   <string name="pref_camera_scenedetect_entry_on">Sees</string>
-  <string name="time_lapse_error">Sobimatu video suurus aeglustatud salvestuseks.</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 dc26d24a2..7e71c2ef2 100644
--- a/res/values-eu/cm_strings.xml
+++ b/res/values-eu/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">HOBEKUNTZAK</string>
   <string name="camera_menu_slow_shutter_label">OBTURADORE MOTELA</string>
   <string name="camera_menu_beauty_mode_label">EDERTU</string>
-  <string name="camera_menu_colorize_label">KOLOREATU</string>
-  <string name="camera_menu_effects_label">EFEKTUAK</string>
   <string name="camera_menu_asd_label">ESZENA ADIMENTSUA</string>
   <string name="pref_camera_power_shutter_title">Ordezko kliskagailua</string>
   <string name="pref_superzoom_title">Zoom-a</string>
diff --git a/res/values-eu/qcomstrings.xml b/res/values-eu/qcomstrings.xml
index 38991fd5b..8e3d058e4 100644
--- a/res/values-eu/qcomstrings.xml
+++ b/res/values-eu/qcomstrings.xml
@@ -24,12 +24,11 @@
   <string name="pref_camera_powermode_title">Energia modua</string>
   <string name="pref_camera_powermode_entry_lp">Energia baxua</string>
   <string name="pref_camera_powermode_entry_np">Energia arrunta</string>
-  <string name="pref_camera_autoexposure_title">Esposizio neurketa</string>
+  <string name="pref_camera_autoexposure_title">Espozizio automatikoa</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Matriziala</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Erdialdean haztatua</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Puntuala</string>
   <string name="pref_camera_videoencoder_title">Bideo kodek-a</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Bideo kodek-a</string>
   <string name="pref_camera_audioencoder_title">Audio kodek-a</string>
   <string name="pref_camera_video_duration_title">Bideoaren iraupena</string>
   <string name="pref_camera_video_duration_entry_mms">30 segundu (MMS)</string>
@@ -38,14 +37,11 @@
   <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_zsl_title">Aldiuneko kliskagailua</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_zsl_entry_off">Ezgaituta</string>
-  <string name="pref_camera_zsl_entry_on">Gaituta</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>
@@ -58,22 +54,16 @@
   <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="error_app_unsupported_raw">RAW irudi formatua ez dago baliagarri aldiuneko kliskagailuarekin batera</string>
-  <string name="error_app_unsupported_hdr_zsl">Hein dinamiko altuko modua ez dago baliagarri aldiuneko kliskagailuarekin batera</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">HDR esposizioa</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="err_app_unsupport_ae_bracket_code">Momentuz HDR esposizio automatikoa ez dago erabilgarri aplikazioan</string>
-  <string name="snapshot_lower_than_video">Uneko-argazki tamaina bideoarena baino txikiagoa da. Aukeratu bideoaren berdina edo handiagoa den erresoluzio bat, mesedez.</string>
-  <string name="snapshotsize_low_powermode">Irudiaren erresoluzioa ez dago energia baxuko modurako baliagarri. Aldiuneko argazki bat egingo da bideo erresoluzioan. Aukeratu modu arrunta irudiaren tamaina erabili ahal izateko, mesedez.</string>
-  <string name="snapshot_qcif_and_d1">Erresoluzio honetarako bideo tamaina bakarrik dago onartuta.</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">Soinu murriztaile modua</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>
@@ -108,7 +98,7 @@
   <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">DIS</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>
@@ -157,12 +147,7 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Arrunta</string>
-  <string name="pref_camera_focusmode_entry_continuous">Jarraia</string>
   <string name="pref_camera_scenedetect_title">Eszena adimentsua</string>
-  <string name="pref_camera_scenedetect_entry_off">Ezgaituta</string>
   <string name="pref_camera_scenedetect_entry_on">Gaituta</string>
-  <string name="time_lapse_error">Grabazioaren iraupenerako bideo tamaina ez onartua.</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 d613d61af..ce101dad4 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">PARANNUS</string>
   <string name="camera_menu_slow_shutter_label">HIDAS SULJIN</string>
   <string name="camera_menu_beauty_mode_label">KAUNISTUS</string>
-  <string name="camera_menu_colorize_label">VÄRITYS</string>
-  <string name="camera_menu_effects_label">EFEKTIT</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_superzoom_title">Suurenna</string>
diff --git a/res/values-fi/qcomstrings.xml b/res/values-fi/qcomstrings.xml
index 90db8c693..13345ed8b 100644
--- a/res/values-fi/qcomstrings.xml
+++ b/res/values-fi/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Virrankäyttö</string>
   <string name="pref_camera_powermode_entry_lp">Virransäästö</string>
   <string name="pref_camera_powermode_entry_np">Normaali virrankulutus</string>
-  <string name="pref_camera_autoexposure_title">Automaattinen valotustila</string>
+  <string name="pref_camera_autoexposure_title">Automaattinen valotus</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Kehysten keskiarvo</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Keskelle painotettu</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Pisteeseen kohdistettu</string>
   <string name="pref_camera_videoencoder_title">Videon pakkaus</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Videon pakkaus</string>
   <string name="pref_camera_audioencoder_title">Audion pakkaus</string>
   <string name="pref_camera_video_duration_title">Videon kesto</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekuntia (MMS)</string>
   <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">Ota käyttöön</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Poista käytöstä</string>
-  <string name="pref_camera_zsl_title">Ei laukaisuviivettä (ZSL)</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_zsl_entry_off">Pois käytöstä</string>
-  <string name="pref_camera_zsl_entry_on">Päällä</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="pref_camera_video_hdr_title">Video HDR</string>
@@ -53,27 +49,21 @@
   <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">Käytössä</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Poista käytöstä</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">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_raw">RAW-muotoa ei tueta ZSL-tilassa</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR-muotoa ei tueta ZSL-tilassa</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-kiinnitys</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="err_app_unsupport_ae_bracket_code">AE-kiinnitystä ei tueta vielä</string>
-  <string name="snapshot_lower_than_video">Videon pikakuvan koko on pienempi kuin videon koko, Valitse suurempi tai yhtä suuri resloluutio kuin videossa.</string>
-  <string name="snapshotsize_low_powermode">Kuvan koon muuttamista ei tueta virransäästötilassa, videon kokoinen kuva otetaan. Valitse normaali virrankulutus-tila muuttaaksesi kuvan kokoa.</string>
-  <string name="snapshot_qcif_and_d1">Vain videon kokoista pikakuvaa tuetaan tällä resoluutiolla.</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">Wavelet Denoise-tila</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>
@@ -108,7 +98,7 @@
   <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">Digitaalinen kuvan vakauttaminen</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>
@@ -155,14 +145,9 @@
   <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">Ota käyttöön</string>
-  <string name="pref_camera_histogram_entry_disable">Poista käytöstä</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normaali</string>
-  <string name="pref_camera_focusmode_entry_continuous">Jatkuva</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_off">Pois käytöstä</string>
   <string name="pref_camera_scenedetect_entry_on">Päällä</string>
-  <string name="time_lapse_error">Virheellinen videon koko aikavälinauhoitukseen.</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 e3280acc1..baffa224a 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">AMÉLIORER</string>
   <string name="camera_menu_slow_shutter_label">OBTURATION LENTE</string>
   <string name="camera_menu_beauty_mode_label">EMBELLIR</string>
-  <string name="camera_menu_colorize_label">COLORER</string>
-  <string name="camera_menu_effects_label">EFFETS</string>
   <string name="camera_menu_asd_label">SCÈNE INTELLIGENTE</string>
   <string name="pref_camera_power_shutter_title">Bouton marche</string>
   <string name="pref_superzoom_title">Magnifier</string>
diff --git a/res/values-fr/qcomstrings.xml b/res/values-fr/qcomstrings.xml
index 26a62c03d..55c76e732 100644
--- a/res/values-fr/qcomstrings.xml
+++ b/res/values-fr/qcomstrings.xml
@@ -24,12 +24,11 @@
   <string name="pref_camera_powermode_title">Mode d\'alimentation</string>
   <string name="pref_camera_powermode_entry_lp">Faible puissance</string>
   <string name="pref_camera_powermode_entry_np">Puissance normale</string>
-  <string name="pref_camera_autoexposure_title">Mode d\'exposition auto</string>
+  <string name="pref_camera_autoexposure_title">Exposition automatique</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Moyenne de la trame</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Pondérée centrale</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Mesure spot</string>
   <string name="pref_camera_videoencoder_title">Codec vidéo</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Codec vidéo</string>
   <string name="pref_camera_audioencoder_title">Codec audio</string>
   <string name="pref_camera_video_duration_title">Durée de vidéo</string>
   <string name="pref_camera_video_duration_entry_mms">30 secondes (MMS)</string>
@@ -38,14 +37,11 @@
   <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_zsl_title">Zéro délai de l\'obturateur (ZDO)</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_zsl_entry_off">Désactivé</string>
-  <string name="pref_camera_zsl_entry_on">Activé</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>
@@ -58,22 +54,16 @@
   <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="error_app_unsupported_raw">Format d\'image RAW n\'est pas pris en charge en mode ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR n\'est pas pris en charge en mode ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-support</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="err_app_unsupport_ae_bracket_code">Le bracketing AE n\'est pas encore supporté</string>
-  <string name="snapshot_lower_than_video">La taille de capture vidéo est inférieure à la taille de la vidéo.  Veuillez sélectionner une résolution supérieure ou égale à la taille actuelle de la vidéo.</string>
-  <string name="snapshotsize_low_powermode">Changer la taille de l\'image n\'est pas supporté en mode basse consommation, un cliché de la taille de la vidéo va être pris. Merci de sélectionner le mode de consommation standard pour permettre de changer la taille de l\'image.</string>
-  <string name="snapshot_qcif_and_d1">Seul un cliché de la taille de la vidéo est pris en charge pour cette résolution.</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">Mode de débruitage d\'ondelettes</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>
@@ -108,7 +98,7 @@
   <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 d\'Image numérique</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>
@@ -157,12 +147,7 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Continu</string>
   <string name="pref_camera_scenedetect_title">Détection de scène automatique</string>
-  <string name="pref_camera_scenedetect_entry_off">Désactivé</string>
   <string name="pref_camera_scenedetect_entry_on">Activé</string>
-  <string name="time_lapse_error">Taille de vidéo non valide pour l\'enregistrement en accéléré.</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 c3a80e29c..a045bda22 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">KIEMELÉS</string>
   <string name="camera_menu_slow_shutter_label">HOSSZÚ ZÁRIDŐ</string>
   <string name="camera_menu_beauty_mode_label">EFFEKTEK</string>
-  <string name="camera_menu_colorize_label">SZÍNEZÉS</string>
-  <string name="camera_menu_effects_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_superzoom_title">Nagyítás</string>
diff --git a/res/values-hu/qcomstrings.xml b/res/values-hu/qcomstrings.xml
index 9b279830b..f6ca4035a 100644
--- a/res/values-hu/qcomstrings.xml
+++ b/res/values-hu/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Energiagazdálkodási üzemmód</string>
   <string name="pref_camera_powermode_entry_lp">Gyenge akkumulátor</string>
   <string name="pref_camera_powermode_entry_np">Normál akkumulátor</string>
-  <string name="pref_camera_autoexposure_title">Válasszon expozíciós módot</string>
+  <string name="pref_camera_autoexposure_title">Automatikus expozíció</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Átlagoló</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Középre súlyozott</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Spot mérés</string>
   <string name="pref_camera_videoencoder_title">Videó tömörítő</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Videó tömörítő</string>
   <string name="pref_camera_audioencoder_title">Audió tömörítő</string>
   <string name="pref_camera_video_duration_title">Videó hossza</string>
   <string name="pref_camera_video_duration_entry_mms">30 másodperc (MMS)</string>
   <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">Engedélyezve</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Letiltva</string>
-  <string name="pref_camera_zsl_title">ZSL</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_zsl_entry_off">Ki</string>
-  <string name="pref_camera_zsl_entry_on">Be</string>
   <string name="pref_camera_video_hdr_entry_off">Ki</string>
   <string name="pref_camera_video_hdr_entry_on">Be</string>
   <string name="pref_camera_video_hdr_title">Videó HDR</string>
@@ -53,27 +49,21 @@
   <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">Engedélyezve</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Letiltva</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">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_raw">Zsl módban nem támogatott a Raw képformátum</string>
-  <string name="error_app_unsupported_hdr_zsl">Zsl módban nem támogatott a HDR</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</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="err_app_unsupport_ae_bracket_code">az alkalmazás jelenleg nem támogatja az ae tartást</string>
-  <string name="snapshot_lower_than_video">Videó pillanatfelvétel mérete kisebb, mint a videó mérete. Határérték módosítva a videó méretére. Válasszon egyenlő vagy nagyobb felbontást a jelenlegi videó mérethez.</string>
-  <string name="snapshotsize_low_powermode">Nem támogatjuk a képfelbontás módosítását alacsony akkumulátor módban. Videó pillanatfelvétel fog készülni. Válassza a normál akkumlátor módot ehhez a képmérethez.</string>
-  <string name="snapshot_qcif_and_d1">Csak a videó pillanatfelvétel méret támogatott ennél a felbontásnál.</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">Hullámosodás csökkentés</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>
@@ -108,7 +98,7 @@
   <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">Digitális képstabilizáció</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>
@@ -155,14 +145,9 @@
   <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">Engedélyezve</string>
-  <string name="pref_camera_histogram_entry_disable">Letiltva</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normál</string>
-  <string name="pref_camera_focusmode_entry_continuous">Folyamatos</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_off">Ki</string>
   <string name="pref_camera_scenedetect_entry_on">Be</string>
-  <string name="time_lapse_error">Helytelen videó méret a time-lapse felvételhez.</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 9eb470d44..d05c1a8e0 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">TINGKATKAN</string>
   <string name="camera_menu_slow_shutter_label">BIDIK LAMBAT</string>
   <string name="camera_menu_beauty_mode_label">PERCANTIK</string>
-  <string name="camera_menu_colorize_label">WARNAI</string>
-  <string name="camera_menu_effects_label">EFEK</string>
   <string name="camera_menu_asd_label">ADEGAN PINTAR</string>
   <string name="pref_camera_power_shutter_title">Bidik tombol power</string>
   <string name="pref_superzoom_title">Memperbesar</string>
diff --git a/res/values-in/qcomstrings.xml b/res/values-in/qcomstrings.xml
index b6e03c1a5..ae771f0fb 100644
--- a/res/values-in/qcomstrings.xml
+++ b/res/values-in/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Modus daya</string>
   <string name="pref_camera_powermode_entry_lp">Daya Rendah</string>
   <string name="pref_camera_powermode_entry_np">Daya Normal</string>
-  <string name="pref_camera_autoexposure_title">Modus eksposur otomatis</string>
+  <string name="pref_camera_autoexposure_title">Pencahayaan otomatis</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Frame rata-rata</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Timbang pusat</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Pengukuran titik</string>
   <string name="pref_camera_videoencoder_title">Video codec</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Video codec</string>
   <string name="pref_camera_audioencoder_title">Audio codec</string>
   <string name="pref_camera_video_duration_title">Durasi video</string>
   <string name="pref_camera_video_duration_entry_mms">30 detik (MMS)</string>
   <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">Aktifkan</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Nonaktifkan</string>
-  <string name="pref_camera_zsl_title">Zero Shutter Lag (ZSL)</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_zsl_entry_off">Nonaktif</string>
-  <string name="pref_camera_zsl_entry_on">Aktif</string>
   <string name="pref_camera_video_hdr_entry_off">Nonaktif</string>
   <string name="pref_camera_video_hdr_entry_on">Aktif</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
@@ -53,27 +49,21 @@
   <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">Aktifkan</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Nonaktifkan</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">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_raw">Format gambar mentah tidak didukung dalam modus ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR tidak didukung dalam modus ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</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="err_app_unsupport_ae_bracket_code">AE Bracketing belum didukung</string>
-  <string name="snapshot_lower_than_video">Ukuran snapshot video lebih rendah dari ukuran video, membatasi ukuran video. Silakan pilih resolusi lebih tinggi atau sama dengan ukuran video saat ini.</string>
-  <string name="snapshotsize_low_powermode">Pengubahan ukuran gambar tidak didukung dalam modus Daya Rendah, ukuran snapshot video yang dipakai. Silakan pilih modus Daya Normal untuk memungkinkan mengubah ukuran gambar.</string>
-  <string name="snapshot_qcif_and_d1">Hanya ukuran snapshot video yang didukung untuk resolusi ini.</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">Modus Wavelet Denoise</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>
@@ -108,7 +98,7 @@
   <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 Gambar Digital</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>
@@ -155,14 +145,9 @@
   <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">Aktifkan</string>
-  <string name="pref_camera_histogram_entry_disable">Nonaktifkan</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Bersambung</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_off">Nonaktif</string>
   <string name="pref_camera_scenedetect_entry_on">Aktif</string>
-  <string name="time_lapse_error">Ukuran video tidak valid untuk perekaman selang-waktu.</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 c89982361..7e92199ee 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">MIGLIORA</string>
   <string name="camera_menu_slow_shutter_label">OTTURATORE LENTO</string>
   <string name="camera_menu_beauty_mode_label">ABBELLISCI</string>
-  <string name="camera_menu_colorize_label">COLORA</string>
-  <string name="camera_menu_effects_label">EFFETTI</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_superzoom_title">Ingrandimento</string>
diff --git a/res/values-it/qcomstrings.xml b/res/values-it/qcomstrings.xml
index 619247233..983583f6f 100644
--- a/res/values-it/qcomstrings.xml
+++ b/res/values-it/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Modalità consumo</string>
   <string name="pref_camera_powermode_entry_lp">Basso consumo</string>
   <string name="pref_camera_powermode_entry_np">Consumo normale</string>
-  <string name="pref_camera_autoexposure_title">Auto esposizione</string>
+  <string name="pref_camera_autoexposure_title">Esposizione automatica</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Media immagine</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Pesata al centro</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Punto singolo</string>
   <string name="pref_camera_videoencoder_title">Codec video</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Codec video</string>
   <string name="pref_camera_audioencoder_title">Codec audio</string>
   <string name="pref_camera_video_duration_title">Durata video</string>
   <string name="pref_camera_video_duration_entry_mms">30 secondi (MMS)</string>
   <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">Attiva</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Disattiva</string>
-  <string name="pref_camera_zsl_title">Zero Shutter Lag (ZSL)</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_zsl_entry_off">OFF</string>
-  <string name="pref_camera_zsl_entry_on">ON</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 video</string>
@@ -53,27 +49,21 @@
   <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">Attiva</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Disattiva</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">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_raw">Il formato RAW non è supportato in modalità ZSL </string>
-  <string name="error_app_unsupported_hdr_zsl">L\'HDR non è supportato in modalità ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Auto Exposure Bracket</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="err_app_unsupport_ae_bracket_code">Auto Exposure Bracketing non è ancora supportato</string>
-  <string name="snapshot_lower_than_video">Le dimensioni dello snapshot sono inferiori a quelle del video, e sono state adattate. Si prega di selezionare una risoluzione maggiore o uguale a quella del video.</string>
-  <string name="snapshotsize_low_powermode">La modifica delle dimensioni dell\'immagine non è supportata in modalità basso consumo; saranno utilizzate le dimensioni del video. Si prega di selezionare la modalità consumo normale per consentire la modifica delle dimensioni dell\'immagine.</string>
-  <string name="snapshot_qcif_and_d1">Per questa risoluzione è consentito mantenere per gli snapshot solo la dimensione del video.</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">Modalità riduzione disturbo</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>
@@ -108,7 +98,7 @@
   <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 digitale immagine</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>
@@ -155,14 +145,9 @@
   <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">Attiva</string>
-  <string name="pref_camera_histogram_entry_disable">Disattiva</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normale</string>
-  <string name="pref_camera_focusmode_entry_continuous">Continuo</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_off">OFF</string>
   <string name="pref_camera_scenedetect_entry_on">ON</string>
-  <string name="time_lapse_error">Formato video non valido per registrazione rallentata.</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 25a21e7e7..d5f1bf0ea 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">שפר</string>
   <string name="camera_menu_slow_shutter_label">צמצם איטי</string>
   <string name="camera_menu_beauty_mode_label">יפייף</string>
-  <string name="camera_menu_colorize_label">צבעוני</string>
-  <string name="camera_menu_effects_label">אפקטים</string>
   <string name="camera_menu_asd_label">סצנה חכמה</string>
   <string name="pref_camera_power_shutter_title">לחצן צילום</string>
   <string name="pref_superzoom_title">הגדל</string>
diff --git a/res/values-iw/qcomstrings.xml b/res/values-iw/qcomstrings.xml
index c13f7f0cd..12e6eaa57 100644
--- a/res/values-iw/qcomstrings.xml
+++ b/res/values-iw/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">מצב צריכת חשמל</string>
   <string name="pref_camera_powermode_entry_lp">צריכת חשמל נמוכה</string>
   <string name="pref_camera_powermode_entry_np">צריכה רגילה</string>
-  <string name="pref_camera_autoexposure_title">מצב חשיפה אוטומטי</string>
+  <string name="pref_camera_autoexposure_title">חשיפה אוטומטית</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">מסגרת ממוצעת</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">ממורכז</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">אזור מדידה</string>
   <string name="pref_camera_videoencoder_title">קידוד וידאו</string>
-  <string name="pref_camera_videoencoder_dialogtitle">קידוד וידאו</string>
   <string name="pref_camera_audioencoder_title">קידוד שמע</string>
   <string name="pref_camera_video_duration_title">משך וידאו</string>
   <string name="pref_camera_video_duration_entry_mms">30 שניות (MMS)</string>
   <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_zsl_title">ללא עיקוב צמצם (ZSL)</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_zsl_entry_off">כבוי</string>
-  <string name="pref_camera_zsl_entry_on">פועל</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>
@@ -53,27 +49,21 @@
   <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="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="error_app_unsupported_raw">פורמט Raw אינו נתמך במצב ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR אינו תומך במצב ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</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="err_app_unsupport_ae_bracket_code">תיחום AE עדיין לא נתמך</string>
-  <string name="snapshot_lower_than_video">גודל תמונת וידאו נמוך יותר מאשר גודל וידאו, ממיצוי גודל הווידאו. בחר ברזולוציה גבוהה או שווה לגודל הווידאו הנוכחי.</string>
-  <string name="snapshotsize_low_powermode">שינוי גודל התמונה אינה נתמכת במצב צריכת חשמל נמוכה, נא בחר מצב צריכת חשמל רגיל כדי לאפשר שינוי גודל התמונה.</string>
-  <string name="snapshot_qcif_and_d1">רק גודל בזק הווידאו נתמך לרזולוציה זו.</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">מצב Wavelet Denoise</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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -155,14 +145,9 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">רגיל</string>
-  <string name="pref_camera_focusmode_entry_continuous">רציף</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_off">כבוי</string>
   <string name="pref_camera_scenedetect_entry_on">פועל</string>
-  <string name="time_lapse_error">גודל וידאו לא חוקי למשך זמן ההקלטה.</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 7f0f08d39..5dcfa1897 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">補正</string>
   <string name="camera_menu_slow_shutter_label">スローシャッター</string>
   <string name="camera_menu_beauty_mode_label">ビューティー化</string>
-  <string name="camera_menu_colorize_label">カラー化</string>
-  <string name="camera_menu_effects_label">効果</string>
   <string name="camera_menu_asd_label">スマートシーン</string>
   <string name="pref_camera_power_shutter_title">電源シャッター</string>
   <string name="pref_superzoom_title">拡大</string>
diff --git a/res/values-ja/qcomstrings.xml b/res/values-ja/qcomstrings.xml
index 023d17ef8..269a4d02b 100644
--- a/res/values-ja/qcomstrings.xml
+++ b/res/values-ja/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">電源モード</string>
   <string name="pref_camera_powermode_entry_lp">低電力</string>
   <string name="pref_camera_powermode_entry_np">標準電力</string>
-  <string name="pref_camera_autoexposure_title">自動露出モード</string>
+  <string name="pref_camera_autoexposure_title">自動露出</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">フレームアベレージ</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">中央部重点測光</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">スポット測光</string>
   <string name="pref_camera_videoencoder_title">ビデオコーデック</string>
-  <string name="pref_camera_videoencoder_dialogtitle">ビデオコーデック</string>
   <string name="pref_camera_audioencoder_title">オーディオコーデック</string>
   <string name="pref_camera_video_duration_title">動画の長さ</string>
   <string name="pref_camera_video_duration_entry_mms">30秒（MMS）</string>
   <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_zsl_title">ゼロシャッターラグ（ZSL）</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_zsl_entry_off">OFF</string>
-  <string name="pref_camera_zsl_entry_on">ON</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>
@@ -53,27 +49,21 @@
   <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">有効</string>
-  <string name="pref_camera_redeyereduction_entry_disable">無効</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">選択された解像度ではHFRはサポートされていません</string>
   <string name="error_app_unsupported_hfr_codec">HFRがONのときはH.264ビデオエンコードのみサポートされています</string>
   <string name="error_app_unsupported">このコーデックの種類ではサポートされていない動画の解像度です</string>
-  <string name="error_app_unsupported_raw">ZSLモードではRAW画像はサポートされていません</string>
-  <string name="error_app_unsupported_hdr_zsl">ZSLモードではHDRはサポートされていません</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AEブラケット</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="err_app_unsupport_ae_bracket_code">AEブラケットはまだサポートされていません</string>
-  <string name="snapshot_lower_than_video">動画スナップショットのサイズが動画のサイズよりも低く設定されています。今の動画のサイズと同等以上の解像度を選択してください。</string>
-  <string name="snapshotsize_low_powermode">低電力モードでは写真のサイズの変更はサポートされていません。動画のサイズのスナップショットが撮影されます。写真のサイズの変更を許可するには通常電力モードを選択してください。</string>
-  <string name="snapshot_qcif_and_d1">この解像度では動画のサイズのスナップショットのみサポートされています。</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_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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -155,14 +145,9 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">通常</string>
-  <string name="pref_camera_focusmode_entry_continuous">コンティニュアス</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_off">OFF</string>
   <string name="pref_camera_scenedetect_entry_on">ON</string>
-  <string name="time_lapse_error">コマ撮り録画では無効な動画のサイズです。</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 facb98b90..ecacd28da 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">향상</string>
   <string name="camera_menu_slow_shutter_label">느린 셔터</string>
   <string name="camera_menu_beauty_mode_label">피부 보정</string>
-  <string name="camera_menu_colorize_label">색상효과</string>
-  <string name="camera_menu_effects_label">효과</string>
   <string name="camera_menu_asd_label">스마트 씬</string>
   <string name="pref_camera_power_shutter_title">전원 셔터</string>
   <string name="pref_superzoom_title">확대</string>
diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml
index cfa5223c8..d3e3cb3ab 100644
--- a/res/values-ko/qcomstrings.xml
+++ b/res/values-ko/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">전력 모드</string>
   <string name="pref_camera_powermode_entry_lp">저전력</string>
   <string name="pref_camera_powermode_entry_np">일반 전력</string>
-  <string name="pref_camera_autoexposure_title">자동 노출 모드</string>
+  <string name="pref_camera_autoexposure_title">자동 노출</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">프레임 평균</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">중앙 중점 측광</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">스팟 측광</string>
   <string name="pref_camera_videoencoder_title">비디오 코덱</string>
-  <string name="pref_camera_videoencoder_dialogtitle">비디오 코덱</string>
   <string name="pref_camera_audioencoder_title">오디오 코덱</string>
   <string name="pref_camera_video_duration_title">비디오 길이</string>
   <string name="pref_camera_video_duration_entry_mms">30초 (MMS)</string>
   <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_zsl_title">제로 셔터 랙 (ZSL)</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_zsl_entry_off">끔</string>
-  <string name="pref_camera_zsl_entry_on">켬</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>
@@ -53,27 +49,21 @@
   <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="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="error_app_unsupported_raw">RAW 형식은 ZSL 모드에서 지원되지 않습니다</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR은 ZSL 모드에서 지원되지 않습니다</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE 브래킷</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="err_app_unsupport_ae_bracket_code">AE 브래킷은 아직 지원되지 않습니다</string>
-  <string name="snapshot_lower_than_video">비디오 스냅샷 크기가 비디오 크기보다 작습니다. 현재 비디오 크기 이상의 해상도를 선택해주십시오.</string>
-  <string name="snapshotsize_low_powermode">이미지 크기 변경은 저전력 모드에서 지원되지 않으며, 비디오 스냅샷 크기로 촬영됩니다. 이미지 크기를 변경하려면 일반 전력 모드로 선택해주십시오.</string>
-  <string name="snapshot_qcif_and_d1">이 해상도에서는 비디오 스냅샷 크기만 지원됩니다.</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_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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -155,14 +145,9 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">일반</string>
-  <string name="pref_camera_focusmode_entry_continuous">연속</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_off">꺼짐</string>
   <string name="pref_camera_scenedetect_entry_on">켜짐</string>
-  <string name="time_lapse_error">타임랩스 촬영에 사용할 수 없는 비디오 크기입니다.</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 33402b8cc..774038f31 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">زیادکردن</string>
   <string name="camera_menu_slow_shutter_label">وێنه‌گرتنێکی خاوتر</string>
   <string name="camera_menu_beauty_mode_label">جوانکاری</string>
-  <string name="camera_menu_colorize_label">ڕه‌نگاوڕه‌نگ</string>
-  <string name="camera_menu_effects_label">کاریگه‌رییه‌کان</string>
   <string name="camera_menu_asd_label">دیمه‌نی به‌هێز</string>
   <string name="pref_camera_power_shutter_title">هێزی وێنه‌ گیره‌ر</string>
   <string name="pref_superzoom_title">زه‌ڕه‌بین</string>
diff --git a/res/values-ku/qcomstrings.xml b/res/values-ku/qcomstrings.xml
index 2f660f0ec..33740166f 100644
--- a/res/values-ku/qcomstrings.xml
+++ b/res/values-ku/qcomstrings.xml
@@ -24,28 +24,21 @@
   <string name="pref_camera_powermode_title">باری هێز</string>
   <string name="pref_camera_powermode_entry_lp">هێزی نزم</string>
   <string name="pref_camera_powermode_entry_np">هێزی مامناوه‌ند</string>
-  <string name="pref_camera_autoexposure_title">خۆکارانه‌ ڕووناکی دان</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">تێكڕای چوارچێوه‌</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">پانی ناوه‌ڕاست</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">مه‌ترکردنی نیشانه‌</string>
   <string name="pref_camera_videoencoder_title">لێده‌ری ڤیدیۆ</string>
-  <string name="pref_camera_videoencoder_dialogtitle">لێده‌ری ڤیدیۆ</string>
   <string name="pref_camera_audioencoder_title">لێده‌ری ده‌نگ</string>
   <string name="pref_camera_video_duration_title">ماوه‌ی ڤیدیۆ</string>
   <string name="pref_camera_video_duration_entry_mms">30 چرکه‌ (ئێم ئێم ئیس)</string>
   <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_zsl_title">گیره‌ری سفر</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_zsl_entry_off">ناچالاکردن</string>
-  <string name="pref_camera_zsl_entry_on">چالاکردن</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>
@@ -53,27 +46,18 @@
   <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="error_app_unsupported_raw">وێنه‌ی RAW و جۆره‌که‌ی کارناکات له‌ باری ZSL دا</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR کارناکات له‌ باری ZSL دا</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">که‌وانه‌ی AE</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="err_app_unsupport_ae_bracket_code">که‌وانه‌ی AE کارناکات</string>
-  <string name="snapshot_lower_than_video">ماوه‌ی ڤیدیۆکه‌ زۆرتره‌ تا قه‌باره‌ی ڤیدیۆکه‌ ، سه‌رگرتنی قه‌باره‌ی ڤیدیۆکه‌ ، تکایه‌ کوالێتییه‌کی زیاتر یان یه‌کسان هه‌ڵبژێره‌ به‌ قه‌باره‌که‌.</string>
-  <string name="snapshotsize_low_powermode">گۆڕینی قه‌باره‌ی وێنه‌که‌ کارناکات له‌باری هێزی که‌مدا ، ڤیدیۆ و قه‌باره‌ و ماوه‌ ده‌گیرێت ، تکایه‌ هێزێکی ئاسایی هه‌ڵبژێره‌ بۆ گۆڕینی قه‌باره‌ی وێنه‌.</string>
-  <string name="snapshot_qcif_and_d1">ته‌نیا گۆڕینی ڤیدیۆ کارده‌کات بۆ ئه‌م کوالێتییه‌.</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>
@@ -108,7 +92,6 @@
   <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>
@@ -155,14 +138,7 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">ئاسایی</string>
-  <string name="pref_camera_focusmode_entry_continuous">به‌رده‌وامبوونه‌کان</string>
   <string name="pref_camera_scenedetect_title">خۆکارانه‌ دۆزینه‌وه‌ی دیمه‌ن</string>
-  <string name="pref_camera_scenedetect_entry_off">ناچالاکردن</string>
   <string name="pref_camera_scenedetect_entry_on">چالاکردن</string>
-  <string name="time_lapse_error">قه‌باره‌ی ڤیدیۆ هه‌ڵه‌یه‌ بۆ کاتی تۆمارکردن.</string>
+  <string name="pref_camera_scenedetect_entry_off">ناچالاکردن</string>
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index cf4a651a0..85b8c9041 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">GERINTI</string>
   <string name="camera_menu_slow_shutter_label">ILGAS IŠLAIKYMAS</string>
   <string name="camera_menu_beauty_mode_label">PAGRAŽINTI</string>
-  <string name="camera_menu_colorize_label">SPALVINTI</string>
-  <string name="camera_menu_effects_label">EFEKTAI</string>
   <string name="camera_menu_asd_label">SUMANI SCENA</string>
   <string name="pref_camera_power_shutter_title">Fotografavimo mygtukas</string>
   <string name="pref_superzoom_title">Padidinti</string>
diff --git a/res/values-lt/qcomstrings.xml b/res/values-lt/qcomstrings.xml
index 18f3f567d..dff70fcd4 100644
--- a/res/values-lt/qcomstrings.xml
+++ b/res/values-lt/qcomstrings.xml
@@ -24,12 +24,11 @@
   <string name="pref_camera_powermode_title">Energijos režimas</string>
   <string name="pref_camera_powermode_entry_lp">Energijos taupymas</string>
   <string name="pref_camera_powermode_entry_np">Normalus</string>
-  <string name="pref_camera_autoexposure_title">Autom. eksponavimo būdas</string>
+  <string name="pref_camera_autoexposure_title">Automatinis išlaikymas</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Vidutinis rėmas</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Centruotas</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Taškinis matavimas</string>
   <string name="pref_camera_videoencoder_title">Vaizdo iškodavimas</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Vaizdo iškodavimas</string>
   <string name="pref_camera_audioencoder_title">Garso iškodavimas</string>
   <string name="pref_camera_video_duration_title">Vaizdo trukmė</string>
   <string name="pref_camera_video_duration_entry_mms">30 sek. (MMS)</string>
@@ -38,14 +37,11 @@
   <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_zsl_title">Nulinis fotografavimo užlaikymas (ZSL)</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_zsl_entry_off">Įšjungtas</string>
-  <string name="pref_camera_zsl_entry_on">Įjungtas</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>
@@ -58,22 +54,16 @@
   <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="error_app_unsupported_raw">Neapdorotas nuotraukos formatas yra nepalaikomas (HFR) režime</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR yra nepalaikomas (ZSL) režime</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AI - Korekcija</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="err_app_unsupport_ae_bracket_code">AI - Korekcija nepalaikoma</string>
-  <string name="snapshot_lower_than_video">Vaizdo fotografijos dydis yra mažesnis už vaizdo dydį. Prašome pasirinkti rezoliuciją didesnę arba lygią, dabartiniam vaizdo dydžiui.</string>
-  <string name="snapshotsize_low_powermode">Nuotraukos dydžio keitimas nepalaikomas energijos taupymo režime. Vaizdo dydžio fotografija bus užfiksuota. Prašome pasirinkti normalų energijos režimą norėdami pakeisti nuotraukos dydį.</string>
-  <string name="snapshot_qcif_and_d1">Tik vaizdo dydžio fotografija yra palaikoma su šia rezoliucija.</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žinimo režimas</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>
@@ -108,7 +98,7 @@
   <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">Skaitm. vaizdo stabil.</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>
@@ -157,12 +147,7 @@
   <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_picturesize_entry_1920x1080">HD 1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">HD 720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normalus</string>
-  <string name="pref_camera_focusmode_entry_continuous">Nuolatinis</string>
   <string name="pref_camera_scenedetect_title">Automatinis scenos aptikimas</string>
-  <string name="pref_camera_scenedetect_entry_off">Įšjungtas</string>
   <string name="pref_camera_scenedetect_entry_on">Įjungtas</string>
-  <string name="time_lapse_error">Neteisingas vaizdo dydis įrašymui laiko intervalu.</string>
+  <string name="pref_camera_scenedetect_entry_off">Įšjungtas</string>
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 5fef0bbc5..310b18bd4 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">FORBEDRE</string>
   <string name="camera_menu_slow_shutter_label">LANGSOM LUKKER</string>
   <string name="camera_menu_beauty_mode_label">FORSKJØNNE</string>
-  <string name="camera_menu_colorize_label">FARGELEGGE</string>
-  <string name="camera_menu_effects_label">EFFEKTER</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_superzoom_title">Forstørre</string>
diff --git a/res/values-nb/qcomstrings.xml b/res/values-nb/qcomstrings.xml
index 692768af8..ed919e8a3 100644
--- a/res/values-nb/qcomstrings.xml
+++ b/res/values-nb/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Strømmodus</string>
   <string name="pref_camera_powermode_entry_lp">Lavt strømforbruk</string>
   <string name="pref_camera_powermode_entry_np">Vanlig strømforbruk</string>
-  <string name="pref_camera_autoexposure_title">Auto eksponeringsmodus</string>
+  <string name="pref_camera_autoexposure_title">Automatisk eksponering</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Ramme gjennomsnitt</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Sentermålt</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Punktmåling</string>
   <string name="pref_camera_videoencoder_title">Videokodek</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Videokodek</string>
   <string name="pref_camera_audioencoder_title">Lydkodek</string>
   <string name="pref_camera_video_duration_title">Video varighet</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekunder (MMS)</string>
   <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">Aktiver</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Deaktiver</string>
-  <string name="pref_camera_zsl_title">Null lukkerforsinkelse (ZSL)</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_zsl_entry_off">Av</string>
-  <string name="pref_camera_zsl_entry_on">På</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>
@@ -53,27 +49,21 @@
   <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">Aktiver</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Deaktiver</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">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_raw">RAW bildeformatet støttes ikke i ZSL-modus</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR støttes ikke i ZSL-modus</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-brakett</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="err_app_unsupport_ae_bracket_code">AE Bracketing støttes ikke ennå</string>
-  <string name="snapshot_lower_than_video">Stillbilde størrelsen er lavere enn bildestørrelsen, capper til bildestørrelsen. Velg en oppløsning høyere eller lik for den gjeldende bildestørrelsen.</string>
-  <string name="snapshotsize_low_powermode">Endre bildestørrelse støttes ikke i lavt strømforbruk, video størrelse bilde vil bli tatt. Velg Normal strømmodus for å tillate å endre bildestørrelse.</string>
-  <string name="snapshot_qcif_and_d1">Bare bildestørrelsen til videoen støttes for denne oppløsningen.</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">Wavelet Denoise modus</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>
@@ -108,7 +98,7 @@
   <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">Digital bildestabilisator</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>
@@ -155,14 +145,9 @@
   <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">Aktiver</string>
-  <string name="pref_camera_histogram_entry_disable">Deaktiver</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Kontinuerlig</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_off">Av</string>
   <string name="pref_camera_scenedetect_entry_on">På</string>
-  <string name="time_lapse_error">Ugyldig video-størrelse for time-lapse innspillingen.</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 c53ce007a..71e4ed1b3 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">VERBETEREN</string>
   <string name="camera_menu_slow_shutter_label">TRAGE SLUITER</string>
   <string name="camera_menu_beauty_mode_label">VERFRAAIEN</string>
-  <string name="camera_menu_colorize_label">KLEUREFFECT</string>
-  <string name="camera_menu_effects_label">EFFECTEN</string>
   <string name="camera_menu_asd_label">AUTO-SCÈNE</string>
   <string name="pref_camera_power_shutter_title">Aan/uit-knop</string>
   <string name="pref_superzoom_title">Superzoom</string>
diff --git a/res/values-nl/qcomstrings.xml b/res/values-nl/qcomstrings.xml
index 3cd76b6b6..a3d5e20e4 100644
--- a/res/values-nl/qcomstrings.xml
+++ b/res/values-nl/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Energieverbruik</string>
   <string name="pref_camera_powermode_entry_lp">Laag</string>
   <string name="pref_camera_powermode_entry_np">Normaal</string>
-  <string name="pref_camera_autoexposure_title">Automatische belichtingsstand</string>
+  <string name="pref_camera_autoexposure_title">Automatische belichting</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Beeldgemiddelde</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Centrum gewogen</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Spotmeting</string>
   <string name="pref_camera_videoencoder_title">Videocodec</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Videocodec</string>
   <string name="pref_camera_audioencoder_title">Audiocodec</string>
   <string name="pref_camera_video_duration_title">Lengte video</string>
   <string name="pref_camera_video_duration_entry_mms">30 seconden (mms)</string>
   <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">Inschakelen</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Uitschakelen</string>
-  <string name="pref_camera_zsl_title">Geen sluitervertraging (ZSL)</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_zsl_entry_off">Uit</string>
-  <string name="pref_camera_zsl_entry_on">Aan</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>
@@ -53,21 +49,15 @@
   <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">Inschakelen</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Uitschakelen</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="error_app_unsupported_raw">Raw-formaat niet ondersteund bij ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR niet ondersteund bij ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AEB-opname</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="err_app_unsupport_ae_bracket_code">AEB-opname wordt momenteel niet ondersteund door apps</string>
-  <string name="snapshot_lower_than_video">Resolutie momentopname is kleiner dan die van de video. Momentopname wordt gemaakt ter grootte van de video. Kies een hogere of gelijke resolutie als de huidige videoresolutie.</string>
-  <string name="snapshotsize_low_powermode">Resolutie wordt niet ondersteund in laag-energieverbruik-stand. Momentopname wordt gemaakt ter grootte van de video. Kies normaal-energieverbruik-stand voor deze resolutie.</string>
-  <string name="snapshot_qcif_and_d1">Alleen momentopname ter grootte van de video ondersteund voor deze resolutie.</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>
@@ -157,12 +147,7 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normaal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Continu</string>
   <string name="pref_camera_scenedetect_title">Automatische scènedetectie</string>
-  <string name="pref_camera_scenedetect_entry_off">Uit</string>
   <string name="pref_camera_scenedetect_entry_on">Aan</string>
-  <string name="time_lapse_error">Ongeldige videoresolutie voor time-lapse.</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 28451b43b..9a1831553 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">POPRAWKI</string>
   <string name="camera_menu_slow_shutter_label">SPOWOLNIENIE MIGAWKI</string>
   <string name="camera_menu_beauty_mode_label">UPIĘKSZANIE</string>
-  <string name="camera_menu_colorize_label">KOLOROWANIE</string>
-  <string name="camera_menu_effects_label">EFEKTY</string>
   <string name="camera_menu_asd_label">ROZPOZNAWANIE SCENY</string>
   <string name="pref_camera_power_shutter_title">Migawka przyciskiem zasilania</string>
   <string name="pref_superzoom_title">Powiększenie</string>
diff --git a/res/values-pl/qcomstrings.xml b/res/values-pl/qcomstrings.xml
index 6911dccff..5af19868e 100644
--- a/res/values-pl/qcomstrings.xml
+++ b/res/values-pl/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Tryb mocy</string>
   <string name="pref_camera_powermode_entry_lp">Mała moc</string>
   <string name="pref_camera_powermode_entry_np">Normalna moc</string>
-  <string name="pref_camera_autoexposure_title">Tryb automatycznej ekspozycji</string>
+  <string name="pref_camera_autoexposure_title">Automatyczna ekspozycja</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Średnia ramki</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Centralnie ważony</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Pomiar punktowy</string>
   <string name="pref_camera_videoencoder_title">Kodek wideo</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Kodek wideo</string>
   <string name="pref_camera_audioencoder_title">Kodek audio</string>
   <string name="pref_camera_video_duration_title">Czas trwania video</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekund (MMS)</string>
   <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łącz</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Wyłącz</string>
-  <string name="pref_camera_zsl_title">Bez opóźnienia migawki (ZSL)</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_zsl_entry_off">Wył.</string>
-  <string name="pref_camera_zsl_entry_on">Wł.</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>
@@ -53,27 +49,21 @@
   <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łącz</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Wyłącz</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="error_app_unsupported_raw">Format RAW nie jest wspierany w trybie ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR nie jest wspierane w trybie ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-wspornik</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="err_app_unsupport_ae_bracket_code">AE Bracketing nie jest jeszcze wspierany</string>
-  <string name="snapshot_lower_than_video">Rozmiar zrzutu jest mniejszy niż rozmiar wideo. Proszę ustawić rozdzielczość większą bądź równą aktualnej wielkości wideo.</string>
-  <string name="snapshotsize_low_powermode">Zmiana rozmiaru obrazka w trybie małej mocy nie jest wspierana, zrzut o wielkości wideo zostanie wykonany. By zmienić rozmiar obrazka proszę wybrać tryb normalnej mocy.</string>
-  <string name="snapshot_qcif_and_d1">Tylko zrzut wideo jest wspierany dla tej rozdzielczości.</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">Tryb odszumiania wavelet</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>
@@ -108,7 +98,7 @@
   <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">Cyfrowa stabilizacja obrazu</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>
@@ -155,14 +145,9 @@
   <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łącz</string>
-  <string name="pref_camera_histogram_entry_disable">Wyłącz</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normalny</string>
-  <string name="pref_camera_focusmode_entry_continuous">Ciągły</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_off">Wył.</string>
   <string name="pref_camera_scenedetect_entry_on">Wł.</string>
-  <string name="time_lapse_error">Zły rozmiar wideo dla trybu time-lapse.</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 7ef85d39a..d8ce6b2d0 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">REALÇAR</string>
   <string name="camera_menu_slow_shutter_label">DISPARADOR LENTO</string>
   <string name="camera_menu_beauty_mode_label">EMBELEZAR</string>
-  <string name="camera_menu_colorize_label">COLORIZAR</string>
-  <string name="camera_menu_effects_label">EFEITOS</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_superzoom_title">Ampliar</string>
diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml
index 52690441c..0988d3263 100644
--- a/res/values-pt-rBR/qcomstrings.xml
+++ b/res/values-pt-rBR/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Modo de Energia</string>
   <string name="pref_camera_powermode_entry_lp">Baixar energia</string>
   <string name="pref_camera_powermode_entry_np">Energia normal</string>
-  <string name="pref_camera_autoexposure_title">Modo de auto-exposição</string>
+  <string name="pref_camera_autoexposure_title">Exposição automática</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Média de frames</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada central</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Medição de lugar</string>
   <string name="pref_camera_videoencoder_title">Codec de vídeo</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Codec de vídeo</string>
   <string name="pref_camera_audioencoder_title">Codec de áudio</string>
   <string name="pref_camera_video_duration_title">Duração do vídeo</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 da pele</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Permitir</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desativar</string>
-  <string name="pref_camera_zsl_title">Sem atraso do obturador (ZSL)</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_zsl_entry_off">Desligar</string>
-  <string name="pref_camera_zsl_entry_on">Ligar</string>
   <string name="pref_camera_video_hdr_entry_off">Desligar</string>
   <string name="pref_camera_video_hdr_entry_on">Ligar</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
@@ -53,27 +49,21 @@
   <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">Permitir</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desativar</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">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_raw">Formato RAW não é suportado no modo ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR não é suportado no modo ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</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="err_app_unsupport_ae_bracket_code">Bracketing de auto-exposição ainda não é suportado</string>
-  <string name="snapshot_lower_than_video">Tamanho da captura do vídeo é menor que o tamanho do vídeo, sendo aumentado para o tamanho do vídeo. Por favor selecione uma resolução maior ou igual que o tamanho do vídeo atual.</string>
-  <string name="snapshotsize_low_powermode">Mudando o tamanho da imagem não é suportado no modo de pouca energia, capturas do tamanho do vídeo serão usadas. Por favor selecione o modo de energia normal para permitir mudar o tamanho da imagem.</string>
-  <string name="snapshot_qcif_and_d1">Só capturas do tamanho do vídeo são permitidas nessa resolução.</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">Modo Wavelet Denoise</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>
@@ -108,7 +98,7 @@
   <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 Digital</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>
@@ -155,14 +145,9 @@
   <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">Permitir</string>
-  <string name="pref_camera_histogram_entry_disable">Desativar</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Contínuo</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_off">Desligar</string>
   <string name="pref_camera_scenedetect_entry_on">Ligar</string>
-  <string name="time_lapse_error">Tamanho de vídeo inválido para gravação em time-lapse.</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 6677fc2eb..75e7bb358 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">MELHORAR</string>
   <string name="camera_menu_slow_shutter_label">DISPARO LENTO</string>
   <string name="camera_menu_beauty_mode_label">EMBELEZAR</string>
-  <string name="camera_menu_colorize_label">COLORIR</string>
-  <string name="camera_menu_effects_label">EFEITOS</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_superzoom_title">Ampliar</string>
diff --git a/res/values-pt-rPT/qcomstrings.xml b/res/values-pt-rPT/qcomstrings.xml
index 0dd86b63d..668e9b7ec 100644
--- a/res/values-pt-rPT/qcomstrings.xml
+++ b/res/values-pt-rPT/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Modo de energia</string>
   <string name="pref_camera_powermode_entry_lp">Baixo consumo de energia</string>
   <string name="pref_camera_powermode_entry_np">Energia normal</string>
-  <string name="pref_camera_autoexposure_title">Modo de Exposição Automática</string>
+  <string name="pref_camera_autoexposure_title">Exposição automática</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Média de Frames</string>
   <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_videoencoder_dialogtitle">Codec de vídeo</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">Ativar</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desativar</string>
-  <string name="pref_camera_zsl_title">Disparo imediato (ZSL)</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_zsl_entry_off">Desligado</string>
-  <string name="pref_camera_zsl_entry_on">Ligado</string>
   <string name="pref_camera_video_hdr_entry_off">Desligado</string>
   <string name="pref_camera_video_hdr_entry_on">Ligado</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
@@ -53,27 +49,21 @@
   <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">Ativar</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desativar</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">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_raw">O formato de imagem RAW não é suportado no modo ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR não é suportado no modo ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Bracket AE</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="err_app_unsupport_ae_bracket_code">Escalonamento AE ainda não é suportado</string>
-  <string name="snapshot_lower_than_video">O tamanho de captura de imagem de vídeo é menor que o tamanho do vídeo, limitado ao tamanho do vídeo. Por favor escolha uma resolução maior ou igual ao tamanho de vídeo atual.</string>
-  <string name="snapshotsize_low_powermode">Alterar o tamanho da imagem não é suportado no modo de baixa energia, uma captura do tamanho do vídeo será tirada. Escolha o modo de energia normal para alterar o tamanho da imagem.</string>
-  <string name="snapshot_qcif_and_d1">Apenas são suportadas capturas do tamanho do vídeo para esta resolução.</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">Modo Wavelet Denoise</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>
@@ -108,7 +98,7 @@
   <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 Digital de Imagem</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>
@@ -155,14 +145,9 @@
   <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">Ativar</string>
-  <string name="pref_camera_histogram_entry_disable">Desativar</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Contínuo</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_off">Desligado</string>
   <string name="pref_camera_scenedetect_entry_on">Ligado</string>
-  <string name="time_lapse_error">Tamanho de vídeo inválido para gravação time-lapse.</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 e74a41461..9392bfd1d 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">INTENSIFICĂ</string>
   <string name="camera_menu_slow_shutter_label">DECLANȘARE LENTĂ</string>
   <string name="camera_menu_beauty_mode_label">ÎNFRUMUSEȚARE</string>
-  <string name="camera_menu_colorize_label">COLORARE</string>
-  <string name="camera_menu_effects_label">EFECTE</string>
   <string name="camera_menu_asd_label">SCENĂ INTELIGENTĂ</string>
   <string name="pref_camera_power_shutter_title">Obturator de putere</string>
   <string name="pref_superzoom_title">Mareste</string>
diff --git a/res/values-ro/qcomstrings.xml b/res/values-ro/qcomstrings.xml
index 754544bd7..69fd42ca6 100644
--- a/res/values-ro/qcomstrings.xml
+++ b/res/values-ro/qcomstrings.xml
@@ -24,28 +24,21 @@
   <string name="pref_camera_powermode_title">Modul de putere</string>
   <string name="pref_camera_powermode_entry_lp">Energie redusă</string>
   <string name="pref_camera_powermode_entry_np">Energie normală</string>
-  <string name="pref_camera_autoexposure_title">Modul de Auto Expunere</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Media cadrului</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Greutate centrată</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
   <string name="pref_camera_videoencoder_title">Codec video</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Codec video</string>
   <string name="pref_camera_audioencoder_title">Codec audio</string>
   <string name="pref_camera_video_duration_title">Durată video</string>
   <string name="pref_camera_video_duration_entry_mms">30 de secunde (MMS)</string>
   <string name="pref_camera_video_duration_entry_10">10 minute</string>
   <string name="pref_camera_video_duration_entry_30">30 de minute</string>
   <string name="pref_camera_skinToneEnhancement_title">Intensificare ton piele</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Activare</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Dezactivare</string>
-  <string name="pref_camera_zsl_title">Zero Shutter Lag (ZSL)</string>
   <string name="pref_camera_selectablezoneaf_title">Zona de autofocus</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <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_zsl_entry_off">Dezactivat</string>
-  <string name="pref_camera_zsl_entry_on">Activat</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>
@@ -53,27 +46,18 @@
   <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="pref_camera_redeyereduction_entry_enable">Activare</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Dezactivare</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="error_app_unsupported_raw">Formatul raw al imaginii nu este acceptat în modul ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR nu este acceptat în modul ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</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="err_app_unsupport_ae_bracket_code">AE Bracketing nu este acceptat momentan</string>
-  <string name="snapshot_lower_than_video">Rezoluția pentru un instantaneu video este mai mică ca rezoluția video, acoperă rezoluția video. Vă rugăm să selectați o rezoluție mai ridicată sau egală cu rezoluția curentă a materialului video.</string>
-  <string name="snapshotsize_low_powermode">Schimbarea rezoluției imaginii nu este acceptată în modul de Energie Redusă, se poate totuși face instantaneu video. Vă rugăm să selectați modul Energie Normală pentru a putea schimba rezoluția imaginii.</string>
-  <string name="snapshot_qcif_and_d1">Doar instantaneul video este acceptat la această rezoluție.</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_title">Modul Wavelet Denoise</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>
@@ -108,7 +92,6 @@
   <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_title">Stabilizare digitală a Imaginii</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>
@@ -155,14 +138,7 @@
   <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">Activare</string>
-  <string name="pref_camera_histogram_entry_disable">Dezactivare</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Continuu</string>
   <string name="pref_camera_scenedetect_title">Detectare automată a scenei</string>
-  <string name="pref_camera_scenedetect_entry_off">Dezactivat</string>
   <string name="pref_camera_scenedetect_entry_on">Activat</string>
-  <string name="time_lapse_error">Dimensiune video nevalidă pentru înregistrarea tip interval-de-timp.</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 b6390f2ab..1b73c765b 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">УЛУЧШЕНИЕ</string>
   <string name="camera_menu_slow_shutter_label">ДЛИТ. ВЫДЕРЖКА</string>
   <string name="camera_menu_beauty_mode_label">АВТОУЛУЧШЕНИЕ</string>
-  <string name="camera_menu_colorize_label">ОКРАСКА</string>
-  <string name="camera_menu_effects_label">ЭФФЕКТЫ</string>
   <string name="camera_menu_asd_label">РАСПОЗН. УСЛОВИЙ СЪЕМКИ</string>
   <string name="pref_camera_power_shutter_title">Съёмка кн. питания</string>
   <string name="pref_superzoom_title">Увеличение</string>
diff --git a/res/values-ru/qcomstrings.xml b/res/values-ru/qcomstrings.xml
index 66d75dc5a..590330b7c 100644
--- a/res/values-ru/qcomstrings.xml
+++ b/res/values-ru/qcomstrings.xml
@@ -24,12 +24,11 @@
   <string name="pref_camera_powermode_title">Энергопотребление</string>
   <string name="pref_camera_powermode_entry_lp">Пониженное</string>
   <string name="pref_camera_powermode_entry_np">Обычное</string>
-  <string name="pref_camera_autoexposure_title">Экспозамер</string>
+  <string name="pref_camera_autoexposure_title">Автоэкспозиция</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Усреднённый</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">По центру кадра</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Точечный</string>
   <string name="pref_camera_videoencoder_title">Видеокодек</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Видеокодек</string>
   <string name="pref_camera_audioencoder_title">Аудиокодек</string>
   <string name="pref_camera_video_duration_title">Длительность видео</string>
   <string name="pref_camera_video_duration_entry_mms">30 секунд (для MMS)</string>
@@ -38,14 +37,11 @@
   <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_zsl_title">Технология ZSL</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_zsl_entry_off">Выкл.</string>
-  <string name="pref_camera_zsl_entry_on">Вкл.</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>
@@ -58,16 +54,10 @@
   <string name="error_app_unsupported_hfr">Ускоренная съёмка не поддерживается для текущего разрешения</string>
   <string name="error_app_unsupported_hfr_codec">Ускоренная съёмка возможна только с видеокодеком H264</string>
   <string name="error_app_unsupported">Видеокодек не поддерживает выбранное разрешение</string>
-  <string name="error_app_unsupported_raw">Съёмка в формате RAW не поддерживается при включённом ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">Режим HDR не поддерживается при включённом ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Автобрекетинг</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="err_app_unsupport_ae_bracket_code">Автобрекетинг не поддерживается</string>
-  <string name="snapshot_lower_than_video">Разрешение фотоснимка меньше, чем разрешение видеосъёмки. Выберите разрешение выше или равное разрешению видеосъёмки.</string>
-  <string name="snapshotsize_low_powermode">Изменение разрешения изображения невозможно в режиме пониженного энергопотребления. Переключитесь в режим обычного энергопотребления для использования этой функции.</string>
-  <string name="snapshot_qcif_and_d1">Для этого разрешения поддерживается только снимок с текущим разрешением видеосъёмки.</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>
@@ -157,12 +147,7 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">По умолчанию</string>
-  <string name="pref_camera_focusmode_entry_continuous">Непрерывный</string>
   <string name="pref_camera_scenedetect_title">Распозн. условий съёмки</string>
-  <string name="pref_camera_scenedetect_entry_off">Выкл.</string>
   <string name="pref_camera_scenedetect_entry_on">Вкл.</string>
-  <string name="time_lapse_error">Неверное разрешение видео для замедленной съёмки.</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 121144c8f..c5bea1073 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">උසස් කරන්න</string>
   <string name="camera_menu_slow_shutter_label">ප්‍රමාදී ශටරය</string>
   <string name="camera_menu_beauty_mode_label">ලස්සණ කිරීම</string>
-  <string name="camera_menu_colorize_label">පැහැගැන්වීම</string>
-  <string name="camera_menu_effects_label">ප්‍රතිවිපාක</string>
   <string name="camera_menu_asd_label">දැකුම්කලු දර්ශනය</string>
   <string name="pref_camera_power_shutter_title">බල ශටරය</string>
   <string name="pref_superzoom_title">විශාලනය කරන්න</string>
diff --git a/res/values-si/qcomstrings.xml b/res/values-si/qcomstrings.xml
index 80dc8cebe..aaabc35f8 100644
--- a/res/values-si/qcomstrings.xml
+++ b/res/values-si/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">බල ප්‍රකාරය</string>
   <string name="pref_camera_powermode_entry_lp">අවම බලය</string>
   <string name="pref_camera_powermode_entry_np">සාමාන්‍ය බලය</string>
-  <string name="pref_camera_autoexposure_title">ස්වයං නිරාවරණ ප්‍රකාරය</string>
+  <string name="pref_camera_autoexposure_title">ස්වයං නිරාවරණය</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">රාමු සාමාන්‍යය</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">මධ්‍ය භරිත</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">තැන මානනය</string>
   <string name="pref_camera_videoencoder_title">වීඩියෝ කොඩෙක්</string>
-  <string name="pref_camera_videoencoder_dialogtitle">වීඩියෝ කොඩෙක්</string>
   <string name="pref_camera_audioencoder_title">ශ්‍රව්‍ය කොඩෙක්</string>
   <string name="pref_camera_video_duration_title">වීඩියෝ පැවතුම් කාලය</string>
   <string name="pref_camera_video_duration_entry_mms">තත්පර 30 (MMS)</string>
   <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_zsl_title">ශුන්‍ය ශටර පමාව (ZSL)</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_zsl_entry_off">අක්‍රීයයි</string>
-  <string name="pref_camera_zsl_entry_on">සක්‍රීයයි</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>
@@ -53,27 +49,21 @@
   <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="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="error_app_unsupported_raw">ZSL ප්‍රකාරයේදී දළ සේයා ආකෘතිය සහාය නොදක්වයි</string>
-  <string name="error_app_unsupported_hdr_zsl">ZSL ප්‍රකාරයේදී HDR සහාය නොදක්වයි</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">ස්වයංක්‍රීය නිරාවරණ</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="err_app_unsupport_ae_bracket_code">ස්වයංක්‍රීය නිරාවරණ සවිකිරීම තවම සහාය නොදක්වයි</string>
-  <string name="snapshot_lower_than_video">වීඩියෝ සැණ රුවේ තරම වීඩියෝවේ තරමට වඩා කුඩාය, වීඩියෝවේ තරමට වැසේ. කරුණාකර පවත්නා වීඩියෝවේ තරමට සමාන හෝ ඉහළ විභේදනයක් තෝරන්න.</string>
-  <string name="snapshotsize_low_powermode">අවම බල ප්‍රකාරයේදී සේයාවේ තරම වෙනස්කිරීම සහාය නොදක්වයි, වීඩියෝවේ තරමේ සැණ රුවක් ගනු ඇත. කරුණාකර සේයාවේ තරම වෙනස්කිරීම සඳහා අවසර දීමට සාමාන්‍ය බල ප්‍රකාරය තෝරන්න.</string>
-  <string name="snapshot_qcif_and_d1">මෙම විභේදනය සඳහා වීඩියෝවේ තරමේ සැණ රූ පමණක් සහාය දක්වයි.</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_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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -155,14 +145,9 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">සාමාන්‍ය</string>
-  <string name="pref_camera_focusmode_entry_continuous">අඛණ්ඩ</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_off">අක්‍රීයයි</string>
   <string name="pref_camera_scenedetect_entry_on">සක්‍රීයයි</string>
-  <string name="time_lapse_error">වේලා-දෝෂ රෙකෝඩනය සඳහා අවලංගු වීඩියෝ-තරමකි.</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 39ce96b16..cc3515d07 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">VYLEPŠENIE</string>
   <string name="camera_menu_slow_shutter_label">POMALÁ UZÁVIERKA</string>
   <string name="camera_menu_beauty_mode_label">SKRÁŠLENIE</string>
-  <string name="camera_menu_colorize_label">VYFARBENIE</string>
-  <string name="camera_menu_effects_label">EFEKTY</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_superzoom_title">Zväčšenie</string>
diff --git a/res/values-sk/qcomstrings.xml b/res/values-sk/qcomstrings.xml
index 607d277e0..0a39c6da3 100644
--- a/res/values-sk/qcomstrings.xml
+++ b/res/values-sk/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Režim výkonu</string>
   <string name="pref_camera_powermode_entry_lp">Nízky výkon</string>
   <string name="pref_camera_powermode_entry_np">Normálny výkon</string>
-  <string name="pref_camera_autoexposure_title">Režim automatickej expozície</string>
+  <string name="pref_camera_autoexposure_title">Automatická expozícia</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Priemer rámu</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Na stred</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Bodové meranie</string>
   <string name="pref_camera_videoencoder_title">Kodek videa</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Kódek videa</string>
   <string name="pref_camera_audioencoder_title">Kodek zvuku</string>
   <string name="pref_camera_video_duration_title">Dĺžka videa</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekúnd (MMS)</string>
   <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">Povoliť</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Zakázať</string>
-  <string name="pref_camera_zsl_title">Nulové oneskorenie uzávierky (ZSL)</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_zsl_entry_off">Vypnuté</string>
-  <string name="pref_camera_zsl_entry_on">Zap.</string>
   <string name="pref_camera_video_hdr_entry_off">Vypnuté</string>
   <string name="pref_camera_video_hdr_entry_on">Zap.</string>
   <string name="pref_camera_video_hdr_title">HDR video</string>
@@ -53,27 +49,21 @@
   <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">Povoliť</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Zakázať</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">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_raw">Formát obrázkov RAW nie je podporovaný v režime ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR nie je podporované v režime ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Autobracketing</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="err_app_unsupport_ae_bracket_code">Automatické posúvanie expozície nie je zatiaľ podporované</string>
-  <string name="snapshot_lower_than_video">Veľkosť momentky videa je nižšia ako veľkosť videa, uzatvorená do veľkosti videa. Prosím, vyberte rozlíšenie vyššie alebo rovnajúce sa aktuálnej veľkosti videa.</string>
-  <string name="snapshotsize_low_powermode">Zmena veľkosti obrázku nie je podporovaná v režime nízkeho výkonu, momentka videa bude zachytená. Prosím, vyberte režim normálneho výkonu pre zmenu veľkosti obrázku.</string>
-  <string name="snapshot_qcif_and_d1">Mometka videa je iba podporovaná pre toto rozlíšenie.</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">Režim odšumovania vlniek</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>
@@ -108,7 +98,7 @@
   <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">Digitálna stabilizácia obrazu</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>
@@ -155,14 +145,9 @@
   <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">Povoliť</string>
-  <string name="pref_camera_histogram_entry_disable">Zakázať</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normálne</string>
-  <string name="pref_camera_focusmode_entry_continuous">Neustály</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_off">Vypnuté</string>
   <string name="pref_camera_scenedetect_entry_on">Zap.</string>
-  <string name="time_lapse_error">Neplatná veľkosť videa intervalového záznamu.</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 932152ac7..4fd00a9f1 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">ПОБОЉШАЊЕ</string>
   <string name="camera_menu_slow_shutter_label">СПОРИ ОКИДАЧ</string>
   <string name="camera_menu_beauty_mode_label">УЛЕПШАВАЊЕ</string>
-  <string name="camera_menu_colorize_label">ОБОЈЕНОСТ</string>
-  <string name="camera_menu_effects_label">ЕФЕКТИ</string>
   <string name="camera_menu_asd_label">ПАМЕТНА СЦЕНА</string>
   <string name="pref_camera_power_shutter_title">Алтернативни окидач</string>
   <string name="pref_superzoom_title">Увеличај</string>
diff --git a/res/values-sr/qcomstrings.xml b/res/values-sr/qcomstrings.xml
index e4ba16755..383aa3c8f 100644
--- a/res/values-sr/qcomstrings.xml
+++ b/res/values-sr/qcomstrings.xml
@@ -29,23 +29,19 @@
   <string name="pref_camera_autoexposure_entry_centerweighted">Притиснут центар</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Мерење места</string>
   <string name="pref_camera_videoencoder_title">Видео кодек</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Видео кодек</string>
   <string name="pref_camera_audioencoder_title">Аудио кодек</string>
   <string name="pref_camera_video_duration_title">Трајање видеа</string>
   <string name="pref_camera_video_duration_entry_mms">30 секунди (MMS)</string>
   <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_zsl_title">Успоравање окидача (ZSL)</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_zsl_entry_off">Искључено</string>
-  <string name="pref_camera_zsl_entry_on">Укључено</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>
@@ -53,27 +49,21 @@
   <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="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="error_app_unsupported_raw">Редни формат слике није подржан у ZSL режиму</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR није подржан у ZSL режиму</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-држач</string>
-  <string name="pref_camera_ae_bracket_hdr_title">Држање аутоматске експозитуре</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="err_app_unsupport_ae_bracket_code">Држање аутоматске експозитуре још увек није подржано </string>
-  <string name="snapshot_lower_than_video">Величина snapshot-а је мања од величине видеа, затварања у видео величини. Изабери резолуцију већу или једнаку тренутној видео величини.</string>
-  <string name="snapshotsize_low_powermode">Промена величине слике није подржана у режиму уштеде енергије, величина snapshot-а биће преузета. Молимо изабери Нормални режим да дозволиш промену величине слике.</string>
-  <string name="snapshot_qcif_and_d1">Само величина snapshot-а је подржана за ову резолуцију.</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_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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -155,14 +145,9 @@
   <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_picturesize_entry_1920x1080">1080p (Full HD)</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p (HD)</string>
-  <string name="pref_camera_focusmode_entry_normal">Нормално</string>
-  <string name="pref_camera_focusmode_entry_continuous">Непрекидно</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_off">Искључено</string>
   <string name="pref_camera_scenedetect_entry_on">Укључено</string>
-  <string name="time_lapse_error">Неважећа видео-величина за time-lapsе снимање.</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 2a71bde0c..3af0bbc0a 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">FÖRBÄTTRA</string>
   <string name="camera_menu_slow_shutter_label">LÅNGSAM SLUTARTID</string>
   <string name="camera_menu_beauty_mode_label">FÖRSKÖNA</string>
-  <string name="camera_menu_colorize_label">FÄRGLÄGG</string>
-  <string name="camera_menu_effects_label">EFFEKTER</string>
   <string name="camera_menu_asd_label">SMART SCEN</string>
   <string name="pref_camera_power_shutter_title">Påknapp som avtryckare</string>
   <string name="pref_superzoom_title">Förstora</string>
diff --git a/res/values-sv/qcomstrings.xml b/res/values-sv/qcomstrings.xml
index 2ac42d56c..114788540 100644
--- a/res/values-sv/qcomstrings.xml
+++ b/res/values-sv/qcomstrings.xml
@@ -24,28 +24,21 @@
   <string name="pref_camera_powermode_title">Energiläge</string>
   <string name="pref_camera_powermode_entry_lp">Lågenergi</string>
   <string name="pref_camera_powermode_entry_np">Normalenergi</string>
-  <string name="pref_camera_autoexposure_title">Automatisk exponering</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Bildgenomsnitt</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Mittvägd</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Punktmätning</string>
   <string name="pref_camera_videoencoder_title">Videokodek</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Videokodek</string>
   <string name="pref_camera_audioencoder_title">Ljudkodek</string>
   <string name="pref_camera_video_duration_title">Videolängd</string>
   <string name="pref_camera_video_duration_entry_mms">30 sekunder (MMS)</string>
   <string name="pref_camera_video_duration_entry_10">10 minuter</string>
   <string name="pref_camera_video_duration_entry_30">30 minuter</string>
   <string name="pref_camera_skinToneEnhancement_title">Hudfärgsförstärkning</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Aktivera</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Inaktivera</string>
-  <string name="pref_camera_zsl_title">Ingen slutarfördröjning (ZSL)</string>
   <string name="pref_camera_selectablezoneaf_title">Autofokuszon</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <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_zsl_entry_off">Av</string>
-  <string name="pref_camera_zsl_entry_on">På</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>
@@ -53,27 +46,18 @@
   <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="pref_camera_redeyereduction_entry_enable">Aktivera</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Inaktivera</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="error_app_unsupported_raw">RAW-formatet går inte att använda i ZSL-läge</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR fungerar inte i ZSL-läge</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracketing</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="err_app_unsupport_ae_bracket_code">AE Bracketing fungerar inte än</string>
-  <string name="snapshot_lower_than_video">Storleken på videostillbilden är mindre än videostorleken, med tak vid videostorlek. Var god välj en upplösning som är högre eller lika med nuvarande videostorlek.</string>
-  <string name="snapshotsize_low_powermode">Byte av bildstorlek fungerar inte med lågenergiläge, en videostillbild kommer att tas. Var god välj normalenergiläge för att tillåta byte av bildstorlek.</string>
-  <string name="snapshot_qcif_and_d1">Endast stillbilder med videostorlek fungerar med denna upplösning.</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">Wavelet Denoise-läge</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>
@@ -108,7 +92,6 @@
   <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">Digital bildstabilisering</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>
@@ -155,14 +138,7 @@
   <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">Aktivera</string>
-  <string name="pref_camera_histogram_entry_disable">Inaktivera</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Kontinuerlig</string>
   <string name="pref_camera_scenedetect_title">Automatisk scendetektion</string>
-  <string name="pref_camera_scenedetect_entry_off">Av</string>
   <string name="pref_camera_scenedetect_entry_on">På</string>
-  <string name="time_lapse_error">Ogiltig videostorlek för intervallinspelning.</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 d922eb164..4b7e25af4 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">เสริมสร้าง</string>
   <string name="camera_menu_slow_shutter_label">ชัตเตอร์ช้า</string>
   <string name="camera_menu_beauty_mode_label">ตกแต่ง</string>
-  <string name="camera_menu_colorize_label">สีสัน</string>
-  <string name="camera_menu_effects_label">เอฟเฟค</string>
   <string name="camera_menu_asd_label">สมาร์ทซีน</string>
   <string name="pref_camera_power_shutter_title">ชัตเตอร์ปุ่มเพาเวอร์</string>
   <string name="pref_superzoom_title">ขยาย</string>
diff --git a/res/values-th/qcomstrings.xml b/res/values-th/qcomstrings.xml
index a05503908..3a4e66433 100644
--- a/res/values-th/qcomstrings.xml
+++ b/res/values-th/qcomstrings.xml
@@ -24,12 +24,11 @@
   <string name="pref_camera_powermode_title">รูปแบบพลังงาน</string>
   <string name="pref_camera_powermode_entry_lp">พลังงานต่ำ</string>
   <string name="pref_camera_powermode_entry_np">พลังงานปกติ</string>
-  <string name="pref_camera_autoexposure_title">รูปถ่ายภาพอัตโนมัติ</string>
+  <string name="pref_camera_autoexposure_title">เปิดรับแสงอัตโนมัติ</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">ค่าเฉลี่ยของเฟรม</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">ศูนย์ถ่วงน้ำหนัก</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">จุดวัดแสง</string>
   <string name="pref_camera_videoencoder_title">ตัวแปลงสัญญาณวิดีโอ</string>
-  <string name="pref_camera_videoencoder_dialogtitle">ตัวแปลงสัญญาณวิดีโอ</string>
   <string name="pref_camera_audioencoder_title">ตัวแปลงสัญญาณเสียง</string>
   <string name="pref_camera_video_duration_title">ระยะเวลาวิดีโอ</string>
   <string name="pref_camera_video_duration_entry_mms">30 วินาที (MMS)</string>
@@ -38,14 +37,11 @@
   <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_zsl_title">ถ่ายภาพทันที (ZSL)</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_zsl_entry_off">ปิด</string>
-  <string name="pref_camera_zsl_entry_on">เปิด</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>
@@ -58,22 +54,16 @@
   <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_raw">รูปภาพ Raw ไม่สามารถใช้ได้เมื่อใช้ ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR ไม่รองรับใน ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</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="err_app_unsupport_ae_bracket_code">AE Bracketing ไม่สนับสนุน</string>
-  <string name="snapshot_lower_than_video">วิดีโอสแนปช็อตมีขนาดเล็กกว่าขนาดวิดีโอ,เพื่อบันทึกเป็นขนาดวิดีโอ กรุณาเลือกขนาดที่เท่ากันหรือสูงกว่าขนาดวิดีโอ</string>
-  <string name="snapshotsize_low_powermode">ไม่สนับสนุนการเปลี่ยนขนาดภาพหรือวิดีโอสแนปช็อตในรูปแบบพลังงานต่ำ กรุณาเลือกรูปแบบพลังงานปกติเพื่อเปลี่ยนขนาดภาพ</string>
-  <string name="snapshot_qcif_and_d1">เฉพาะวิดีโอสแนปช็อตเท่านั้นที่รองรับความละเอียดนี้</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">รูปแบบลด Noise</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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -157,12 +147,7 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">ปกติ</string>
-  <string name="pref_camera_focusmode_entry_continuous">ต่อเนื่อง</string>
   <string name="pref_camera_scenedetect_title">ตรวจสอบฉากอัตโนมัติ</string>
-  <string name="pref_camera_scenedetect_entry_off">ปิด</string>
   <string name="pref_camera_scenedetect_entry_on">เปิด</string>
-  <string name="time_lapse_error">ขนาดวิดีโอไม่สามารถใช้ได้กับขนาดเวลาที่กำหนด</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 287b34132..4d701ce81 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">İYİLEŞTİR</string>
   <string name="camera_menu_slow_shutter_label">YAVAŞ ENSTANTANE</string>
   <string name="camera_menu_beauty_mode_label">GÜZELLİK</string>
-  <string name="camera_menu_colorize_label">RENKLENDİR</string>
-  <string name="camera_menu_effects_label">EFEKTLER</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_superzoom_title">Büyüt</string>
diff --git a/res/values-tr/qcomstrings.xml b/res/values-tr/qcomstrings.xml
index 116135d69..387e1c646 100644
--- a/res/values-tr/qcomstrings.xml
+++ b/res/values-tr/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">Güç modu</string>
   <string name="pref_camera_powermode_entry_lp">Düşük Güç</string>
   <string name="pref_camera_powermode_entry_np">Normal Güç</string>
-  <string name="pref_camera_autoexposure_title">Otomatik Pozlama modu</string>
+  <string name="pref_camera_autoexposure_title">Otomatik Pozlama</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Çerçeve ortalaması</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Orta ağırlıklı</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Nokta Ölçümü</string>
   <string name="pref_camera_videoencoder_title">Video kodlayıcı</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Video kodlayıcı</string>
   <string name="pref_camera_audioencoder_title">Ses kodlayıcı</string>
   <string name="pref_camera_video_duration_title">Video süresi</string>
   <string name="pref_camera_video_duration_entry_mms">30 saniye (MMS)</string>
   <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">Etkinleştir</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Devre dışı bırak</string>
-  <string name="pref_camera_zsl_title">Sıfır Enstantane Gecikmesi (ZSL)</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_zsl_entry_off">Kapalı</string>
-  <string name="pref_camera_zsl_entry_on">Açık</string>
   <string name="pref_camera_video_hdr_entry_off">Kapalı</string>
   <string name="pref_camera_video_hdr_entry_on">Açık</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
@@ -53,27 +49,21 @@
   <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">Etkinleştir</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Devre dışı bırak</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">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_raw">Ham resim formatı ZSL modunda desteklenmiyor</string>
-  <string name="error_app_unsupported_hdr_zsl">ZSL modunda HDR desteklenmiyor</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Otomatik Pozlama</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="err_app_unsupport_ae_bracket_code">Otomatik Poz Tarama henüz desteklenmiyor</string>
-  <string name="snapshot_lower_than_video">Video resim boyutu video boyutundan küçük ve video boyutuyla sınırlı olmalıdır. Lütfen şu anki video boyutunu eşit ya da daha küçük bir çözünürlük seçin.</string>
-  <string name="snapshotsize_low_powermode">Düşük güç modunda resim boyutunu düzenleme desteklenmiyor. Video boyutunda görüntü çekilecek. Lütfen resim boyutunu değiştirmek için Normal Güç moduna geçin.</string>
-  <string name="snapshot_qcif_and_d1">Bu çözünürlükte sadece video boyutunda fotoğraf desteklenmekte.</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">Wavelet Gürültü giderme modu</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>
@@ -108,7 +98,7 @@
   <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">Sayısal Görüntü Dengeleme</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>
@@ -155,14 +145,9 @@
   <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">Etkinleştir</string>
-  <string name="pref_camera_histogram_entry_disable">Devre dışı bırak</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_continuous">Devamlı</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_off">Kapalı</string>
   <string name="pref_camera_scenedetect_entry_on">Açık</string>
-  <string name="time_lapse_error">Hızlandırılmış çekim için geçersiz video boyutu.</string>
+  <string name="pref_camera_scenedetect_entry_off">Kapalı</string>
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index d91bcf7d4..a4a0cc5b3 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">ПОКРАЩЕННЯ</string>
   <string name="camera_menu_slow_shutter_label">ПОВІЛЬНИЙ ЗАТВОР</string>
   <string name="camera_menu_beauty_mode_label">ПОКРАЩЕННЯ</string>
-  <string name="camera_menu_colorize_label">РОЗФАРБУВАТИ</string>
-  <string name="camera_menu_effects_label">ЕФЕКТИ</string>
   <string name="camera_menu_asd_label">РОЗПІЗНАВАННЯ УМОВИ ЗЙОМКИ</string>
   <string name="pref_camera_power_shutter_title">Зйомка кноп. живлення</string>
   <string name="pref_superzoom_title">Збільшення</string>
diff --git a/res/values-uk/qcomstrings.xml b/res/values-uk/qcomstrings.xml
index fe5182b2e..d31f635e3 100644
--- a/res/values-uk/qcomstrings.xml
+++ b/res/values-uk/qcomstrings.xml
@@ -24,12 +24,11 @@
   <string name="pref_camera_powermode_title">Енергоспоживання</string>
   <string name="pref_camera_powermode_entry_lp">Понижене</string>
   <string name="pref_camera_powermode_entry_np">Нормальне</string>
-  <string name="pref_camera_autoexposure_title">Авто експозиція</string>
+  <string name="pref_camera_autoexposure_title">Автоекспозиція</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Усереднений</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">По центру</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Точковий</string>
   <string name="pref_camera_videoencoder_title">Відео кодек</string>
-  <string name="pref_camera_videoencoder_dialogtitle">Відео кодек</string>
   <string name="pref_camera_audioencoder_title">Аудіо кодек</string>
   <string name="pref_camera_video_duration_title">Тривалість відео</string>
   <string name="pref_camera_video_duration_entry_mms">30 секунд (MMS)</string>
@@ -37,15 +36,12 @@
   <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_zsl_title">Технологія (ZSL)</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_zsl_entry_off">Вимкн.</string>
-  <string name="pref_camera_zsl_entry_on">Увімк.</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>
@@ -54,26 +50,20 @@
   <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="pref_camera_redeyereduction_entry_disable">Вимкнути</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_raw">Формат Raw не підтримується в режимі ZSL</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR не підтримується в режимі ZSL</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Автобрекетинг</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="err_app_unsupport_ae_bracket_code">Автобрекетинг не підтримується</string>
-  <string name="snapshot_lower_than_video">Розширення фотознімка менше, ніж розширення відео зйомки. Виберіть розширення вище або рівне розширення відео зйомки.</string>
-  <string name="snapshotsize_low_powermode">Зміна розширення зображення не підтримується в режимі енергозбереження. Перемкніть в режим нормального енергоспоживання для використання цієї функції.</string>
-  <string name="snapshot_qcif_and_d1">Для цього розширення підтримується тільки знімок з поточним розширенням відео зйомки.</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_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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -156,13 +146,8 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">Звичайний</string>
-  <string name="pref_camera_focusmode_entry_continuous">Безперервний</string>
+  <string name="pref_camera_histogram_entry_disable">Вимкнути</string>
   <string name="pref_camera_scenedetect_title">Розпізн. умов зйомки</string>
-  <string name="pref_camera_scenedetect_entry_off">Вимкн.</string>
   <string name="pref_camera_scenedetect_entry_on">Увімк.</string>
-  <string name="time_lapse_error">Неправильне розширення для повільної зйомки.</string>
+  <string name="pref_camera_scenedetect_entry_off">Вимкн.</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 89576d8bd..cf1003637 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">增强</string>
   <string name="camera_menu_slow_shutter_label">低速快门</string>
   <string name="camera_menu_beauty_mode_label">美肤</string>
-  <string name="camera_menu_colorize_label">着色</string>
-  <string name="camera_menu_effects_label">效果</string>
   <string name="camera_menu_asd_label">智能场景</string>
   <string name="pref_camera_power_shutter_title">电源键快门</string>
   <string name="pref_superzoom_title">放大</string>
diff --git a/res/values-zh-rCN/qcomstrings.xml b/res/values-zh-rCN/qcomstrings.xml
index 80285f3ea..a19845223 100644
--- a/res/values-zh-rCN/qcomstrings.xml
+++ b/res/values-zh-rCN/qcomstrings.xml
@@ -24,28 +24,24 @@
   <string name="pref_camera_powermode_title">电源模式</string>
   <string name="pref_camera_powermode_entry_lp">电量低</string>
   <string name="pref_camera_powermode_entry_np">正常电源</string>
-  <string name="pref_camera_autoexposure_title">自动曝光模式</string>
+  <string name="pref_camera_autoexposure_title">自动曝光</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">平均帧</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">中心测光</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">点测光</string>
   <string name="pref_camera_videoencoder_title">视频编码</string>
-  <string name="pref_camera_videoencoder_dialogtitle">视频编码</string>
   <string name="pref_camera_audioencoder_title">音频编码</string>
   <string name="pref_camera_video_duration_title">视频长度</string>
   <string name="pref_camera_video_duration_entry_mms">30 秒 (彩信)</string>
   <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_zsl_title">零快门时滞 (ZSL)</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_zsl_entry_off">关闭</string>
-  <string name="pref_camera_zsl_entry_on">开启</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>
@@ -53,27 +49,21 @@
   <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="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">开启高帧率时仅支持 H.264 视频编码</string>
   <string name="error_app_unsupported">视频分辨率不支持此编解码器类型</string>
-  <string name="error_app_unsupported_raw">零快门延迟模式中不支持原始图像文件格式</string>
-  <string name="error_app_unsupported_hdr_zsl">零快门延迟模式中不支持高动态范围成像</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">自动包围曝光</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="err_app_unsupport_ae_bracket_code">尚不支持自动包围曝光</string>
-  <string name="snapshot_lower_than_video">视频快照的大小低于视频的大小，以视频大小为上限。请选择高于或等于当前视频大小的分辨率。</string>
-  <string name="snapshotsize_low_powermode">不支持在低功耗模式下改变图片大小，将捕获视频大小的快照。请选择正常功耗模式以允许改变图片大小。</string>
-  <string name="snapshot_qcif_and_d1">此分辨率只支持视频尺寸的快照。</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_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>
@@ -108,7 +98,7 @@
   <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_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>
@@ -155,14 +145,9 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">正常</string>
-  <string name="pref_camera_focusmode_entry_continuous">连续</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_off">关闭</string>
   <string name="pref_camera_scenedetect_entry_on">开启</string>
-  <string name="time_lapse_error">延时录像的视频尺寸无效。</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 15cf9609e..b3e8a41d4 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -125,8 +125,6 @@
   <string name="camera_menu_enhance_label">強化</string>
   <string name="camera_menu_slow_shutter_label">慢速快門</string>
   <string name="camera_menu_beauty_mode_label">美化</string>
-  <string name="camera_menu_colorize_label">彩色化</string>
-  <string name="camera_menu_effects_label">效果</string>
   <string name="camera_menu_asd_label">智能場景</string>
   <string name="pref_camera_power_shutter_title">電源快門</string>
   <string name="pref_superzoom_title">放大</string>
diff --git a/res/values-zh-rHK/qcomstrings.xml b/res/values-zh-rHK/qcomstrings.xml
index 432e0a779..ed24afd2c 100644
--- a/res/values-zh-rHK/qcomstrings.xml
+++ b/res/values-zh-rHK/qcomstrings.xml
@@ -24,28 +24,23 @@
   <string name="pref_camera_powermode_title">電源模式</string>
   <string name="pref_camera_powermode_entry_lp">低電量</string>
   <string name="pref_camera_powermode_entry_np">正常電量</string>
-  <string name="pref_camera_autoexposure_title">自動曝光模式</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">幅均值</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">中心測光</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">測光點</string>
   <string name="pref_camera_videoencoder_title">視訊編解碼器</string>
-  <string name="pref_camera_videoencoder_dialogtitle">視訊編解碼器</string>
   <string name="pref_camera_audioencoder_title">音訊解碼器</string>
   <string name="pref_camera_video_duration_title">影片長度</string>
   <string name="pref_camera_video_duration_entry_mms">30 秒 (多媒體簡訊)</string>
   <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_zsl_title">快門零停滯 (ZSL)</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_zsl_entry_off">關閉</string>
-  <string name="pref_camera_zsl_entry_on">開啟</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>
@@ -53,27 +48,20 @@
   <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="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="error_app_unsupported_raw">ZSL 模式中不支援 Raw 圖像格式</string>
-  <string name="error_app_unsupported_hdr_zsl">HDR 不支援 ZSL 模式</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">自動包圍曝光</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="err_app_unsupport_ae_bracket_code">自動包圍曝光尚不支援</string>
-  <string name="snapshot_lower_than_video">影片快照的尺寸低於影片的尺寸，如調高影片尺寸，請選擇高於或符合目前影片尺寸的解像度。</string>
-  <string name="snapshotsize_low_powermode">在電量低的狀況下不能改變圖像的大小，僅能維持快照功能。如須改變圖片的大小則須要調整至正常電量。</string>
-  <string name="snapshot_qcif_and_d1">影像快照僅支援此解像度。</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>
@@ -108,7 +96,6 @@
   <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>
@@ -155,14 +142,7 @@
   <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_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_focusmode_entry_normal">正常</string>
-  <string name="pref_camera_focusmode_entry_continuous">連續</string>
   <string name="pref_camera_scenedetect_title">自動場景檢測</string>
-  <string name="pref_camera_scenedetect_entry_off">關閉</string>
   <string name="pref_camera_scenedetect_entry_on">開啟</string>
-  <string name="time_lapse_error">為延時錄影的不正確視訊尺寸。</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 2ad17dd16..206d42a2c 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -69,6 +69,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_entry_off">關閉</string>
   <string name="pref_camera_burst_entry_5">5 連拍</string>
   <string name="pref_camera_burst_entry_10">10 連拍</string>
   <string name="pref_camera_burst_entry_15">15 連拍</string>
diff --git a/res/values-zh-rTW/qcomstrings.xml b/res/values-zh-rTW/qcomstrings.xml
index 2942b2ae2..cabc62de6 100644
--- a/res/values-zh-rTW/qcomstrings.xml
+++ b/res/values-zh-rTW/qcomstrings.xml
@@ -24,18 +24,12 @@
   <string name="pref_camera_video_duration_entry_mms">30 秒 (多媒體簡訊)</string>
   <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_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_zsl_entry_off">關閉</string>
-  <string name="pref_camera_zsl_entry_on">開啟</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_redeyereduction_entry_enable">啟用</string>
-  <string name="pref_camera_redeyereduction_entry_disable">停用</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>
@@ -68,10 +62,6 @@
   <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_histogram_entry_enable">啟用</string>
-  <string name="pref_camera_histogram_entry_disable">停用</string>
-  <string name="pref_camera_picturesize_entry_1920x1080">1080p</string>
-  <string name="pref_camera_picturesize_entry_1280x720">720p</string>
-  <string name="pref_camera_scenedetect_entry_off">關閉</string>
   <string name="pref_camera_scenedetect_entry_on">開啟</string>
+  <string name="pref_camera_scenedetect_entry_off">關閉</string>
 </resources>