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

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

Change-Id: Ib4294c621052fdd02ba3ab715deda052432d2fd0

1 files changed, 21 insertions, 25 deletions

diff --git a/res/values-es-rXA/qcomstrings.xml b/res/values-es-rXA/qcomstrings.xml
index 3c189e1fb..bb2e84ccb 100644
--- a/res/values-es-rXA/qcomstrings.xml
+++ b/res/values-es-rXA/qcomstrings.xml
@@ -35,44 +35,50 @@
   <string name="pref_camera_video_duration_entry_10">10 minutos</string>
   <string name="pref_camera_video_duration_entry_30">30 minutos</string>
   <string name="pref_camera_skinToneEnhancement_title">Meyora del tonu la piel</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Activada</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Desactivada</string>
   <string name="pref_camera_selectablezoneaf_title">Zona d\'enfoque automáticu</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Midición puntual</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderáu al centru</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Media de marcos</string>
-  <string name="pref_camera_video_hdr_entry_off">Desactiváu</string>
-  <string name="pref_camera_video_hdr_entry_on">Activáu</string>
+  <string name="hdr_enable_message">El HDR ta activáu. Namái ta sofitáu\'l mou d\'escena automáticu</string>
+  <string name="scene_enable_message">HDR namái ta sofitáu nel mou d\'escena automáticu</string>
   <string name="pref_camera_video_hdr_title">Videu HDR</string>
   <string name="pref_camera_facedetection_title">Detección de cares</string>
-  <string name="pref_camera_facedetection_entry_off">Desactiváu</string>
-  <string name="pref_camera_facedetection_entry_on">Activáu</string>
   <string name="pref_camera_redeyereduction_title">Amenorgamientu de güeyos bermeyos</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Activada</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Desactivada</string>
+  <string name="error_app_unsupported_hfr_selection">HFR nun ta sofitáu cuando tán activaos la estabilización de videu, lapsu de tiempu o videu HDR</string>
   <string name="error_app_unsupported_hfr">El videu d\'alta velocidá nun ta sofitáu pa la resolución esbillada</string>
   <string name="error_app_unsupported_hfr_codec">Cuando\'l HFR ta activáu, namái ta sofitada la codificación de videu H.264</string>
   <string name="error_app_unsupported">Resolución de videu non sofitada nesti tipu de codificador</string>
+  <string name="error_app_unsupported_dis">La estabilización de videu nun ta sofitada pa la resolución esbillada</string>
   <string name="pref_camera_ae_bracket_hdr_title">Esposición HDR automática</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Activada</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Desactivada</string>
   <string name="pref_camera_hfr_title">Cámara lenta (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Desactiváu</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Amenorgarmientu de ruiu</string>
-  <string name="pref_camera_denoise_entry_off">Desactiváu</string>
-  <string name="pref_camera_denoise_entry_on">Activáu</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
   <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
   <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
   <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
   <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
   <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <string name="pref_camera_antibanding_title">Anti-bandéu</string>
   <string name="pref_camera_antibanding_entry_0">Desactiváu</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz</string>
@@ -95,14 +101,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tinta azul</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tinta verde</string>
   <string name="pref_camera_touchafaec_title">AF/AEC táctil</string>
-  <string name="pref_camera_touchafaec_entry_off">Desactiváu</string>
-  <string name="pref_camera_touchafaec_entry_on">Activáu</string>
   <string name="pref_camera_dis_title">Estabilización de videu</string>
-  <string name="pref_camera_dis_entry_off">Desactiváu</string>
-  <string name="pref_camera_dis_entry_on">Activáu</string>
   <string name="pref_camera_facerc_title">Reconocimientu de cares</string>
-  <string name="pref_camera_facerc_entry_off">Desactiváu</string>
-  <string name="pref_camera_facerc_entry_on">Activáu</string>
+  <string name="pref_camera_sharpness_title">Nitidez</string>
   <string name="pref_camera_sharpness_entry_level0">Nivel 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivel 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivel 2 (por defeutu)</string>
@@ -110,6 +111,7 @@
   <string name="pref_camera_sharpness_entry_level4">Nivel 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nivel 5</string>
   <string name="pref_camera_sharpness_entry_level6">Nivel 6</string>
+  <string name="pref_camera_contrast_title">Contraste</string>
   <string name="pref_camera_contrast_entry_level0">Nivel 0</string>
   <string name="pref_camera_contrast_entry_level1">Nivel 1</string>
   <string name="pref_camera_contrast_entry_level2">Nivel 2</string>
@@ -121,6 +123,7 @@
   <string name="pref_camera_contrast_entry_level8">Nivel 8</string>
   <string name="pref_camera_contrast_entry_level9">Nivel 9</string>
   <string name="pref_camera_contrast_entry_level10">Nivel 10</string>
+  <string name="pref_camera_saturation_title">Saturación</string>
   <string name="pref_camera_saturation_entry_level0">Nivel 0</string>
   <string name="pref_camera_saturation_entry_level1">Nivel 1</string>
   <string name="pref_camera_saturation_entry_level2">Nivel 2</string>
@@ -132,9 +135,6 @@
   <string name="pref_camera_saturation_entry_level8">Nivel 8</string>
   <string name="pref_camera_saturation_entry_level9">Nivel 9</string>
   <string name="pref_camera_saturation_entry_level10">Nivel 10</string>
-  <string name="pref_camera_sharpness_title">Nitidez</string>
-  <string name="pref_camera_contrast_title">Contraste</string>
-  <string name="pref_camera_saturation_title">Saturación</string>
   <string name="pref_camera_picture_format_title">Formatu d\'imaxe</string>
   <string name="pref_camera_jpegquality_title">Calidá d\'imaxe</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +144,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Activáu</string>
-  <string name="pref_camera_histogram_entry_disable">Desactiváu</string>
   <string name="pref_camera_scenedetect_title">Auto Detección d\'Escenes</string>
-  <string name="pref_camera_scenedetect_entry_on">Activada</string>
-  <string name="pref_camera_scenedetect_entry_off">Desactivada</string>
 </resources>