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, 3 insertions, 25 deletions

diff --git a/res/values-eu/qcomstrings.xml b/res/values-eu/qcomstrings.xml
index be9755e35..560c5f6c8 100644
--- a/res/values-eu/qcomstrings.xml
+++ b/res/values-eu/qcomstrings.xml
@@ -35,36 +35,24 @@
   <string name="pref_camera_video_duration_entry_10">10 minutu</string>
   <string name="pref_camera_video_duration_entry_30">30 minutu</string>
   <string name="pref_camera_skinToneEnhancement_title">Azal tonuaren hobekuntza</string>
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Gaituta</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Ezgaituta</string>
   <string name="pref_camera_selectablezoneaf_title">Enfoke automatiko modua</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automatikoa</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Puntuala</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Erdialdean haztatua</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Matriziala</string>
-  <string name="pref_camera_video_hdr_entry_off">Ezgaituta</string>
-  <string name="pref_camera_video_hdr_entry_on">Gaituta</string>
   <string name="pref_camera_video_hdr_title">Hein dinamiko altuko bideoa</string>
   <string name="pref_camera_facedetection_title">Aurpegien antzematea</string>
-  <string name="pref_camera_facedetection_entry_off">Ezgaituta</string>
-  <string name="pref_camera_facedetection_entry_on">Gaituta</string>
   <string name="pref_camera_redeyereduction_title">Begi gorrien murrizketa</string>
-  <string name="pref_camera_redeyereduction_entry_enable">Gaituta</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Ezgaituta</string>
   <string name="error_app_unsupported_hfr">Abiadura handiko bideoa ez dago baliagarri aukeraturiko erresoluzioan</string>
   <string name="error_app_unsupported_hfr_codec">Abiadura handiko bideo moduan H264 kodek-a bakarrik dago onartuta</string>
   <string name="error_app_unsupported">Kodek honentzako baliagarria ez den bideo erresoluzioa</string>
   <string name="pref_camera_ae_bracket_hdr_title">HDR esposizio automatikoa</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Gaituta</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_off">Ezgaituta</string>
   <string name="pref_camera_hfr_title">Kamera geldoa (HFR)</string>
   <string name="pref_camera_hfr_entry_off">Ezgaituta</string>
   <string name="pref_camera_hfr_entry_2x">60 FPS</string>
   <string name="pref_camera_hfr_entry_3x">90 FPS</string>
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Zarata murrizketa</string>
-  <string name="pref_camera_denoise_entry_off">Ezgaituta</string>
-  <string name="pref_camera_denoise_entry_on">Gaituta</string>
   <string name="pref_camera_iso_title">ISO sentikortasuna</string>
   <string name="pref_camera_iso_entry_auto">ISO automatikoa</string>
   <string name="pref_camera_iso_entry_isodeblur">ISO dardara murriztailea</string>
@@ -95,14 +83,9 @@
   <string name="pref_camera_coloreffect_entry_bluetint">Tintatu urdina</string>
   <string name="pref_camera_coloreffect_entry_greentint">Tintatu berdea</string>
   <string name="pref_camera_touchafaec_title">AF/AEC sakatzea</string>
-  <string name="pref_camera_touchafaec_entry_off">Ezgaituta</string>
-  <string name="pref_camera_touchafaec_entry_on">Gaituta</string>
   <string name="pref_camera_dis_title">Bideo egonkortzea</string>
-  <string name="pref_camera_dis_entry_off">Ezgaituta</string>
-  <string name="pref_camera_dis_entry_on">Gaituta</string>
   <string name="pref_camera_facerc_title">Aurpegi antzematea</string>
-  <string name="pref_camera_facerc_entry_off">Ezgaituta</string>
-  <string name="pref_camera_facerc_entry_on">Gaituta</string>
+  <string name="pref_camera_sharpness_title">Fokatzea</string>
   <string name="pref_camera_sharpness_entry_level0">0. maila</string>
   <string name="pref_camera_sharpness_entry_level1">1. maila</string>
   <string name="pref_camera_sharpness_entry_level2">2. maila (lehenetsia)</string>
@@ -110,6 +93,7 @@
   <string name="pref_camera_sharpness_entry_level4">4. maila</string>
   <string name="pref_camera_sharpness_entry_level5">5. maila</string>
   <string name="pref_camera_sharpness_entry_level6">6. maila</string>
+  <string name="pref_camera_contrast_title">Kontrastea</string>
   <string name="pref_camera_contrast_entry_level0">0. maila</string>
   <string name="pref_camera_contrast_entry_level1">1. maila</string>
   <string name="pref_camera_contrast_entry_level2">2. maila</string>
@@ -121,6 +105,7 @@
   <string name="pref_camera_contrast_entry_level8">8. maila</string>
   <string name="pref_camera_contrast_entry_level9">9. maila</string>
   <string name="pref_camera_contrast_entry_level10">10. maila</string>
+  <string name="pref_camera_saturation_title">Saturazioa</string>
   <string name="pref_camera_saturation_entry_level0">0. maila</string>
   <string name="pref_camera_saturation_entry_level1">1. maila</string>
   <string name="pref_camera_saturation_entry_level2">2. maila</string>
@@ -132,9 +117,6 @@
   <string name="pref_camera_saturation_entry_level8">8. maila</string>
   <string name="pref_camera_saturation_entry_level9">9. maila</string>
   <string name="pref_camera_saturation_entry_level10">10. maila</string>
-  <string name="pref_camera_sharpness_title">Fokatzea</string>
-  <string name="pref_camera_contrast_title">Kontrastea</string>
-  <string name="pref_camera_saturation_title">Saturazioa</string>
   <string name="pref_camera_picture_format_title">Irudiaren formatua</string>
   <string name="pref_camera_jpegquality_title">Irudiaren kalitatea</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
@@ -144,9 +126,5 @@
   <string name="pref_camera_jpegquality_entry_4">95%</string>
   <string name="pref_camera_jpegquality_entry_5">100%</string>
   <string name="pref_camera_histogram_title">Histograma</string>
-  <string name="pref_camera_histogram_entry_enable">Gaituta</string>
-  <string name="pref_camera_histogram_entry_disable">Ezgaituta</string>
   <string name="pref_camera_scenedetect_title">Eszena adimentsua</string>
-  <string name="pref_camera_scenedetect_entry_on">Gaituta</string>
-  <string name="pref_camera_scenedetect_entry_off">Ezgaituta</string>
 </resources>