Automatic translation import

Change-Id: I392a4e2fd9f2ed6451bfa87cb859ef20c5667293
author: Michael Bestas <mikeioannina@gmail.com> 2014-10-27 21:59:45 +0200
committer: Michael Bestas <mikeioannina@gmail.com> 2014-10-28 02:04:22 +0000
commit: b9c718ed77e14ad5667686284243e5de12062080 (patch)
tree: 0a95907c8eaf93e668481b183ef2a579d406f581
parent: 1d44171a01f6331180eca334dfe44791b45d1e54 (diff)
download: android_packages_apps_Camera2-b9c718ed77e14ad5667686284243e5de12062080.tar.gz
android_packages_apps_Camera2-b9c718ed77e14ad5667686284243e5de12062080.tar.bz2
android_packages_apps_Camera2-b9c718ed77e14ad5667686284243e5de12062080.zip
65 files changed, 310 insertions, 307 deletions
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 3154a832b..6f50939f6 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -24,22 +24,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 M pieksels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 M pieksels</string>
   <string name="pref_camera_picturesize_entry_10mp">10 M pieksels</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_9mp">9 M pieksels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 M pieksels</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 M pieksels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 M pieksels</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 M pieksels</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pieksels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 M pieksels</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 M pieksels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 M pieksels</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 M pieksels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Verminder vervaag beweging</string>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 71140ece9..7a109b268 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_10mp">10 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_9mp">9 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_4mp">4 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">الحد من الضبابية</string>
diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml
index e86af7ce6..c777ebf60 100644
--- a/res/values-az/cm_strings.xml
+++ b/res/values-az/cm_strings.xml
@@ -24,22 +24,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M piksel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M piksel</string>
   <string name="pref_camera_picturesize_entry_10mp">10M piksel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7M piksel</string>
   <string name="pref_camera_picturesize_entry_9mp">9M piksel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M piksel</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M piksel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M piksel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M piksel</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M piksel</string>
   <string name="pref_camera_picturesize_entry_4mp">4M piksel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M piksel</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M piksel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M piksel</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M piksel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Hərəkət bulanıqlığı azaldılması</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index cbb489eaa..ade71003f 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -18,7 +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">15,9 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>
@@ -26,22 +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">9,7 Mp</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mp</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mp</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mp</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mp</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mp</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mp</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mp</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mp</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mp</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mp</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Mp (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mp</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reducció del difuminat del moviment</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">FES BONIC</string>
   <string name="camera_menu_asd_label">ESCENA INTEL·LIGENT</string>
   <string name="pref_camera_power_shutter_title">Obturador ràpid</string>
+  <string name="pref_camera_max_brightness_title">Pantalla brillant</string>
   <string name="pref_superzoom_title">Magnifica</string>
 </resources>
diff --git a/res/values-ca/qcomstrings.xml b/res/values-ca/qcomstrings.xml
index 0f84659d6..10cc65257 100644
--- a/res/values-ca/qcomstrings.xml
+++ b/res/values-ca/qcomstrings.xml
@@ -27,7 +27,7 @@
   <string name="pref_camera_autoexposure_title">Exposició automàtica</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Mitjana de fotogrames</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada al centre</string>
-  <string name="pref_camera_autoexposure_entry_spotmetering">Medició puntual</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Mesura puntual</string>
   <string name="pref_camera_videoencoder_title">Codificador de vídeo</string>
   <string name="pref_camera_audioencoder_title">Codificador de so</string>
   <string name="pref_camera_video_duration_title">Duració del vídeo</string>
@@ -37,15 +37,19 @@
   <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>
-  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Medició puntual</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Mesura puntual</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderada al centre</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Mitjana del marc</string>
+  <string name="hdr_enable_message">L\'HDR està habilitat, només està suportat el mode d\'escena Auto</string>
+  <string name="scene_enable_message">L\'HDR no éstà suportat en modes d\'escena diferents d\'Auto</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
   <string name="pref_camera_facedetection_title">Detecció de cares</string>
   <string name="pref_camera_redeyereduction_title">Reducció d\'ulls vermells</string>
+  <string name="error_app_unsupported_hfr_selection">L\'HFR no està suportat quan l\'estabilització de vídeo, el time lapse o el vídeo HDR estan activats</string>
   <string name="error_app_unsupported_hfr">L\'HFR no està suportat per a la resolució seleccionada</string>
   <string name="error_app_unsupported_hfr_codec">Quan l\'HFR està activat només està suportada la codificació de vídeo H.264</string>
   <string name="error_app_unsupported">Resolució de vídeo no suportada en aquest tipus de codificador</string>
+  <string name="error_app_unsupported_dis">L\'estabilització de vídeo no està suportada en la resolució seleccionada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing Auto Exposició</string>
   <string name="pref_camera_hfr_title">Càmera lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desactivat</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 517bfce25..cb09f6ea5 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Mpx</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15,9 Mpx</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpx</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mpx</string>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpx</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpx</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mpx</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mpx</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpx</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mpx</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpx</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpx</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpx</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukce rozmazání</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ZKRÁŠLENÍ</string>
   <string name="camera_menu_asd_label">CHYTRÁ SCÉNA</string>
   <string name="pref_camera_power_shutter_title">Spoušť tlačítkem vypnutí</string>
+  <string name="pref_camera_max_brightness_title">Plný jas obrazovky</string>
   <string name="pref_superzoom_title">Zvětšit</string>
 </resources>
diff --git a/res/values-cs/qcomstrings.xml b/res/values-cs/qcomstrings.xml
index 878679d58..c84207cdf 100644
--- a/res/values-cs/qcomstrings.xml
+++ b/res/values-cs/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR je povoleno, je podporován pouze režim Automaticky</string>
+  <string name="scene_enable_message">HDR není podporováno v jiném režimu než Automaticky</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Detekce obličeje</string>
   <string name="pref_camera_redeyereduction_title">Redukce červených očí</string>
+  <string name="error_app_unsupported_hfr_selection">HFR není podporováno při stabilizaci, časosběru nebo při zapnutém režimu HDR</string>
   <string name="error_app_unsupported_hfr">Pro zvolené rozlišení není HFR podporováno</string>
   <string name="error_app_unsupported_hfr_codec">Pokud je zapnuto HFR, je podporován pouze kodek H.264</string>
   <string name="error_app_unsupported">Nepodporované rozlišení videa pro daný kodek</string>
