Automatic translation import

Change-Id: Ie12d13900b286655881295c7aade95e72eefaeb8

50 files changed, 155 insertions, 165 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 6f50939f6..779f1fb9d 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -18,22 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_18mp">18 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 M Pieksels (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 M pieksels</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_12mp">12 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 M pieksels</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 M pieksels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 M pieksels</string>
   <string name="pref_camera_picturesize_entry_10mp">10 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 M pieksels (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 M pieksels (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 M pieksels (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 M pieksels</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pieksels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">537 M pieksels (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 M pieksels (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 M pieksels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Verminder vervaag beweging</string>
@@ -125,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">VERFRAAI</string>
   <string name="camera_menu_asd_label">MOOI TONEEL</string>
   <string name="pref_camera_power_shutter_title">Krag knoppie</string>
+  <string name="pref_camera_max_brightness_title">Helder skerm</string>
   <string name="pref_superzoom_title">Vergroot</string>
 </resources>
diff --git a/res/values-af/qcomstrings.xml b/res/values-af/qcomstrings.xml
index 49c43aff5..f5e7a5b53 100644
--- a/res/values-af/qcomstrings.xml
+++ b/res/values-af/qcomstrings.xml
@@ -30,22 +30,22 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Kol Meting</string>
   <string name="pref_camera_videoencoder_title">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_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="hdr_enable_message">HDR is aangeskakel, net Outo toneel modus word ondersteun</string>
+  <string name="scene_enable_message">HDR word nie in die toneel modus ondersteun nie behalwe in Outo</string>
   <string name="pref_camera_video_hdr_title">Video (HDR)</string>
   <string name="pref_camera_facedetection_title">Gesig Opsporing</string>
   <string name="pref_camera_redeyereduction_title">Rooi oë Vermindering</string>
+  <string name="error_app_unsupported_hfr_selection">HFR word nie ondersteun wanneer video stabilisering, tydsverloop of video HDR aan is nie</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_dis">Video stabilisering word nie ondersteun vir geselekteerde resolusie</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto beligting afbakening</string>
   <string name="pref_camera_hfr_title">Stadige aksie (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Af</string>
diff --git a/res/values-ar/qcomstrings.xml b/res/values-ar/qcomstrings.xml
index e66eff671..952cb14c9 100644
--- a/res/values-ar/qcomstrings.xml
+++ b/res/values-ar/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">بقعة القياس</string>
   <string name="pref_camera_videoencoder_title">ترميز الفيديو</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_selectablezoneaf_title">Autofocus منطقة</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">تلقائي</string>
diff --git a/res/values-az/qcomstrings.xml b/res/values-az/qcomstrings.xml
new file mode 100644
index 000000000..46032c7f5
--- /dev/null
+++ b/res/values-az/qcomstrings.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+    Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+    Copyright (C) 2013-2014 The CyanogenMod Project
+
+    Not a Contribution.
+
+    Copyright (C) 2007 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<resources>
+  <string name="pref_camera_powermode_title">Güc rejimi</string>
+  <string name="pref_camera_powermode_entry_lp">Aşağı güc</string>
+  <string name="pref_camera_powermode_entry_np">Normal güc</string>
+  <string name="pref_camera_autoexposure_entry_frameaverage">Çərçivə ortalaması</string>
+  <string name="pref_camera_videoencoder_title">Video kodlayıcı</string>
+  <string name="pref_camera_selectablezoneaf_entry_auto">Avto</string>
+  <string name="pref_camera_video_hdr_title">Video HDR</string>
+  <string name="pref_camera_facedetection_title">Üz tanıma</string>
+  <string name="pref_camera_hfr_title">Yavaş Hərəkət (HFR)</string>
+  <string name="pref_camera_hfr_entry_off">Bağlı</string>
+  <string name="pref_camera_hfr_entry_2x">60 K/S</string>
+  <string name="pref_camera_hfr_entry_3x">90 K/S</string>
+  <string name="pref_camera_hfr_entry_4x">120 K/S</string>
+  <string name="pref_camera_iso_title">ISO</string>
+  <string name="pref_camera_iso_entry_auto">Avto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100ö</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
+  <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
+  <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_picture_format_title">Şəkil formatı</string>
+  <string name="pref_camera_jpegquality_title">Şəkil keyfiyyəti</string>
+  <string name="pref_camera_jpegquality_entry_0">55%</string>
+  <string name="pref_camera_jpegquality_entry_1">65% (normal)</string>
+  <string name="pref_camera_jpegquality_entry_4">95%</string>
+  <string name="pref_camera_jpegquality_entry_5">100%</string>
+</resources>
diff --git a/res/values-ca/qcomstrings.xml b/res/values-ca/qcomstrings.xml
index 10cc65257..9eaf8599a 100644
--- a/res/values-ca/qcomstrings.xml
+++ b/res/values-ca/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Mesura puntual</string>
   <string name="pref_camera_videoencoder_title">Codificador de vídeo</string>
   <string name="pref_camera_audioencoder_title">Codificador de so</string>
-  <string name="pref_camera_video_duration_title">Duració del vídeo</string>
-  <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_selectablezoneaf_title">Zona d\'Auto Focus</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
diff --git a/res/values-cs/qcomstrings.xml b/res/values-cs/qcomstrings.xml
index c84207cdf..12becd2f3 100644
--- a/res/values-cs/qcomstrings.xml
+++ b/res/values-cs/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Bodový</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Zóna automatického ostření</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automaticky</string>
diff --git a/res/values-da/qcomstrings.xml b/res/values-da/qcomstrings.xml
index 766d9f333..28e03736b 100644
--- a/res/values-da/qcomstrings.xml
+++ b/res/values-da/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Spotmåling</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Autofokus-zone</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
diff --git a/res/values-de/qcomstrings.xml b/res/values-de/qcomstrings.xml
index c5433553c..98e28e949 100644
--- a/res/values-de/qcomstrings.xml
+++ b/res/values-de/qcomstrings.xml
@@ -30,16 +30,13 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Spot</string>
   <string name="pref_camera_videoencoder_title">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>
-  <string name="pref_camera_video_duration_entry_10">10 Minuten</string>
-  <string name="pref_camera_video_duration_entry_30">30 Minuten</string>
   <string name="pref_camera_skinToneEnhancement_title">Hauttöne verbessern</string>
   <string name="pref_camera_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="hdr_enable_message">HDR ist aktiviert. Nur der automatische Szenenmodus wird unterstützt</string>
   <string name="scene_enable_message">HDR wird nur im automatischen Szenenmodus unterstützt</string>
   <string name="pref_camera_video_hdr_title">Video (HDR)</string>
   <string name="pref_camera_facedetection_title">Gesichtserkennung</string>
diff --git a/res/values-el/qcomstrings.xml b/res/values-el/qcomstrings.xml
index 7158b9fd4..945a8a2ad 100644
--- a/res/values-el/qcomstrings.xml
+++ b/res/values-el/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Σημειακή μέτρηση</string>
   <string name="pref_camera_videoencoder_title">Κωδικοποιητής βίντεο</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_selectablezoneaf_title">Ζώνη αυτόματης εστίασης</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Αυτόματη</string>
diff --git a/res/values-es-rXA/qcomstrings.xml b/res/values-es-rXA/qcomstrings.xml
index bb2e84ccb..9e06eaa00 100644
--- a/res/values-es-rXA/qcomstrings.xml
+++ b/res/values-es-rXA/qcomstrings.xml
@@ -30,10 +30,6 @@
   <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_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_selectablezoneaf_title">Zona d\'enfoque automáticu</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
diff --git a/res/values-es/qcomstrings.xml b/res/values-es/qcomstrings.xml
index 4d1393323..a8b72944a 100644
--- a/res/values-es/qcomstrings.xml
+++ b/res/values-es/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Puntual</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Modo de enfoque automático</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automático</string>
diff --git a/res/values-et/qcomstrings.xml b/res/values-et/qcomstrings.xml
index 19ed3a09f..52f6e3f9d 100644
--- a/res/values-et/qcomstrings.xml
+++ b/res/values-et/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Punktmõõtmine</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Autofookus tsoon</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
diff --git a/res/values-eu/qcomstrings.xml b/res/values-eu/qcomstrings.xml
index 560c5f6c8..4e5c2aed3 100644
--- a/res/values-eu/qcomstrings.xml
+++ b/res/values-eu/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Puntuala</string>
   <string name="pref_camera_videoencoder_title">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>
-  <string name="pref_camera_video_duration_entry_10">10 minutu</string>
-  <string name="pref_camera_video_duration_entry_30">30 minutu</string>
   <string name="pref_camera_skinToneEnhancement_title">Azal tonuaren hobekuntza</string>
   <string name="pref_camera_selectablezoneaf_title">Enfoke automatiko modua</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatikoa</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 8cc2683dc..ddc575e46 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -18,6 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapikseliä</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 megapikseliä (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_12mp">18 megapikseliä</string>
@@ -25,16 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapikseliä</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 megapikseliä (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapikseliä</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 megapikseliä (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapikseliä</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 megapikseliä (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapikseliä</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 megapikseliä (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapikseliä</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 megapikseliä (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Liikkeen sumennuksen vähentäminen</string>
diff --git a/res/values-fi/qcomstrings.xml b/res/values-fi/qcomstrings.xml
index 575f7ccda..0aa7e9334 100644
--- a/res/values-fi/qcomstrings.xml
+++ b/res/values-fi/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Pisteeseen kohdistettu</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Automaattitarkennusalue</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automaattinen</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index a160fd41c..81068dd1b 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -89,7 +89,7 @@
   <string name="pref_camera_focusmode_entry_continuouspicture">Continu</string>
   <string name="pref_camera_focusmode_entry_extended">Étendu</string>
   <string name="pref_camera_focusmode_entry_facedetect">Détection de visage</string>
-  <string name="pref_camera_focusmode_entry_facepriority">Priorité aux visages</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Priorité au visage</string>
   <string name="pref_camera_focusmode_entry_fixed">Fixé</string>
   <string name="pref_camera_focusmode_entry_portrait">Portrait</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
diff --git a/res/values-fr/qcomstrings.xml b/res/values-fr/qcomstrings.xml
index a486661b4..b89d9f5e4 100644
--- a/res/values-fr/qcomstrings.xml
+++ b/res/values-fr/qcomstrings.xml
@@ -25,27 +25,27 @@
   <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">Exposition automatique</string>
-  <string name="pref_camera_autoexposure_entry_frameaverage">Moyenne de la trame</string>
+  <string name="pref_camera_autoexposure_entry_frameaverage">Trame moyenne</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_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>
-  <string name="pref_camera_video_duration_entry_10">10 minutes</string>
-  <string name="pref_camera_video_duration_entry_30">30 minutes</string>
   <string name="pref_camera_skinToneEnhancement_title">Amélioration de la teinte de peau</string>
   <string name="pref_camera_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="hdr_enable_message">Le HDR est activé, seul le mode scène automatique est pris en charge</string>
+  <string name="scene_enable_message">Le HDR n\'est pas pris en charge dans un mode de scène différent qu\'automatique</string>
   <string name="pref_camera_video_hdr_title">Vidéo HDR</string>
   <string name="pref_camera_facedetection_title">Détection de visage</string>
   <string name="pref_camera_redeyereduction_title">Réduction des yeux rouges</string>
+  <string name="error_app_unsupported_hfr_selection">Le HFR n\'est pas pris en charge lorsque le HDR, la stabilisation ou l\'accélération vidéo est activé</string>
   <string name="error_app_unsupported_hfr">HFR n\'est pas supporté pour la résolution choisie</string>
   <string name="error_app_unsupported_hfr_codec">Seul l\'encodage vidéo H.264 est pris en charge lorsque HFR est activé</string>
   <string name="error_app_unsupported">Résolution vidéo non pris en charge pour ce type de codec</string>
+  <string name="error_app_unsupported_dis">La stabilisation vidéo n\'est pas prise en charge pour la résolution sélectionnée</string>
   <string name="pref_camera_ae_bracket_hdr_title">Exposition automatique</string>
   <string name="pref_camera_hfr_title">Vidéo au ralenti (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Désactivé</string>
@@ -85,7 +85,7 @@
   <string name="pref_camera_coloreffect_entry_mono">Mono</string>
   <string name="pref_camera_coloreffect_entry_sepia">Sépia</string>
   <string name="pref_camera_coloreffect_entry_negative">Négatif</string>
-  <string name="pref_camera_coloreffect_entry_solarize">Solarisation</string>
+  <string name="pref_camera_coloreffect_entry_solarize">Solariser</string>
   <string name="pref_camera_coloreffect_entry_posterize">Postériser</string>
   <string name="pref_camera_coloreffect_entry_aqua">Eau</string>
   <string name="pref_camera_coloreffect_entry_emboss">Relief</string>
@@ -94,11 +94,11 @@
   <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
   <string name="pref_camera_coloreffect_entry_mosaic">Mosaïque</string>
   <string name="pref_camera_coloreffect_entry_redtint">Teinte rouge</string>
-  <string name="pref_camera_coloreffect_entry_bluetint">Teinte bleu</string>
+  <string name="pref_camera_coloreffect_entry_bluetint">Teinte bleue</string>
   <string name="pref_camera_coloreffect_entry_greentint">Teinte verte</string>
   <string name="pref_camera_touchafaec_title">Touche AF/AEC</string>
   <string name="pref_camera_dis_title">Stabilisation vidéo</string>
-  <string name="pref_camera_facerc_title">Reconnaissance des visages</string>
+  <string name="pref_camera_facerc_title">Reconnaissance de visage</string>
   <string name="pref_camera_sharpness_title">Netteté</string>
   <string name="pref_camera_sharpness_entry_level0">Niveau 0</string>
   <string name="pref_camera_sharpness_entry_level1">Niveau 1</string>
diff --git a/res/values-hu/qcomstrings.xml b/res/values-hu/qcomstrings.xml
index 26321c937..91b64d129 100644
--- a/res/values-hu/qcomstrings.xml
+++ b/res/values-hu/qcomstrings.xml
@@ -30,10 +30,6 @@
   <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_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_selectablezoneaf_title">Választható fókusz módok</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatikus</string>
diff --git a/res/values-in/qcomstrings.xml b/res/values-in/qcomstrings.xml
index 466cc8ac8..48eddf312 100644
--- a/res/values-in/qcomstrings.xml
+++ b/res/values-in/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Pengukuran titik</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Zona fokus-otomatis</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Otomatis</string>
diff --git a/res/values-it/qcomstrings.xml b/res/values-it/qcomstrings.xml
index f3f2bbff9..08d1cced7 100644
--- a/res/values-it/qcomstrings.xml
+++ b/res/values-it/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Punto singolo</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Regione autofocus</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatico</string>
diff --git a/res/values-iw/qcomstrings.xml b/res/values-iw/qcomstrings.xml
index 412d93e57..d411afbb4 100644
--- a/res/values-iw/qcomstrings.xml
+++ b/res/values-iw/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">אזור מדידה</string>
   <string name="pref_camera_videoencoder_title">קידוד וידאו</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_selectablezoneaf_title">אשור פוקוס אוטומטי</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">אוטומטי</string>
diff --git a/res/values-ja/qcomstrings.xml b/res/values-ja/qcomstrings.xml
index 3b451c97e..5da44ad49 100644
--- a/res/values-ja/qcomstrings.xml
+++ b/res/values-ja/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">スポット測光</string>
   <string name="pref_camera_videoencoder_title">ビデオコーデック</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_selectablezoneaf_title">オートフォーカスゾーン</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">オート</string>
diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml
index 1ba29b295..c0bc806f3 100644
--- a/res/values-ko/qcomstrings.xml
+++ b/res/values-ko/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">스팟 측광</string>
   <string name="pref_camera_videoencoder_title">비디오 코덱</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_selectablezoneaf_title">자동 초점 영역</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">자동</string>
diff --git a/res/values-ku/qcomstrings.xml b/res/values-ku/qcomstrings.xml
index 027f4cb24..9a57f3c54 100644
--- a/res/values-ku/qcomstrings.xml
+++ b/res/values-ku/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">مه‌ترکردنی نیشانه‌</string>
   <string name="pref_camera_videoencoder_title">لێده‌ری ڤیدیۆ</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_selectablezoneaf_title">خۆکارانه‌ سه‌رنجدان</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">خۆکارانه‌</string>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 89a09e6b0..04e6f3834 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -44,7 +44,7 @@
     <item quantity="one">%1$d ausgewielt</item>
     <item quantity="other">%1$d ausgewielt</item>
   </plurals>
-  <string name="show_on_map">Op der Kaart weisen</string>
+  <string name="show_on_map">Op der Kaart uweisen</string>
   <string name="rotate_left">Lénks rotéieren</string>
   <string name="rotate_right">Riets rotéieren</string>
   <string name="edit">Änneren</string>
@@ -91,7 +91,7 @@
   <string name="access_sd_fail" product="default">Keen Zougrëff op USB-Späicher méiglech.</string>
   <string name="time_lapse_title">Zäitrafferopnam</string>
   <string name="capturing">Gëtt opgeholl</string>
-  <string name="pref_camera_id_title">Kamera wielen</string>
+  <string name="pref_camera_id_title">Kamera auswielen</string>
   <string name="pref_camera_id_entry_back">Hannen</string>
   <string name="pref_camera_id_entry_front">Vir</string>
   <string name="pref_camera_recordlocation_title">Plaz späicheren</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 535d5ac88..74c431543 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -18,6 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
   <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
   <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
@@ -25,16 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Judesių liejimosi mažinimas</string>
@@ -126,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">PAGRAŽINTI</string>
   <string name="camera_menu_asd_label">SUMANI SCENA</string>
   <string name="pref_camera_power_shutter_title">Fotografavimo mygtukas</string>
+  <string name="pref_camera_max_brightness_title">Ryškus ekranas</string>
   <string name="pref_superzoom_title">Padidinti</string>
 </resources>
diff --git a/res/values-lt/qcomstrings.xml b/res/values-lt/qcomstrings.xml
index ed912b485..919878df9 100644
--- a/res/values-lt/qcomstrings.xml
+++ b/res/values-lt/qcomstrings.xml
@@ -30,22 +30,22 @@
   <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_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>
-  <string name="pref_camera_video_duration_entry_10">10 min.</string>
-  <string name="pref_camera_video_duration_entry_30">30 min.</string>
   <string name="pref_camera_skinToneEnhancement_title">Odos spalvos tono didinimas</string>
   <string name="pref_camera_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="hdr_enable_message">HDR įjungtas, palaikomas tik automatinės scenos rėžimas</string>
+  <string name="scene_enable_message">Išskyrus autom. HDR nėra palaikoma scenos režimu</string>
   <string name="pref_camera_video_hdr_title">Vaizdas (HDR)</string>
   <string name="pref_camera_facedetection_title">Veido aptikimas</string>
   <string name="pref_camera_redeyereduction_title">Raudonų akių mažinimas</string>
+  <string name="error_app_unsupported_hfr_selection">HFR nėra palaikoma kai įjungtas vaizdo stabilizavimas, fotofilmas arba HDR</string>
   <string name="error_app_unsupported_hfr">Daug kadrų per sekundę (HFR) nepalaiko pasirinktos rezoliucijos</string>
   <string name="error_app_unsupported_hfr_codec">Kai daug kadrų per sekundę (HFR) yra įjungta, palaikomas tik H264 vaizdo iškodavimas</string>
   <string name="error_app_unsupported">Nepalaikoma vaizdo rezoliucija šiam iškodavimo tipui</string>
+  <string name="error_app_unsupported_dis">Vaizdo stabilizavimas nepalaikomas pasirinktoje raiškoje</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatinio išlaikymo korekcija</string>
   <string name="pref_camera_hfr_title">Sulėtinimas (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Išjungta</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 64644460a..2f3314e80 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -18,6 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7M punkti</string>
   <string name="pref_camera_picturesize_entry_18mp">18M punkti</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M punkti (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8M punkti</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7M punkti</string>
   <string name="pref_camera_picturesize_entry_12mp">12M punkti</string>
@@ -25,16 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M punkti</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M punkti</string>
   <string name="pref_camera_picturesize_entry_10mp">10M punkti</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M punkti (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9M punkti</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M punkti (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M punkti</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M punkti</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M punkti (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M punkti</string>
   <string name="pref_camera_picturesize_entry_4mp">4M punkti</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M punkti (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M punkti</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M punkti (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M punkti</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Kustības miglojuma samazināšana</string>
@@ -126,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">SKAISTUMS</string>
   <string name="camera_menu_asd_label">GUDRĀ AINA</string>
   <string name="pref_camera_power_shutter_title">Jaudas slēdzis</string>
+  <string name="pref_camera_max_brightness_title">Spilgts ekrāns</string>
   <string name="pref_superzoom_title">Palielināt</string>
 </resources>
diff --git a/res/values-lv/qcomstrings.xml b/res/values-lv/qcomstrings.xml
index e5cf4e019..994bb3918 100644
--- a/res/values-lv/qcomstrings.xml
+++ b/res/values-lv/qcomstrings.xml
@@ -30,22 +30,22 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Punkta mērīšana</string>
   <string name="pref_camera_videoencoder_title">Video kodeks</string>
   <string name="pref_camera_audioencoder_title">Audio kodeks</string>
-  <string name="pref_camera_video_duration_title">Video ilgums</string>
-  <string name="pref_camera_video_duration_entry_mms">30 sekundes (MMS)</string>
-  <string name="pref_camera_video_duration_entry_10">10 minūtes</string>
-  <string name="pref_camera_video_duration_entry_30">30 minūtes</string>
   <string name="pref_camera_skinToneEnhancement_title">Ādas toņu uzlabošana</string>
   <string name="pref_camera_selectablezoneaf_title">Autofokusa zona</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Punkta mērīšana</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centra svērtā</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Kadra vidējais</string>
+  <string name="hdr_enable_message">Ja HDR ir ieslēgts, tiek atbalstīts tikai Auto ainas režīms</string>
+  <string name="scene_enable_message">Ja nav izmantots Automātiskais ainas režīms, HDR netiek atbalstīts</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Seju noteikšana</string>
   <string name="pref_camera_redeyereduction_title">Sarkano acu vājināšana</string>
+  <string name="error_app_unsupported_hfr_selection">HFR nav atbalstīta, ja ir ieslēgti video stabilizācija, laika sprīžu video vai HDR</string>
   <string name="error_app_unsupported_hfr">Izvēlētajai izšķirtspējai HFR nav atbalstīts</string>
   <string name="error_app_unsupported_hfr_codec">h. 264 video kodējums ir atbalstīts, tikai ja ir ieslēgts HFR</string>
   <string name="error_app_unsupported">Neatbalstīta video izšķirtspēja šim kodeka veidam</string>
+  <string name="error_app_unsupported_dis">Izvēlētai izšķirtspējai video stabilizāciju nav atbalstīta</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automātiskā ekspozīcijas ierobežošana</string>
   <string name="pref_camera_hfr_title">Lēna kustība (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Izslēgts</string>
diff --git a/res/values-nb/qcomstrings.xml b/res/values-nb/qcomstrings.xml
index 440cdfd74..954018e1b 100644
--- a/res/values-nb/qcomstrings.xml
+++ b/res/values-nb/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Punktmåling</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Autofokus sone</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatisk</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 4a03e39e7..63ebdafde 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -34,11 +34,14 @@
   <string name="pref_camera_picturesize_entry_6mp_wide">6 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Beweging verscherpen</string>
@@ -130,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">VERFRAAIEN</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_camera_max_brightness_title">Helder scherm</string>
   <string name="pref_superzoom_title">Superzoom</string>
 </resources>
diff --git a/res/values-nl/qcomstrings.xml b/res/values-nl/qcomstrings.xml
index 25c90d676..20e977fb6 100644
--- a/res/values-nl/qcomstrings.xml
+++ b/res/values-nl/qcomstrings.xml
@@ -30,22 +30,22 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Spotmeting</string>
   <string name="pref_camera_videoencoder_title">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_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="hdr_enable_message">HDR is ingeschakeld, alleen Automatische scènedetectie wordt ondersteund</string>
+  <string name="scene_enable_message">HDR wordt alleen ondersteund in Automatische scènedetectie</string>
   <string name="pref_camera_video_hdr_title">Video (HDR)</string>
   <string name="pref_camera_facedetection_title">Gezichtsherkenning</string>
   <string name="pref_camera_redeyereduction_title">Rode ogen verminderen</string>
+  <string name="error_app_unsupported_hfr_selection">HFR wordt niet ondersteund wanneer Digitale beeldstabilisatie, Time-lapse-opname of Video (HDR) is ingeschakeld</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_dis">Digitale beeldstabilisatie wordt niet ondersteund in deze resolutie</string>
   <string name="pref_camera_ae_bracket_hdr_title">Reeksopname met automatische belichting</string>
   <string name="pref_camera_hfr_title">Slowmotion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Uit</string>
diff --git a/res/values-pl/qcomstrings.xml b/res/values-pl/qcomstrings.xml
index ea5bea3fc..ed51cf984 100644
--- a/res/values-pl/qcomstrings.xml
+++ b/res/values-pl/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Pomiar punktowy</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Strefa automatycznego wyostrzenia</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatyczne</string>
diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml
index f277f1588..9050c012c 100644
--- a/res/values-pt-rBR/qcomstrings.xml
+++ b/res/values-pt-rBR/qcomstrings.xml
@@ -30,10 +30,6 @@
   <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_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_selectablezoneaf_title">Zone de auto-foco</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automático</string>
diff --git a/res/values-pt-rPT/qcomstrings.xml b/res/values-pt-rPT/qcomstrings.xml
index 38cd8bf53..1cf0069dc 100644
--- a/res/values-pt-rPT/qcomstrings.xml
+++ b/res/values-pt-rPT/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Medição pontual</string>
   <string name="pref_camera_videoencoder_title">Codec de vídeo</string>
   <string name="pref_camera_audioencoder_title">Codec de áudio</string>
-  <string name="pref_camera_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_selectablezoneaf_title">Zona de focagem automática</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
diff --git a/res/values-ro/qcomstrings.xml b/res/values-ro/qcomstrings.xml
index d6a171df1..d1d4b2d13 100644
--- a/res/values-ro/qcomstrings.xml
+++ b/res/values-ro/qcomstrings.xml
@@ -29,10 +29,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Zona de autofocus</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
diff --git a/res/values-ru/qcomstrings.xml b/res/values-ru/qcomstrings.xml
index 58fed21de..4be0d15e8 100644
--- a/res/values-ru/qcomstrings.xml
+++ b/res/values-ru/qcomstrings.xml
@@ -30,22 +30,22 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Точечный</string>
   <string name="pref_camera_videoencoder_title">Видеокодек</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_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="hdr_enable_message">Включён HDR, поддерживается только режим Авто</string>
+  <string name="scene_enable_message">Функция HDR не поддерживается в режимах, отличных от Авто</string>
   <string name="pref_camera_video_hdr_title">HDR-видеосъёмка</string>
   <string name="pref_camera_facedetection_title">Определение лиц</string>
   <string name="pref_camera_redeyereduction_title">Ум. эфф. красных глаз</string>
+  <string name="error_app_unsupported_hfr_selection">Ускоренная съёмка не поддерживается при включённой видеостабилизации, в режиме замедленной съёмки или при включённом HDR</string>
   <string name="error_app_unsupported_hfr">Ускоренная съёмка не поддерживается для текущего разрешения</string>
   <string name="error_app_unsupported_hfr_codec">Ускоренная съёмка возможна только с видеокодеком H264</string>
   <string name="error_app_unsupported">Видеокодек не поддерживает выбранное разрешение</string>
+  <string name="error_app_unsupported_dis">Видеостабилизация для выбранного разрешения не поддерживается</string>
   <string name="pref_camera_ae_bracket_hdr_title">Автобрекетинг</string>
   <string name="pref_camera_hfr_title">Ускоренная съёмка (замедл. движ.)</string>
   <string name="pref_camera_hfr_entry_off">Выкл.</string>
diff --git a/res/values-si/qcomstrings.xml b/res/values-si/qcomstrings.xml
index 1b1365a02..eb03d4de0 100644
--- a/res/values-si/qcomstrings.xml
+++ b/res/values-si/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">තැන මානනය</string>
   <string name="pref_camera_videoencoder_title">වීඩියෝ කොඩෙක්</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_selectablezoneaf_title">ස්වයං නාභිගත පෙදෙස</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">ස්වයං</string>
diff --git a/res/values-sk/qcomstrings.xml b/res/values-sk/qcomstrings.xml
index 5d92f936c..64536d060 100644
--- a/res/values-sk/qcomstrings.xml
+++ b/res/values-sk/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Bodové meranie</string>
   <string name="pref_camera_videoencoder_title">Kodek 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_selectablezoneaf_title">Zóna automatického zaostrovania</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automaticky</string>
diff --git a/res/values-sr/qcomstrings.xml b/res/values-sr/qcomstrings.xml
index 6f8be47a1..b23db2abb 100644
--- a/res/values-sr/qcomstrings.xml
+++ b/res/values-sr/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Мерење места</string>
   <string name="pref_camera_videoencoder_title">Видео кодек</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_selectablezoneaf_title">Зона аутофокуса</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Аутоматски</string>
diff --git a/res/values-sv/qcomstrings.xml b/res/values-sv/qcomstrings.xml
index adffd6ee3..b65c82d71 100644
--- a/res/values-sv/qcomstrings.xml
+++ b/res/values-sv/qcomstrings.xml
@@ -29,10 +29,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Punktmätning</string>
   <string name="pref_camera_videoencoder_title">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_selectablezoneaf_title">Autofokuszon</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
diff --git a/res/values-th/qcomstrings.xml b/res/values-th/qcomstrings.xml
index adaf4b866..606f40213 100644
--- a/res/values-th/qcomstrings.xml
+++ b/res/values-th/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">จุดวัดแสง</string>
   <string name="pref_camera_videoencoder_title">ตัวแปลงสัญญาณวิดีโอ</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_selectablezoneaf_title">บริเวณโฟกัสอัตโนมัติ</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">อัตโนมัติ</string>
diff --git a/res/values-tr/qcomstrings.xml b/res/values-tr/qcomstrings.xml
index 4d7e661b7..e4d9f3790 100644
--- a/res/values-tr/qcomstrings.xml
+++ b/res/values-tr/qcomstrings.xml
@@ -30,10 +30,6 @@
   <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_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_selectablezoneaf_title">Otomatik odaklama alanı</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Oto</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 30399b86f..3f3f75621 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -18,6 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Мпікс.</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Мпікс</string>
@@ -25,16 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Мпікс.</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 Мпікс (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Мпікс.</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 Мпікс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Мпікс.</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M Мпікс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Мпікс.</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M Мпікс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Мпікс.</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M Мпікс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Зменшення розмиття руху</string>
diff --git a/res/values-uk/qcomstrings.xml b/res/values-uk/qcomstrings.xml
index 4180f4d1b..be6a10631 100644
--- a/res/values-uk/qcomstrings.xml
+++ b/res/values-uk/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">Точковий</string>
   <string name="pref_camera_videoencoder_title">Відео кодек</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_selectablezoneaf_title">Зона афтофокусу</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Авто</string>
diff --git a/res/values-zh-rCN/qcomstrings.xml b/res/values-zh-rCN/qcomstrings.xml
index e4a9e3b56..3572a7917 100644
--- a/res/values-zh-rCN/qcomstrings.xml
+++ b/res/values-zh-rCN/qcomstrings.xml
@@ -30,10 +30,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">点测光</string>
   <string name="pref_camera_videoencoder_title">视频编码</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_selectablezoneaf_title">自动对焦区域</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">自动</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index c3f42b414..4ad4c9332 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -69,7 +69,7 @@
   <string name="pref_camera_scenemode_entry_highsensitivity">高感光度</string>
   <string name="pref_camera_scenemode_entry_indoor">室内</string>
   <string name="pref_camera_scenemode_entry_landscape">風景</string>
-  <string name="pref_camera_scenemode_entry_mix_illuminant">混合光線</string>
+  <string name="pref_camera_scenemode_entry_mix_illuminant">混合光綫</string>
   <string name="pref_camera_scenemode_entry_mood">意境</string>
   <string name="pref_camera_scenemode_entry_nightportrait">夜晚肖像</string>
   <string name="pref_camera_scenemode_entry_nightindoor">夜間室內</string>
@@ -82,7 +82,7 @@
   <string name="pref_camera_scenemode_entry_spotlight">射燈</string>
   <string name="pref_camera_scenemode_entry_steadyphoto">平穩相片</string>
   <string name="pref_camera_scenemode_entry_supernight">漆黑深夜</string>
-  <string name="pref_camera_scenemode_entry_sweepstitch">掃描線跡</string>
+  <string name="pref_camera_scenemode_entry_sweepstitch">掃描綫跡</string>
   <string name="pref_camera_scenemode_entry_text">文字</string>
   <string name="pref_camera_scenemode_entry_theatre">劇院</string>
   <string name="pref_camera_scenemode_entry_whiteboard">白板</string>
diff --git a/res/values-zh-rHK/qcomstrings.xml b/res/values-zh-rHK/qcomstrings.xml
index b5ee7fcaa..b17da7c48 100644
--- a/res/values-zh-rHK/qcomstrings.xml
+++ b/res/values-zh-rHK/qcomstrings.xml
@@ -29,10 +29,6 @@
   <string name="pref_camera_autoexposure_entry_spotmetering">測光點</string>
   <string name="pref_camera_videoencoder_title">視像編解碼器</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_selectablezoneaf_title">自動對焦區域</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">自動</string>
@@ -59,7 +55,7 @@
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
-  <string name="pref_camera_antibanding_title">防條紋線</string>
+  <string name="pref_camera_antibanding_title">防條紋綫</string>
   <string name="pref_camera_antibanding_entry_0">關閉</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
   <string name="pref_camera_antibanding_entry_2">60 Hz</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index ac4104100..b026570af 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -18,20 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">2070 萬像素</string>
   <string name="pref_camera_picturesize_entry_18mp">1800 萬像素</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">1590 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">1280 萬像素</string>
   <string name="pref_camera_picturesize_entry_12_7mp">1270 萬像素</string>
+  <string name="pref_camera_picturesize_entry_12mp">1200 萬像素</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">1190 萬像素</string>
   <string name="pref_camera_picturesize_entry_11_5mp">1150 萬像素</string>
   <string name="pref_camera_picturesize_entry_10_4mp">1040 萬像素</string>
   <string name="pref_camera_picturesize_entry_10mp">1000 萬像素</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">970 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">900 萬像素</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">820 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770 萬像素</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640 萬像素</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">600 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450 萬像素</string>
+  <string name="pref_camera_picturesize_entry_4mp">400 萬像素</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">370 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250 萬像素</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">210 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190 萬像素</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_ar">增強實景</string>
@@ -52,8 +62,11 @@
   <string name="pref_camera_scenemode_entry_document">文件</string>
   <string name="pref_camera_scenemode_entry_fallcolor">秋色</string>
   <string name="pref_camera_scenemode_entry_fireworks">煙花</string>
+  <string name="pref_camera_scenemode_entry_flowers">花卉</string>
   <string name="pref_camera_scenemode_entry_indoor">室內</string>
   <string name="pref_camera_scenemode_entry_landscape">風景</string>
+  <string name="pref_camera_scenemode_entry_oldfilm">舊底片</string>
+  <string name="pref_camera_scenemode_entry_pet">寵物</string>
   <string name="pref_camera_scenemode_entry_snow">雪景</string>
   <string name="pref_camera_scenemode_entry_sports">運動</string>
   <string name="pref_camera_scenemode_entry_supernight">黑夜</string>
@@ -63,6 +76,8 @@
   <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_focusmode_entry_manual">手動</string>
+  <string name="pref_camera_coloreffect_entry_cartoonize">卡通化</string>
   <string name="pref_camera_burst_title">連拍模式</string>
   <string name="pref_camera_burst_entry_off">關閉</string>
   <string name="pref_camera_burst_entry_5">5 連拍</string>
@@ -90,6 +105,7 @@
   <string name="pref_camera_slow_shutter_entry_32s">32 秒</string>
   <string name="pref_camera_slow_shutter_entry_64s">64 秒</string>
   <string name="pref_camera_storage_title">儲存空間</string>
+  <string name="camera_menu_asd_label">智慧場景</string>
   <string name="pref_camera_power_shutter_title">電源快門</string>
   <string name="pref_superzoom_title">放大</string>
 </resources>
diff --git a/res/values-zh-rTW/qcomstrings.xml b/res/values-zh-rTW/qcomstrings.xml
index bf7ad0563..1a17402f2 100644
--- a/res/values-zh-rTW/qcomstrings.xml
+++ b/res/values-zh-rTW/qcomstrings.xml
@@ -21,9 +21,6 @@
     limitations under the License.
 -->
 <resources>
-  <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_selectablezoneaf_title">自動對焦區域</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">自動</string>
   <string name="pref_camera_hfr_entry_off">關閉</string>