+  <string name="error_app_unsupported_dis">Stabilizace videa není pro dané rozlišení podporována</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatický expoziční bracketing</string>
   <string name="pref_camera_hfr_title">Zpomalený záběr (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Vyp</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index da4140bcf..692806f27 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapixels</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapixels</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15,9 megapixels</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixels</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapixels</string>
   <string name="pref_camera_picturesize_entry_12mp">12 megapixels</string>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapixels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixels</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapixels</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 megapixels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapixels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixels</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixels</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 megapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reduktion af bevægelsesslør</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">FORSKØN</string>
   <string name="camera_menu_asd_label">SMART SCENE</string>
   <string name="pref_camera_power_shutter_title">Strømudløser</string>
+  <string name="pref_camera_max_brightness_title">Lysstærk skærm</string>
   <string name="pref_superzoom_title">Forstør</string>
 </resources>
diff --git a/res/values-da/qcomstrings.xml b/res/values-da/qcomstrings.xml
index 7e69bd720..766d9f333 100644
--- a/res/values-da/qcomstrings.xml
+++ b/res/values-da/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR er aktiveret, kun automatisk scenetilstand understøttes</string>
+  <string name="scene_enable_message">HDR understøttes ikke i anden scenetilstand end automatisk</string>
   <string name="pref_camera_video_hdr_title">Video-HDR</string>
   <string name="pref_camera_facedetection_title">Ansigtsgenkendelse</string>
   <string name="pref_camera_redeyereduction_title">Røjøjereduktion</string>
+  <string name="error_app_unsupported_hfr_selection">HFR er ikke understøttet når videostabilisering, tidsforkort eller video HDR er slået til</string>
   <string name="error_app_unsupported_hfr">HFR understøttes ikke for den valgte opløsning</string>
   <string name="error_app_unsupported_hfr_codec">Kun H.264-videokodning understøttes med HFR aktiveret</string>
   <string name="error_app_unsupported">Ikke understøttet videoopløsning for denne codectype</string>
+  <string name="error_app_unsupported_dis">Videostabilisering understøttes ikke for valgte opløsning</string>
   <string name="pref_camera_ae_bracket_hdr_title">Autoeksponerings-bracketing</string>
   <string name="pref_camera_hfr_title">Slowmotion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Fra</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index ca8ff99bb..acfa28329 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -18,7 +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">15,9 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>
@@ -26,22 +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">9,7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Bewegungsunschärfe-Reduktion</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">VERSCHÖNERN</string>
   <string name="camera_menu_asd_label">AUTOM. SZENE</string>
   <string name="pref_camera_power_shutter_title">Auslöser</string>
+  <string name="pref_camera_max_brightness_title">Heller Bildschirm</string>
   <string name="pref_superzoom_title">Vergrößern</string>
 </resources>
diff --git a/res/values-de/qcomstrings.xml b/res/values-de/qcomstrings.xml
index 621dde4ba..c5433553c 100644
--- a/res/values-de/qcomstrings.xml
+++ b/res/values-de/qcomstrings.xml
@@ -40,12 +40,15 @@
   <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="scene_enable_message">HDR wird nur im automatischen Szenenmodus unterstützt</string>
   <string name="pref_camera_video_hdr_title">Video (HDR)</string>
   <string name="pref_camera_facedetection_title">Gesichtserkennung</string>
   <string name="pref_camera_redeyereduction_title">Rote-Augen</string>
+  <string name="error_app_unsupported_hfr_selection">HFR wird nicht unterstützt, wenn Videostabilisierung, Zeitraffer oder Video-HDR aktiviert ist</string>
   <string name="error_app_unsupported_hfr">Bei der gewählten Auflösung wird HFR nicht unterstützt</string>
   <string name="error_app_unsupported_hfr_codec">Im HFR-Modus wird nur die Videokodierung in H264 unterstützt</string>
   <string name="error_app_unsupported">Die gewählte Auflösung wird von diesem Encoder nicht unterstützt</string>
+  <string name="error_app_unsupported_dis">Videostabilisierung wird für die gewählte Auflösung nicht unterstützt</string>
   <string name="pref_camera_ae_bracket_hdr_title">Belichtungsreihe</string>
   <string name="pref_camera_hfr_title">Zeitlupe (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Aus</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index d2b13930f..dd78fecaa 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -18,7 +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">15.9 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>
@@ -26,22 +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">9.7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Μείωση motion blur</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ΟΜΟΡΦΙΑ</string>
   <string name="camera_menu_asd_label">ΕΞΥΠΝΗ ΣΚΗΝΗ</string>
   <string name="pref_camera_power_shutter_title">Κλείστρο power</string>
+  <string name="pref_camera_max_brightness_title">Φωτεινή οθόνη</string>
   <string name="pref_superzoom_title">Μεγέθυνση</string>
 </resources>
diff --git a/res/values-el/qcomstrings.xml b/res/values-el/qcomstrings.xml
index 8ebcfc2c2..7158b9fd4 100644
--- a/res/values-el/qcomstrings.xml
+++ b/res/values-el/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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">Video HDR</string>
   <string name="pref_camera_facedetection_title">Εντοπισμός προσώπου</string>
   <string name="pref_camera_redeyereduction_title">Μείωση κόκκινων ματιών</string>
+  <string name="error_app_unsupported_hfr_selection">Το HFR δεν υποστηρίζεται όταν είναι ενεργή η σταθεροποίηση βίντεο, η παρέλευση χρόνου ή το video HDR</string>
   <string name="error_app_unsupported_hfr">Δεν υποστηρίζεται βίντεο υψηλού ρυθμού καρέ στην επιλεγμένη ανάλυση</string>
   <string name="error_app_unsupported_hfr_codec">Υποστηρίζεται μόνο η κωδικοποίηση H.264 κατά τη λήψη βίντεο υψηλού ρυθμού καρέ</string>
   <string name="error_app_unsupported">Μη υποστηριζόμενη ανάλυση βίντεο για αυτόν τον τύπο κωδικοποιητή</string>
+  <string name="error_app_unsupported_dis">Η σταθεροποίηση βίντεο δεν υποστηρίζεται στην επιλεγμένη ανάλυση</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing αυτόματης έκθεσης</string>
   <string name="pref_camera_hfr_title">Αργή κίνηση (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Ανενεργό</string>
diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml
index 9debe7bf6..3aa501749 100644
--- a/res/values-es-rXA/cm_strings.xml
+++ b/res/values-es-rXA/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7M pixels</string>
   <string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15.9M pixels</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8M pixels</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7M pixels</string>
   <string name="pref_camera_picturesize_entry_12mp">12M pixels</string>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M pixels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixels</string>
   <string name="pref_camera_picturesize_entry_10mp">10M pixels</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7M pixels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9M pixels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M pixels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M pixels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pixels</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M pixels</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M pixels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M pixels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M pixels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M pixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M pixels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reductor de desenfoque</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELLECER</string>
   <string name="camera_menu_asd_label">ESCENA INTELIXENTE</string>
   <string name="pref_camera_power_shutter_title">Disparador c/botón d\'encendíu</string>
+  <string name="pref_camera_max_brightness_title">Pantalla brillante</string>
   <string name="pref_superzoom_title">Ampliar</string>
 </resources>
diff --git a/res/values-es-rXA/qcomstrings.xml b/res/values-es-rXA/qcomstrings.xml
index 40cf2f774..bb2e84ccb 100644
--- a/res/values-es-rXA/qcomstrings.xml
+++ b/res/values-es-rXA/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">El HDR ta activáu. Namái ta sofitáu\'l mou d\'escena automáticu</string>
+  <string name="scene_enable_message">HDR namái ta sofitáu nel mou d\'escena automáticu</string>
   <string name="pref_camera_video_hdr_title">Videu HDR</string>
   <string name="pref_camera_facedetection_title">Detección de cares</string>
   <string name="pref_camera_redeyereduction_title">Amenorgamientu de güeyos bermeyos</string>
+  <string name="error_app_unsupported_hfr_selection">HFR nun ta sofitáu cuando tán activaos la estabilización de videu, lapsu de tiempu o videu HDR</string>
   <string name="error_app_unsupported_hfr">El videu d\'alta velocidá nun ta sofitáu pa la resolución esbillada</string>
   <string name="error_app_unsupported_hfr_codec">Cuando\'l HFR ta activáu, namái ta sofitada la codificación de videu H.264</string>
   <string name="error_app_unsupported">Resolución de videu non sofitada nesti tipu de codificador</string>
+  <string name="error_app_unsupported_dis">La estabilización de videu nun ta sofitada pa la resolución esbillada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Esposición HDR automática</string>
   <string name="pref_camera_hfr_title">Cámara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desactiváu</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index dbf3dac5a..5ace31b44 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -18,7 +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">15,9 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>
@@ -26,22 +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">9,7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reductor de desenfoque</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELLECER</string>
   <string name="camera_menu_asd_label">ESCENA INTELIGENTE</string>
   <string name="pref_camera_power_shutter_title">Disparador alternativo</string>
+  <string name="pref_camera_max_brightness_title">Pantalla de brillo máximo</string>
   <string name="pref_superzoom_title">Zoom</string>
 </resources>
diff --git a/res/values-es/qcomstrings.xml b/res/values-es/qcomstrings.xml
index 7e676dad2..4d1393323 100644
--- a/res/values-es/qcomstrings.xml
+++ b/res/values-es/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">El HDR está activado. Solo está soportado el modo de escena automático</string>
+  <string name="scene_enable_message">HDR solo está soportado en el modo de escena automático</string>
   <string name="pref_camera_video_hdr_title">Vídeo de alto rango dinámico</string>
   <string name="pref_camera_facedetection_title">Detección rostro</string>
   <string name="pref_camera_redeyereduction_title">Reducción ojos rojos</string>
+  <string name="error_app_unsupported_hfr_selection">HFR no está soportado cuando están activados la estabilización de vídeo, lapso de tiempo o vídeo HDR</string>
   <string name="error_app_unsupported_hfr">El vídeo de alta velocidad no está soportado para la resolución seleccionada</string>
   <string name="error_app_unsupported_hfr_codec">Solamente está soportado el códec H264 con el modo de vídeo de alta velocidad activado</string>
   <string name="error_app_unsupported">Resolución de vídeo no soportada para este tipo de códec</string>
+  <string name="error_app_unsupported_dis">La estabilización de vídeo no está soportada para la resolución seleccionada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Exposición HDR automática</string>
   <string name="pref_camera_hfr_title">Cámara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desactivado</string>
diff --git a/res/values-et/cm_strings.xml b/res/values-et/cm_strings.xml
index 1f8aff641..d2dc1c593 100644
--- a/res/values-et/cm_strings.xml
+++ b/res/values-et/cm_strings.xml
@@ -24,22 +24,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M pikslit</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M pikslit</string>
   <string name="pref_camera_picturesize_entry_10mp">10M pikslit</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7M pikslit</string>
   <string name="pref_camera_picturesize_entry_9mp">9M pikslit</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M pikslit</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M pikslit</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M pikslit</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pikslit</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M pikslit</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pikslit</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M pikslit</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M pikslit</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M pikslit</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M pikslit</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Liikuva hägu vähendamine</string>
diff --git a/res/values-eu/cm_strings.xml b/res/values-eu/cm_strings.xml
index 61691d90e..864b64815 100644
--- a/res/values-eu/cm_strings.xml
+++ b/res/values-eu/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10,4M pixel</string>
   <string name="pref_camera_picturesize_entry_10mp">10M pixel</string>
   <string name="pref_camera_picturesize_entry_9mp">9M pixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2M pixel</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7M pixel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4M pixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pixel</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5M pixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7M pixel</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5M pixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1M pixel</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9M pixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Desenfoke murriztailea</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index edc724271..8cc2683dc 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -18,7 +18,6 @@
 <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">15.9 megapikseliä</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>
@@ -26,22 +25,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapikseliä</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapikseliä</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Liikkeen sumennuksen vähentäminen</string>
@@ -133,5 +126,6 @@
   <string name="camera_menu_beauty_mode_label">KAUNISTUS</string>
   <string name="camera_menu_asd_label">ÄLYKÄS KOHTAUS</string>
   <string name="pref_camera_power_shutter_title">Kuvaus virtanäppäimellä</string>
+  <string name="pref_camera_max_brightness_title">Kirkas näyttö</string>
   <string name="pref_superzoom_title">Suurenna</string>
 </resources>
diff --git a/res/values-fi/qcomstrings.xml b/res/values-fi/qcomstrings.xml
index e2d9559db..575f7ccda 100644
--- a/res/values-fi/qcomstrings.xml
+++ b/res/values-fi/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR on käytössä, vain automaattinen tila on käytettävissä</string>
+  <string name="scene_enable_message">HDR:ää ei tueta kuin automaattisessa tilassa</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Kasvojentunnistus</string>
   <string name="pref_camera_redeyereduction_title">Punasilmäisyyden vähentäminen</string>
+  <string name="error_app_unsupported_hfr_selection">HFR ei tuettu kun videon vakauttaminen, viivästys tai video HDR on käytössä</string>
   <string name="error_app_unsupported_hfr">HFR:ää ei tueta valitulla resoluutiolla</string>
   <string name="error_app_unsupported_hfr_codec">Vain H.264 videokoodaus on tuettu kun HFR on käytössä</string>
   <string name="error_app_unsupported">Videon resoluutiota ei tueta tällä koodaustyypillä</string>
+  <string name="error_app_unsupported_dis">Videon vakauttamista ei tueta valitulla resoluutiolla</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automaattisen valotuksen kiinnitys</string>
   <string name="pref_camera_hfr_title">Hidastus (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Pois käytöstä</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 3a069ff82..a160fd41c 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -18,28 +18,30 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 mégapixels</string>
   <string name="pref_camera_picturesize_entry_18mp">18 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 mégapixels</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 mégapixels</string>
   <string name="pref_camera_picturesize_entry_12mp">12 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 mégapixels</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 mégapixels</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 mégapixels</string>
   <string name="pref_camera_picturesize_entry_10mp">10 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 mégapixels</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 mégapixels</string>
   <string name="pref_camera_picturesize_entry_4mp">4 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 mégapixels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 mégapixels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 mégapixels (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 mégapixels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Réduction de flou de mouvement</string>
@@ -131,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELLIR</string>
   <string name="camera_menu_asd_label">SCÈNE INTELLIGENTE</string>
   <string name="pref_camera_power_shutter_title">Bouton marche</string>
+  <string name="pref_camera_max_brightness_title">Écran lumineux</string>
   <string name="pref_superzoom_title">Magnifier</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index d387c960d..68f408fc8 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapixel</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15,9 megapixel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixel</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_12mp">12 megapixel</string>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixel</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapixel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 megapixel</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Elmosódás csökkentés</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EFFEKTEK</string>
   <string name="camera_menu_asd_label">OKOS KÉP</string>
   <string name="pref_camera_power_shutter_title">Bekapcsoló gombbal exponálás</string>
+  <string name="pref_camera_max_brightness_title">Világos képernyő</string>
   <string name="pref_superzoom_title">Nagyítás</string>
 </resources>
diff --git a/res/values-hu/qcomstrings.xml b/res/values-hu/qcomstrings.xml
index 3ed5fd180..26321c937 100644
--- a/res/values-hu/qcomstrings.xml
+++ b/res/values-hu/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR engedélyezve, csak az automatikus jelenet mód támogatott</string>
+  <string name="scene_enable_message">A HDR csak automatikus módban támogatott</string>
   <string name="pref_camera_video_hdr_title">Videó HDR</string>
   <string name="pref_camera_facedetection_title">Arckeresés</string>
   <string name="pref_camera_redeyereduction_title">Vörösszem csökkentés</string>
+  <string name="error_app_unsupported_hfr_selection">A HFR nem támogatott videó stabilizációnál, time lapse videónál vagy bekapcsolt HDR-nél</string>
   <string name="error_app_unsupported_hfr">A HFR nem támogatott a kiválasztott felbontásnál</string>
   <string name="error_app_unsupported_hfr_codec">Bekapcsolt HFR esetén csak a H264 videó kódolás támogatott</string>
   <string name="error_app_unsupported">Nem támogatott videófelbontás ehhez a tömörítőhöz</string>
+  <string name="error_app_unsupported_dis">A videó stabilizáció nem támogatott ennél a felbontásnál</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatikus expozíció sorozat</string>
   <string name="pref_camera_hfr_title">Lassú mozgás (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Ki</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 1e96412af..f085fb227 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -16,32 +16,32 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 M piksel</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 M piksel</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15,9 M piksel</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 M piksel</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 M piksel</string>
+  <string name="pref_camera_picturesize_entry_20_7mp">20,7M piksel</string>
+  <string name="pref_camera_picturesize_entry_18mp">18M piksel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_12_8mp">12,8M piksel</string>
+  <string name="pref_camera_picturesize_entry_12_7mp">12,7M piksel</string>
   <string name="pref_camera_picturesize_entry_12mp">12M piksel</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 M piksel</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 M piksel</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 M piksel</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 M piksel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7M piksel</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 M piksel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 M piksel</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 M piksel</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 M piksel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 M piksel</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 M piksel</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9M piksel</string>
+  <string name="pref_camera_picturesize_entry_11_5mp">11,5M piksel</string>
+  <string name="pref_camera_picturesize_entry_10_4mp">10,4M piksel</string>
+  <string name="pref_camera_picturesize_entry_10mp">10M piksel</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_9mp">9M piksel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7,7M piksel</string>
+  <string name="pref_camera_picturesize_entry_6_4mp">6,4M piksel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_4_5mp">4,5M piksel</string>
   <string name="pref_camera_picturesize_entry_4mp">4M piksel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 M piksel</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 M piksel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 M piksel</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 M piksel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_2_5mp">2,5M piksel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1M piksel (16:9)</string>
+  <string name="pref_camera_picturesize_entry_1_9mp">1,9M piksel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reduksi gerakan kabur</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">PERCANTIK</string>
   <string name="camera_menu_asd_label">ADEGAN PINTAR</string>
   <string name="pref_camera_power_shutter_title">Bidik tombol power</string>
+  <string name="pref_camera_max_brightness_title">Layar cerah</string>
   <string name="pref_superzoom_title">Memperbesar</string>
 </resources>
diff --git a/res/values-in/qcomstrings.xml b/res/values-in/qcomstrings.xml
index 378842363..466cc8ac8 100644
--- a/res/values-in/qcomstrings.xml
+++ b/res/values-in/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR diaktifkan, hanya mode adegan Auto yang didukung</string>
+  <string name="scene_enable_message">HDR tidak didukung pada mode adegan selain Auto</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Deteksi wajah</string>
   <string name="pref_camera_redeyereduction_title">Reduksi mata merah</string>
+  <string name="error_app_unsupported_hfr_selection">HFR tidak didukung ketika stabilisasi video, video selang waktu atau video HDR aktif</string>
   <string name="error_app_unsupported_hfr">HFR tidak didukung untuk resolusi yang dipilih</string>
   <string name="error_app_unsupported_hfr_codec">Hanya enkoding video H.264 yang didukung ketika HFR</string>
   <string name="error_app_unsupported">Resolusi video tidak didukung untuk jenis codec ini</string>
+  <string name="error_app_unsupported_dis">Stabilisasi video tidak didukung untuk resolusi yang dipilih</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
   <string name="pref_camera_hfr_title">Gerakan lambat (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Nonaktif</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index b8aba239c..949c0f191 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mpixel</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15,9 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpixel</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpixel</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mpixel</string>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpixel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpixel</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 Mpixels</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpixel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpixel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Mpixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Riduzione sfocatura da movimento</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ABBELLISCI</string>
   <string name="camera_menu_asd_label">SCENA AUTOMATICA</string>
   <string name="pref_camera_power_shutter_title">Scatta tasto On/Off</string>
+  <string name="pref_camera_max_brightness_title">Schermo luminoso</string>
   <string name="pref_superzoom_title">Ingrandimento</string>
 </resources>
diff --git a/res/values-it/qcomstrings.xml b/res/values-it/qcomstrings.xml
index 7c33b184f..f3f2bbff9 100644
--- a/res/values-it/qcomstrings.xml
+++ b/res/values-it/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR é attivo, solo la modalità scena automatica é supportata</string>
+  <string name="scene_enable_message">HDR non è supportato in nessuna modalità scena ad esclusione di quella automatica</string>
   <string name="pref_camera_video_hdr_title">HDR video</string>
   <string name="pref_camera_facedetection_title">Rilevamento volti</string>
   <string name="pref_camera_redeyereduction_title">Riduzione occhi rossi</string>
+  <string name="error_app_unsupported_hfr_selection">HFR non è supportato quando sono attivi stabilizzazione del video, time lapse o HDR</string>
   <string name="error_app_unsupported_hfr">HFR non è supportato per la risoluzione selezionata</string>
   <string name="error_app_unsupported_hfr_codec">Quando HFR è attivo è consentita solo la codifica H.264 per il video</string>
   <string name="error_app_unsupported">Risoluzione non supportata per questo codec video</string>
+  <string name="error_app_unsupported_dis">La stabilizzazione video non è supportata con la risoluzione selezionata</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
   <string name="pref_camera_hfr_title">Rallentatore (HFR)</string>
   <string name="pref_camera_hfr_entry_off">OFF</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 8e29aa3c4..e34bdbdff 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -24,22 +24,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_10mp">10 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_9mp">9 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_4mp">4 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 מגה פיקסל</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 מגה פיקסל</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">הפחתת טשטוש תנועה</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 265affdb0..63c9ed21b 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -18,7 +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">15.9メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8メガピクセル</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7メガピクセル</string>
   <string name="pref_camera_picturesize_entry_12mp">12メガピクセル</string>
@@ -26,22 +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">9.7メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_9mp">9メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7メガピクセル</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_6mp">6メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5メガピクセル</string>
   <string name="pref_camera_picturesize_entry_4mp">4メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5メガピクセル</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1メガピクセル</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1メガピクセル（16:9）</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9メガピクセル</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD（16:9）</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">被写体ブレ軽減</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ビューティー化</string>
   <string name="camera_menu_asd_label">スマートシーン</string>
   <string name="pref_camera_power_shutter_title">電源シャッター</string>
+  <string name="pref_camera_max_brightness_title">明るい画面</string>
   <string name="pref_superzoom_title">拡大</string>
 </resources>
diff --git a/res/values-ja/qcomstrings.xml b/res/values-ja/qcomstrings.xml
index fb5fc45a0..3b451c97e 100644
--- a/res/values-ja/qcomstrings.xml
+++ b/res/values-ja/qcomstrings.xml
@@ -40,13 +40,17 @@
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">スポット測光</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">中央部重点測光</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">フレームアベレージ</string>
-  <string name="pref_camera_video_hdr_title">ビデオHDR</string>
+  <string name="hdr_enable_message">HDRが有効です、オートシーンモードのみサポートされています</string>
+  <string name="scene_enable_message">オート以外のシーンモードではHDRはサポートされていません</string>
+  <string name="pref_camera_video_hdr_title">HDR動画</string>
   <string name="pref_camera_facedetection_title">顔検出</string>
-  <string name="pref_camera_redeyereduction_title">赤目の軽減</string>
+  <string name="pref_camera_redeyereduction_title">赤目軽減</string>
+  <string name="error_app_unsupported_hfr_selection">動画安定化、低速度撮影またはHDR動画がONになっているときはHFRはサポートされていません。</string>
   <string name="error_app_unsupported_hfr">選択された解像度ではHFRはサポートされていません</string>
   <string name="error_app_unsupported_hfr_codec">HFRがONのときはH.264ビデオエンコードのみサポートされています</string>
   <string name="error_app_unsupported">このコーデックの種類ではサポートされていない動画の解像度です</string>
-  <string name="pref_camera_ae_bracket_hdr_title">自動露出ブラケット</string>
+  <string name="error_app_unsupported_dis">選択した解像度では動画安定化はサポートされていません</string>
+  <string name="pref_camera_ae_bracket_hdr_title">自動段階露出</string>
   <string name="pref_camera_hfr_title">スローモーション（HFR）</string>
   <string name="pref_camera_hfr_entry_off">OFF</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 5d0de7af0..441b2878f 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -18,7 +18,7 @@
 <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">1590만 화소</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>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">1150만 화소</string>
   <string name="pref_camera_picturesize_entry_10_4mp">1040만 화소</string>
   <string name="pref_camera_picturesize_entry_10mp">1000만 화소</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">970만 화소</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">970만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">900만 화소</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">820만 화소</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">820만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770만 화소</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640만 화소</string>
-  <string name="pref_camera_picturesize_entry_6mp">600만 화소</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">600만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450만 화소</string>
   <string name="pref_camera_picturesize_entry_4mp">400만 화소</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">370만 화소</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">370만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250만 화소</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">210만 화소</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">210만 화소 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190만 화소</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">모션 블러 감소</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">피부 보정</string>
   <string name="camera_menu_asd_label">스마트 씬</string>
   <string name="pref_camera_power_shutter_title">전원 셔터</string>
+  <string name="pref_camera_max_brightness_title">밝은 화면</string>
   <string name="pref_superzoom_title">확대</string>
 </resources>
diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml
index c7f05384c..1ba29b295 100644
--- a/res/values-ko/qcomstrings.xml
+++ b/res/values-ko/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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">HFR은 비디오 안정화, 타임 랩스, 또는 비디오 HDR과 함께 사용될 수 없습니다</string>
   <string name="error_app_unsupported_hfr">선택된 해상도에서 HFR은 지원되지 않습니다</string>
   <string name="error_app_unsupported_hfr_codec">HFR이 켜져 있어야 H.264 인코딩이 가능합니다</string>
   <string name="error_app_unsupported">이 코덱이 지원하지 않는 해상도입니다</string>
+  <string name="error_app_unsupported_dis">선택된 해상도에서는 비디오 안정화가 지원되지 않습니다</string>
   <string name="pref_camera_ae_bracket_hdr_title">자동 노출 브래킷</string>
   <string name="pref_camera_hfr_title">슬로우 모션 (HFR)</string>
   <string name="pref_camera_hfr_entry_off">꺼짐</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 32dfde732..ecc62fb99 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_10mp">10 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_9mp">9 مێگاپێکسڵ</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 مێگاپێکسڵ</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_4mp">4 مێگاپێکسڵ</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 مێگاپێکسڵ</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 مێگاپێکسڵ</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">که‌مکردنه‌وه‌ی ته‌ڵخبوونی جوڵه‌</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index ed856d130..9f143e0be 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10,4M Pixelen</string>
   <string name="pref_camera_picturesize_entry_10mp">10M Pixelen</string>
   <string name="pref_camera_picturesize_entry_9mp">9M Pixelen</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2M Pixelen</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7M Pixelen</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4M Pixelen</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M Pixelen</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5M Pixelen</string>
   <string name="pref_camera_picturesize_entry_4mp">4M Pixelen</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7M Pixelen</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5M Pixelen</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1M Pixelen</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9M Pixelen</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_beach">Plage</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 2c01417be..535d5ac88 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -18,7 +18,6 @@
 <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">15,9 MP</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>
@@ -26,22 +25,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 MP</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 MP</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 MP</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 MP</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Judesių liejimosi mažinimas</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index a629db2ed..64644460a 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -18,7 +18,6 @@
 <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">15.9M punkti</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8M punkti</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7M punkti</string>
   <string name="pref_camera_picturesize_entry_12mp">12M punkti</string>
@@ -26,22 +25,16 @@
   <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">9.7M punkti</string>
   <string name="pref_camera_picturesize_entry_9mp">9M punkti</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M punkti</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M punkti</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M punkti</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M punkti</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M punkti</string>
   <string name="pref_camera_picturesize_entry_4mp">4M punkti</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M punkti</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M punkti</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M punkti</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M punkti</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Kustības miglojuma samazināšana</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index d8cbc05eb..d77c5752a 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapiksler</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15.9 M piksler</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapiksler</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapiksler</string>
   <string name="pref_camera_picturesize_entry_12mp">12M piksler</string>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapiksler</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapiksler</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 M piksler</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapiksler</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapiksler</string>
   <string name="pref_camera_picturesize_entry_4mp">4M piksler</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapiksler</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapiksler</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 M piksler (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapiksler</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Bevegelsesuskarphet reduksjon</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">FORSKJØNNE</string>
   <string name="camera_menu_asd_label">SMART SCENE</string>
   <string name="pref_camera_power_shutter_title">Påknapp som utløser</string>
+  <string name="pref_camera_max_brightness_title">Lys skjerm</string>
   <string name="pref_superzoom_title">Forstørre</string>
 </resources>
diff --git a/res/values-nb/qcomstrings.xml b/res/values-nb/qcomstrings.xml
index d310cd1d1..440cdfd74 100644
--- a/res/values-nb/qcomstrings.xml
+++ b/res/values-nb/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR er aktivert, automatisk scene modus støttes</string>
+  <string name="scene_enable_message">HDR støttes ikke i denne scenemodusen annet enn Auto</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Ansiktsgjenkjenning</string>
   <string name="pref_camera_redeyereduction_title">Reduksjon av røde øyne</string>
+  <string name="error_app_unsupported_hfr_selection">HFR støttes ikke når videostabilisering, tidsforløp eller video HDR er på</string>
   <string name="error_app_unsupported_hfr">HFR støttes ikke for valgt oppløsning</string>
   <string name="error_app_unsupported_hfr_codec">Bare H.264 video-koding støttes når HFR er på</string>
   <string name="error_app_unsupported">Ustøttet skjermoppløsning for denne kodeken</string>
+  <string name="error_app_unsupported_dis">Videostabilisering støttes ikke for valgt oppløsning</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
   <string name="pref_camera_hfr_title">Slow Motion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Av</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index ca4d7c1e1..4a03e39e7 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -18,30 +18,27 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_18mp">18 megapixel</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15.9 megapixel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixel</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_12mp">12 megapixel</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 megapixel</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11,9 megapixel</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixel</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapixel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 megapixel</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 megapixel (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixel</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixel</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixel</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Beweging verscherpen</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 0876f892e..17a45334e 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -21,25 +21,20 @@
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpix</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpix</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mpix</string>
+  <string name="pref_camera_picturesize_entry_11_9mp">11.9 Mpix</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpix</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpix</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mpix</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 Mpix</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mpix</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpix</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpix</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpix</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mpix</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpix</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mpix</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpix</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpix</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpix</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpix</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukcja rozmazywania</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 819157722..eb6850cba 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -18,7 +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">15.9 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>
@@ -26,22 +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">9.7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redução de borrões de movimento</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELEZAR</string>
   <string name="camera_menu_asd_label">CENA AUTOMÁTICA</string>
   <string name="pref_camera_power_shutter_title">Disparador c/ botão de energia</string>
+  <string name="pref_camera_max_brightness_title">Tela brilhante</string>
   <string name="pref_superzoom_title">Ampliar</string>
 </resources>
diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml
index 6fc0cee7c..f277f1588 100644
--- a/res/values-pt-rBR/qcomstrings.xml
+++ b/res/values-pt-rBR/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR está ativado, somente o modo de cena Auto é suportado</string>
+  <string name="scene_enable_message">HDR não é suportado em modo de cena diferente de Auto</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
   <string name="pref_camera_facedetection_title">Detecção Facial</string>
   <string name="pref_camera_redeyereduction_title">Redução de olhos vermelhos</string>
+  <string name="error_app_unsupported_hfr_selection">HFR não é suportado quando a estabilização de vídeo, passar do tempo ou vídeo HDR estiverem ativados</string>
   <string name="error_app_unsupported_hfr">HFR não é suportado para a resolução selecionada</string>
   <string name="error_app_unsupported_hfr_codec">Só encoding do tipo H.264 é permitido quando o HFR está ligado</string>
   <string name="error_app_unsupported">Resolução de vídeo não suportada para este tipo de codec</string>
+  <string name="error_app_unsupported_dis">A estabilização de vídeo não é suportada para a resolução selecionada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing de auto-exposição</string>
   <string name="pref_camera_hfr_title">Câmara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desligar</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 7e821bbdf..3650ad5c4 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -18,7 +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">15.9 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>
@@ -26,22 +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">9.7 MP</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 MP</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
   <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 MP</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 MP</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redução da desfocagem de movimento</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">EMBELEZAR</string>
   <string name="camera_menu_asd_label">CENA INTELIGENTE</string>
   <string name="pref_camera_power_shutter_title">Disparar com botão de ligar</string>
+  <string name="pref_camera_max_brightness_title">Ecrã brilhante</string>
   <string name="pref_superzoom_title">Ampliar</string>
 </resources>
diff --git a/res/values-pt-rPT/qcomstrings.xml b/res/values-pt-rPT/qcomstrings.xml
index a507b1a4d..38cd8bf53 100644
--- a/res/values-pt-rPT/qcomstrings.xml
+++ b/res/values-pt-rPT/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR está ativado, só o modo de cenário automático é suportado</string>
+  <string name="scene_enable_message">HDR não é suportado noutro modo de cenário diferente do automático</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
   <string name="pref_camera_facedetection_title">Deteção de rosto</string>
   <string name="pref_camera_redeyereduction_title">Redução de olhos vermelhos</string>
+  <string name="error_app_unsupported_hfr_selection">HFR não é suportado quando a estabilização de vídeo ou o video HDR estiverem ativados</string>
   <string name="error_app_unsupported_hfr">HFR não é suportado para a resolução selecionada</string>
   <string name="error_app_unsupported_hfr_codec">Apenas é suportada codificação de vídeo H.264 quando HFR está ligado</string>
   <string name="error_app_unsupported">Resolução de vídeo não suportada para este tipo de codec</string>
+  <string name="error_app_unsupported_dis">A estabilização de vídeo não é suportada para a resolução selecionada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Escalonamento de Exposição Automática</string>
   <string name="pref_camera_hfr_title">Câmara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desligar</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 090e583b1..7a6cac8d6 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixeli</string>
   <string name="pref_camera_picturesize_entry_10mp">10M pixeli</string>
   <string name="pref_camera_picturesize_entry_9mp">9M pixeli</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M pixeli</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixeli</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M pixeli</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pixeli</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M pixeli</string>
   <string name="pref_camera_picturesize_entry_4mp">4M pixeli</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M pixeli</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M pixeli</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M pixeli</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M pixeli</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reducerea umbrei de mișcare</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 8d744d3f4..b1fa07ef6 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -18,7 +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">15,9 Мпикс</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Мпикс.</string>
@@ -26,22 +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">9,7 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Мпикс.</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Мпикс.</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 Мпикс. (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Мпикс.</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Устранение разм. движения</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">АВТОУЛУЧШЕНИЕ</string>
   <string name="camera_menu_asd_label">РАСПОЗН. УСЛОВИЙ СЪЕМКИ</string>
   <string name="pref_camera_power_shutter_title">Съёмка кн. питания</string>
+  <string name="pref_camera_max_brightness_title">Яркий экран</string>
   <string name="pref_superzoom_title">Увеличение</string>
 </resources>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
index 68bc1f106..705f86dc3 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -18,7 +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">මෙගා පික්සල 15.9</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">මෙගා පික්සල 15.9 (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">මෙගා පික්සල 12.8</string>
   <string name="pref_camera_picturesize_entry_12_7mp">මෙගා පික්සල 12.7</string>
   <string name="pref_camera_picturesize_entry_12mp">මෙගා පික්සල 12</string>
@@ -26,22 +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">මෙගා පික්සල 9.7</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">මෙගා පික්සල 9.7 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">මෙගා පික්සල 9</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">මෙගා පික්සල 8.2</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">මෙගා පික්සල 8.2 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">මෙගා පික්සල 7.7</string>
   <string name="pref_camera_picturesize_entry_6_4mp">මෙගා පික්සල 6.4</string>
-  <string name="pref_camera_picturesize_entry_6mp">මෙගා පික්සල 6</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">මෙගා පික්සල 6 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">මෙගා පික්සල 4.5</string>
   <string name="pref_camera_picturesize_entry_4mp">මෙගා පික්සල 4</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">මෙගා පික්සල 3.7</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">මෙගා පික්සල 3.7 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">මෙගා පික්සල 2.5</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">මෙගා පික්සල 2.1</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">මෙගා පික්සල 2.1 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">මෙගා පික්සල 1.9</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">චලන අවිශදතාව අඩුකිරීම</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ලස්සණ කිරීම</string>
   <string name="camera_menu_asd_label">දැකුම්කලු දර්ශනය</string>
   <string name="pref_camera_power_shutter_title">බල ශටරය</string>
+  <string name="pref_camera_max_brightness_title">දීප්තිමත් තිරය</string>
   <string name="pref_superzoom_title">විශාලනය කරන්න</string>
 </resources>
diff --git a/res/values-si/qcomstrings.xml b/res/values-si/qcomstrings.xml
index f14a4fa55..1b1365a02 100644
--- a/res/values-si/qcomstrings.xml
+++ b/res/values-si/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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 සක්‍රීය විට HFR සහාය නොදක්වයි</string>
   <string name="error_app_unsupported_hfr">තෝරාගත් විභේදනය සඳහා HFR සහාය නොදක්වයි</string>
   <string name="error_app_unsupported_hfr_codec">HFR සක්‍රීය විට H.264 වීඩියෝ සංකේතනය පමණක් සහාය දක්වයි</string>
   <string name="error_app_unsupported">මෙම කොඩෙක් ආකාරය සඳහා සහාය නොදක්වන වීඩියෝ විභේදනයකි</string>
+  <string name="error_app_unsupported_dis">තෝරාගත් විභේදනය සඳහා වීඩියෝ ස්ථාවරකිරීම සහාය නොදක්වයි</string>
   <string name="pref_camera_ae_bracket_hdr_title">ස්වයං නිරාවරණ සවිකිරීම</string>
   <string name="pref_camera_hfr_title">මන්ද චලනය (HFR)</string>
   <string name="pref_camera_hfr_entry_off">අක්‍රීයයි</string>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index e303ae23a..dd52ce6bc 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_18mp">18 Mpx</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15.9Mpx</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpx</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_12mp">12 Mpx</string>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpx</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpx</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Mpx</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Mpx</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpx</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpx</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Mpx</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpx</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpx</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 Mpx (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpx</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukcia rozmazania pohybu</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">SKRÁŠLENIE</string>
   <string name="camera_menu_asd_label">INTELIGENTNÁ SCÉNA</string>
   <string name="pref_camera_power_shutter_title">Uzávierka tlačidlom napájania</string>
+  <string name="pref_camera_max_brightness_title">Jasná obrazovka</string>
   <string name="pref_superzoom_title">Zväčšenie</string>
 </resources>
diff --git a/res/values-sk/qcomstrings.xml b/res/values-sk/qcomstrings.xml
index 600b0ec16..5d92f936c 100644
--- a/res/values-sk/qcomstrings.xml
+++ b/res/values-sk/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR je povolené, podporovaný je iba Automatickom režime scény</string>
+  <string name="scene_enable_message">HDR nie je podporované v režime scény inej ako Automatickej</string>
   <string name="pref_camera_video_hdr_title">HDR video</string>
   <string name="pref_camera_facedetection_title">Detekcia tvárí</string>
   <string name="pref_camera_redeyereduction_title">Redukcia červených očí</string>
+  <string name="error_app_unsupported_hfr_selection">HFR nie je podporované pri stabilizácii videa, časového oneskorenia alebo pri zapnutom HDR videu</string>
   <string name="error_app_unsupported_hfr">HFR nie je podporované pre vybrané rozlíšenie</string>
   <string name="error_app_unsupported_hfr_codec">Kódovanie videa H.264 je podporované iba pri zapnutom HFR</string>
   <string name="error_app_unsupported">Nepodporované rozlíšenie videa pre tento typ kodeka</string>
+  <string name="error_app_unsupported_dis">Stabilizácia videa nie je podporovaná pre vybraté rozlíšenie</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatické posúvanie expozície</string>
   <string name="pref_camera_hfr_title">Spomalenie (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Vypnuté</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index d1b3e84d8..8e6f11b6f 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -18,7 +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">15.9 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_12mp">12 мегапиксела</string>
@@ -26,22 +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">9.7 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_4mp">4 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 мегапиксела</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 мегапиксела</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 мегапиксела (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 мегапиксела</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Редукција замагљеног покрета</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">УЛЕПШАВАЊЕ</string>
   <string name="camera_menu_asd_label">ПАМЕТНА СЦЕНА</string>
   <string name="pref_camera_power_shutter_title">Алтернативни окидач</string>
+  <string name="pref_camera_max_brightness_title">Светли екран</string>
   <string name="pref_superzoom_title">Увеличај</string>
 </resources>
diff --git a/res/values-sr/qcomstrings.xml b/res/values-sr/qcomstrings.xml
index 69eeaac1d..6f8be47a1 100644
--- a/res/values-sr/qcomstrings.xml
+++ b/res/values-sr/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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">HFR није подржан када је видео стабилизација, проток времена или видео HDR укључен</string>
   <string name="error_app_unsupported_hfr">HFR није подржан за изабрану резолуцију</string>
   <string name="error_app_unsupported_hfr_codec">Само H.264 видео кодирање је подржано када је HFR укључен</string>
   <string name="error_app_unsupported">Неподржана видео резолуција за овај тип кодека</string>
+  <string name="error_app_unsupported_dis">Видео стабилизација није подржана за одабрану резолуцију</string>
   <string name="pref_camera_ae_bracket_hdr_title">Држање аутоматске експозиције</string>
   <string name="pref_camera_hfr_title">Успорено кретање (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Искључено</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index d86b87e5a..b4a38c8d3 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -24,20 +24,15 @@
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixlar</string>
   <string name="pref_camera_picturesize_entry_10mp">10 megapixlar</string>
   <string name="pref_camera_picturesize_entry_9mp">9 megapixlar</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixlar</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixlar</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixlar</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixlar</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixlar</string>
   <string name="pref_camera_picturesize_entry_4mp">4 megapixlar</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixlar</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixlar</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixlar</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixlar</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reducera rörelseoskärpa</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 73b065fb8..e44a4f6ca 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -18,7 +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">15.9 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_12mp">12 ล้านพิกเซล</string>
@@ -26,22 +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">9.7 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_4mp">4 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 ล้านพิกเซล</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 ล้านพิกเซล</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 ล้านพิกเซล (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9 ล้านพิกเซล</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">ลดเบลอเคลื่อนไหว</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">ตกแต่ง</string>
   <string name="camera_menu_asd_label">สมาร์ทซีน</string>
   <string name="pref_camera_power_shutter_title">ชัตเตอร์ปุ่มเพาเวอร์</string>
+  <string name="pref_camera_max_brightness_title">หน้าจอสว่าง</string>
   <string name="pref_superzoom_title">ขยาย</string>
 </resources>
diff --git a/res/values-th/qcomstrings.xml b/res/values-th/qcomstrings.xml
index ebce42ee1..adaf4b866 100644
--- a/res/values-th/qcomstrings.xml
+++ b/res/values-th/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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">HFR ไม่สามารถใช้งานได้ขณะใช้งานลดกานสั่นวิดีโอ Time lapse หรือวิดีโอ HDR อยู่</string>
   <string name="error_app_unsupported_hfr">HFR ไม่สนับสนุนความละเอียดที่เลือก</string>
   <string name="error_app_unsupported_hfr_codec">เข้ารหัสได้เฉพาะ H.264 เมื่อเปิด HFR</string>
   <string name="error_app_unsupported">ไม่รองรับขนาดที่เลือกสำหรับการเข้ารหัสนี้</string>
+  <string name="error_app_unsupported_dis">ลดการสั่นของวิดีโอไม่สามารถใช้งานได้ในความละเอียดนี้</string>
   <string name="pref_camera_ae_bracket_hdr_title">Auto Exposure Bracketing</string>
   <string name="pref_camera_hfr_title">Slow Motion (HFR)</string>
   <string name="pref_camera_hfr_entry_off">ปิด</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 4c1d6b7f8..700654b2b 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pref_camera_picturesize_entry_20_7mp">20.7M piksel</string>
   <string name="pref_camera_picturesize_entry_18mp">18M piksel</string>
-  <string name="pref_camera_picturesize_entry_15_9mp">15.9M piksel</string>
+  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8M piksel</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7M piksel</string>
   <string name="pref_camera_picturesize_entry_12mp">12M piksel</string>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11.5M piksel</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4M piksel</string>
   <string name="pref_camera_picturesize_entry_10mp">10M piksel</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9.7 Megapiksel</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">9M piksel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M piksel</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7.7M piksel</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4M piksel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M piksel</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">6M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5M piksel</string>
   <string name="pref_camera_picturesize_entry_4mp">4M piksel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M piksel</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5M piksel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M piksel</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M piksel (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1.9M piksel</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Hareket bulanıklığı düşürücü</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">GÜZELLİK</string>
   <string name="camera_menu_asd_label">AKILLI SAHNE</string>
   <string name="pref_camera_power_shutter_title">Güç tuşuyla çek</string>
+  <string name="pref_camera_max_brightness_title">Parlak ekran</string>
   <string name="pref_superzoom_title">Büyüt</string>
 </resources>
diff --git a/res/values-tr/qcomstrings.xml b/res/values-tr/qcomstrings.xml
index 9d46b19df..4d7e661b7 100644
--- a/res/values-tr/qcomstrings.xml
+++ b/res/values-tr/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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="hdr_enable_message">HDR etkinleştirildi, sadece Otomatik mod destekleniyor</string>
+  <string name="scene_enable_message">HDR, Otomatik mod dışında sahne modunda desteklenmiyor</string>
   <string name="pref_camera_video_hdr_title">Video HDR</string>
   <string name="pref_camera_facedetection_title">Yüz tanıma</string>
   <string name="pref_camera_redeyereduction_title">Kırmızı göz giderme</string>
+  <string name="error_app_unsupported_hfr_selection">HFR, video görüntü sabitleme, hızlandırılmış çekim ya da video HDR açıkken desteklenmiyor</string>
   <string name="error_app_unsupported_hfr">HFR seçilen çözünürlükte desteklenmiyor</string>
   <string name="error_app_unsupported_hfr_codec">HFR açıkken sadece H.264 video kodlaması desteklenmektedir</string>
   <string name="error_app_unsupported">Bu kodlayıcı için desteklenmeyen video çözünürlüğü</string>
+  <string name="error_app_unsupported_dis">Video görüntü sabitleme seçilen çözünürlük için desteklenmiyor</string>
   <string name="pref_camera_ae_bracket_hdr_title">Otomatik Poz Tarama</string>
   <string name="pref_camera_hfr_title">Ağır Çekim (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Kapalı</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
deleted file mode 100644
index e3664282d..000000000
--- a/res/values-ug/cm_strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1 مىليون پىكسېل</string>
-</resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index e71599b46..30399b86f 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -18,7 +18,6 @@
 <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">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>
@@ -26,22 +25,16 @@
   <string name="pref_camera_picturesize_entry_11_5mp">11,5 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10,4 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_10mp">10 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">9,7 Мпікс</string>
   <string name="pref_camera_picturesize_entry_9mp">9 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_7_7mp">7,7 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_4mp">4 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2,5 Мпікс.</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_1_9mp">1,9 Мпікс.</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Зменшення розмиття руху</string>
@@ -133,5 +126,6 @@
   <string name="camera_menu_beauty_mode_label">ПОКРАЩЕННЯ</string>
   <string name="camera_menu_asd_label">РОЗПІЗНАВАННЯ УМОВИ ЗЙОМКИ</string>
   <string name="pref_camera_power_shutter_title">Зйомка кноп. живлення</string>
+  <string name="pref_camera_max_brightness_title">Яскравий екран</string>
   <string name="pref_superzoom_title">Збільшення</string>
 </resources>
diff --git a/res/values-uk/qcomstrings.xml b/res/values-uk/qcomstrings.xml
index 583468c64..4180f4d1b 100644
--- a/res/values-uk/qcomstrings.xml
+++ b/res/values-uk/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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">HFR не підтримується, коли відео стабілізація, проміжок часу або HDR увімкнено</string>
   <string name="error_app_unsupported_hfr">HFR не підтримується на цьому розширенні</string>
   <string name="error_app_unsupported_hfr_codec">Пришвидшена зйомка доступна тільки з кодеком H.264</string>
   <string name="error_app_unsupported">Відеокодек не підтримує це розширення</string>
+  <string name="error_app_unsupported_dis">Відео стабілізація не підтримується на вибраній роздільній здатності</string>
   <string name="pref_camera_ae_bracket_hdr_title">Брекетинг автоекспозиції</string>
   <string name="pref_camera_hfr_title">Повільний рух (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Вимкн.</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 39df1a0fe..a0c135885 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -18,7 +18,7 @@
 <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">1590 万像素</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>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">1150 万像素</string>
   <string name="pref_camera_picturesize_entry_10_4mp">1040 万像素</string>
   <string name="pref_camera_picturesize_entry_10mp">1000 万像素</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">970 万像素</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">970 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">900 万像素</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">820 万像素</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">820 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770 万像素</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640 万像素</string>
-  <string name="pref_camera_picturesize_entry_6mp">600 万像素</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">600 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450 万像素</string>
   <string name="pref_camera_picturesize_entry_4mp">400 万像素</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">370 万像素</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">370 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250 万像素</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">210 万像素</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">210 万像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190 万像素</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">降低动态模糊</string>
@@ -133,5 +133,6 @@
   <string name="camera_menu_beauty_mode_label">美肤</string>
   <string name="camera_menu_asd_label">智能场景</string>
   <string name="pref_camera_power_shutter_title">电源键快门</string>
+  <string name="pref_camera_max_brightness_title">明亮的屏幕</string>
   <string name="pref_superzoom_title">放大</string>
 </resources>
diff --git a/res/values-zh-rCN/qcomstrings.xml b/res/values-zh-rCN/qcomstrings.xml
index 43a23f9db..e4a9e3b56 100644
--- a/res/values-zh-rCN/qcomstrings.xml
+++ b/res/values-zh-rCN/qcomstrings.xml
@@ -40,12 +40,16 @@
   <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 已开启时， HFR 将无法使用。</string>
   <string name="error_app_unsupported_hfr">选择的分辨率不支持高帧率</string>
   <string name="error_app_unsupported_hfr_codec">开启高帧率时仅支持 H.264 视频编码</string>
   <string name="error_app_unsupported">视频分辨率不支持此编解码器类型</string>
+  <string name="error_app_unsupported_dis">选中的分辨率不支持视频稳定化。</string>
   <string name="pref_camera_ae_bracket_hdr_title">自动包围曝光</string>
   <string name="pref_camera_hfr_title">慢动作 (高帧率)</string>
   <string name="pref_camera_hfr_entry_off">关闭</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 44c3512b8..c3f42b414 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -18,7 +18,7 @@
 <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">1590 萬像素</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>
@@ -26,22 +26,22 @@
   <string name="pref_camera_picturesize_entry_11_5mp">1150 萬像素</string>
   <string name="pref_camera_picturesize_entry_10_4mp">1040 萬像素</string>
   <string name="pref_camera_picturesize_entry_10mp">1000 萬像素</string>
-  <string name="pref_camera_picturesize_entry_9_7mp">970 萬像素</string>
+  <string name="pref_camera_picturesize_entry_9_7mp_wide">970 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_9mp">900 萬像素</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">820 萬像素</string>
+  <string name="pref_camera_picturesize_entry_8_2mp_wide">820 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770 萬像素</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640 萬像素</string>
-  <string name="pref_camera_picturesize_entry_6mp">600 萬像素</string>
+  <string name="pref_camera_picturesize_entry_6mp_wide">600 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450 萬像素</string>
   <string name="pref_camera_picturesize_entry_4mp">400 萬像素</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">370 萬像素</string>
+  <string name="pref_camera_picturesize_entry_3_7mp_wide">370 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250 萬像素</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">210 萬像素</string>
+  <string name="pref_camera_picturesize_entry_2_1mp_wide">210 萬像素 (16:9)</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190 萬像素</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">降低動態模糊</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 8d101a3b4..ac4104100 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -24,19 +24,14 @@
   <string name="pref_camera_picturesize_entry_10_4mp">1040 萬像素</string>
   <string name="pref_camera_picturesize_entry_10mp">1000 萬像素</string>
   <string name="pref_camera_picturesize_entry_9mp">900 萬像素</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">820 萬像素</string>
   <string name="pref_camera_picturesize_entry_7_7mp">770 萬像素</string>
   <string name="pref_camera_picturesize_entry_6_4mp">640 萬像素</string>
-  <string name="pref_camera_picturesize_entry_6mp">600 萬像素</string>
   <string name="pref_camera_picturesize_entry_4_5mp">450 萬像素</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">370 萬像素</string>
   <string name="pref_camera_picturesize_entry_2_5mp">250 萬像素</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">210 萬像素</string>
   <string name="pref_camera_picturesize_entry_1_9mp">190 萬像素</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_nhd">nHD</string>
   <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
   <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
   <string name="pref_camera_scenemode_entry_ar">增強實景</string>
author	Michael Bestas <mikeioannina@gmail.com>	2014-10-27 21:59:45 +0200
committer	Michael Bestas <mikeioannina@gmail.com>	2014-10-28 02:04:22 +0000
commit	b9c718ed77e14ad5667686284243e5de12062080 (patch)
tree	0a95907c8eaf93e668481b183ef2a579d406f581
parent	1d44171a01f6331180eca334dfe44791b45d1e54 (diff)
download	android_packages_apps_Camera2-b9c718ed77e14ad5667686284243e5de12062080.tar.gz android_packages_apps_Camera2-b9c718ed77e14ad5667686284243e5de12062080.tar.bz2 android_packages_apps_Camera2-b9c718ed77e14ad5667686284243e5de12062080.zip