Automatic translation import

Change-Id: I99f4c26862ac9af014a2020ee326b62196d54696

19 files changed, 211 insertions, 496 deletions

diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index f4a71bd9d..ebca1dc44 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -23,82 +23,12 @@
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
   <!-- Settings screen, scene mode -->
-  <string name="pref_camera_scenemode_entry_antimotionblur">Reductor de desenfoque</string>
-  <string name="pref_camera_scenemode_entry_aqua">Agua</string>
-  <string name="pref_camera_scenemode_entry_ar">Realidá aumentada</string>
-  <string name="pref_camera_scenemode_entry_asd">Meyor disparu</string>
-  <string name="pref_camera_scenemode_entry_baby">Bebé</string>
-  <string name="pref_camera_scenemode_entry_backgroundblur">Fondu desenfocáu</string>
-  <string name="pref_camera_scenemode_entry_backlight">Contralluz</string>
-  <string name="pref_camera_scenemode_entry_backlightportrait">Retratu a contralluz</string>
-  <string name="pref_camera_scenemode_entry_barcode">Códigu de barres</string>
-  <string name="pref_camera_scenemode_entry_beach">Sablera</string>
-  <string name="pref_camera_scenemode_entry_beauty">Belleza</string>
-  <string name="pref_camera_scenemode_entry_candlelight">Lluz de vela</string>
-  <string name="pref_camera_scenemode_entry_cine">Cine</string>
-  <string name="pref_camera_scenemode_entry_closeup">Detalle</string>
-  <string name="pref_camera_scenemode_entry_dark">Escuru</string>
-  <string name="pref_camera_scenemode_entry_dish">Reflector</string>
-  <string name="pref_camera_scenemode_entry_duskdawn">Riscar/Aséu</string>
-  <string name="pref_camera_scenemode_entry_document">Documentu</string>
-  <string name="pref_camera_scenemode_entry_fallcolor">Color cayíu</string>
-  <string name="pref_camera_scenemode_entry_fireworks">Fuegos artificiales</string>
-  <string name="pref_camera_scenemode_entry_flowers">Flores</string>
-  <string name="pref_camera_scenemode_entry_handheldtwilight">Atapecer</string>
-  <string name="pref_camera_scenemode_entry_highsensitivity">Sensibilidá alta</string>
-  <string name="pref_camera_scenemode_entry_indoor">Interior</string>
-  <string name="pref_camera_scenemode_entry_landscape">Paisaxe</string>
-  <string name="pref_camera_scenemode_entry_mix_illuminant">Lluces amestaes</string>
-  <string name="pref_camera_scenemode_entry_mood">Humor</string>
-  <string name="pref_camera_scenemode_entry_nightportrait">Retratu nocherniegu</string>
-  <string name="pref_camera_scenemode_entry_nightindoor">Interior nocherniegu</string>
-  <string name="pref_camera_scenemode_entry_oldfilm">Película antigua</string>
-  <string name="pref_camera_scenemode_entry_pet">Mascota</string>
-  <string name="pref_camera_scenemode_entry_portrait">Retratu</string>
-  <string name="pref_camera_scenemode_entry_snow">Ñeve</string>
-  <string name="pref_camera_scenemode_entry_softskin">Piel suave</string>
-  <string name="pref_camera_scenemode_entry_sports">Deportes</string>
-  <string name="pref_camera_scenemode_entry_spotlight">Focu de lluz</string>
-  <string name="pref_camera_scenemode_entry_steadyphoto">Semeya estable</string>
-  <string name="pref_camera_scenemode_entry_supernight">Nueche escura</string>
-  <string name="pref_camera_scenemode_entry_sweepstitch">Percorríu panorámicu</string>
-  <string name="pref_camera_scenemode_entry_text">Testu</string>
-  <string name="pref_camera_scenemode_entry_theatre">Teatru</string>
-  <string name="pref_camera_scenemode_entry_whiteboard">Pizarra</string>
   <!-- Settings screen, focus mode -->
-  <string name="pref_camera_focusmode_entry_continuous">Continuu</string>
-  <string name="pref_camera_focusmode_entry_mw_continuous">Continuu (MW)</string>
-  <string name="pref_camera_focusmode_entry_extended">Estendíu</string>
-  <string name="pref_camera_focusmode_entry_facedetect">Detección de cares</string>
-  <string name="pref_camera_focusmode_entry_facepriority">Prioridá de cares</string>
-  <string name="pref_camera_focusmode_entry_fixed">Fixu</string>
-  <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_portrait">Retratu</string>
-  <string name="pref_camera_focusmode_entry_hyperfocal">Hiperfocal</string>
   <!-- Color effects -->
-  <string name="pref_camera_coloreffect_entry_washed">Llaváu</string>
-  <string name="pref_camera_coloreffect_entry_vintage_warm">Antiguu caldiu</string>
-  <string name="pref_camera_coloreffect_entry_vintage_cold">Antiguu fríu</string>
-  <string name="pref_camera_coloreffect_entry_point_blue">Puntu azul</string>
-  <string name="pref_camera_coloreffect_entry_point_green">Puntu verde</string>
-  <string name="pref_camera_coloreffect_entry_point_red_yellow">Puntu encarnáu-mariellu</string>
-  <string name="pref_camera_coloreffect_entry_cartoonize">Viñetiar</string>
   <!-- Red eye flash mode title -->
-  <string name="pref_camera_flashmode_entry_redeye">Güeyos bermeyos</string>
-  <string name="pref_camera_flashmode_label_redeye">GÜEYOS BERMEYOS</string>
   <!-- Power shutter -->
-  <string name="pref_camera_power_shutter_title">Disparador c/botón d\'encendíu</string>
   <!-- Max brightness -->
-  <string name="pref_camera_max_brightness_title">Pantalla brillante</string>
   <!-- Touch focus duration -->
-  <string name="pref_camera_focustime_title">Duración del enfoque</string>
-  <string name="pref_camera_focustime_entry_0">0s</string>
-  <string name="pref_camera_focustime_entry_3">3s</string>
-  <string name="pref_camera_focustime_entry_5">5 s</string>
-  <string name="pref_camera_focustime_entry_10">10 s</string>
-  <string name="pref_camera_focustime_entry_infinite">Infinitu</string>
   <!-- Shutter speed -->
-  <string name="pref_camera_shutter_speed_title">Velocidá del obturador</string>
-  <string name="auto_hdr_enabled">Auto HDR activáu</string>
   <!-- Advanced options -->
 </resources>
diff --git a/res/values-ast-rES/qcomstrings.xml b/res/values-ast-rES/qcomstrings.xml
index 2a6309c9c..eb31e645f 100644
--- a/res/values-ast-rES/qcomstrings.xml
+++ b/res/values-ast-rES/qcomstrings.xml
@@ -31,314 +31,147 @@
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
   <!-- Settings screen, Select auto exposure title -->
-  <string name="pref_camera_autoexposure_title">Mou d\'Autoesposición</string>
   <!-- Settings screen, auto exposure dialog radio button choices -->
-  <string name="pref_camera_autoexposure_entry_frameaverage">Media de marcos</string>
-  <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada al centru</string>
-  <string name="pref_camera_autoexposure_entry_spotmetering">Midición puntual</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Video encoder title -->
-  <string name="pref_camera_videoencoder_title">Códec de videu</string>
   <!-- Settings screen, Video encoder dialog radio button choices -->
   <!-- Default video encoder setting. A numerical value. -->
   <!-- Settings screen, Video encoder dialog title -->
-  <string name="pref_camera_videoencoder_dialogtitle">Códec de videu</string>
   <!-- Default audio encoder setting. A numerical value. -->
   <!-- Settings screen, Audio encoder title -->
-  <string name="pref_camera_audioencoder_title">Códec d\'audiu</string>
   <!-- Settings screen, Audio encoder dialog radio button choices -->
   <!-- Default video duration setting. A numerical value.-->
   <!-- Default Skin Tone Enhancement setting. Do not translate. -->
   <!-- Settings screen, Select Skin Tone Enhancement title -->
-  <string name="pref_camera_skinToneEnhancement_title">Meyora del tonu la piel</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
-  <string name="pref_camera_zsl_title">Desaniciar retrasu del disparador</string>
   <!-- Default selectable zone af setting. Do not translate. -->
   <!-- Settings screen, Selectable zone af title -->
-  <string name="pref_camera_selectablezoneaf_title">Zona d\'enfoque automáticu</string>
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
-  <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>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Selectable advanced features title -->
-  <string name="pref_camera_advanced_features_title">Carauterístiques avanzaes</string>
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
-  <string name="pref_camera_advanced_feature_entry_none">Dengún</string>
-  <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Enfoque multi-toque</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Manual exposure control entry values -->
-  <string name="pref_camera_manual_exp_title">Esposición manual</string>
-  <string name="pref_camera_manual_exp_entry_ISO_priority">Prioridá ISO</string>
-  <string name="pref_camera_manual_exp_entry_exptime_priority">Prioridá de tiempu d\'esposición</string>
-  <string name="pref_camera_manual_exp_entry_user_setting">Axuste d\'usuariu</string>
-  <string name="pref_camera_manual_exp_entry_off">Apagar</string>
   <!-- Manual white balance entry values -->
-  <string name="pref_camera_manual_wb_title">Balance manual de blancu</string>
-  <string name="pref_camera_manual_wb_entry_color_temperature">Temperatura de color</string>
-  <string name="pref_camera_manual_wb_entry_rbgb_gains">Ganancies RBGB</string>
-  <string name="pref_camera_manual_wb_entry_off">Apagar</string>
   <!-- Manual Focus entry values -->
-  <string name="pref_camera_manual_focus_title">Enfoque manual</string>
-  <string name="pref_camera_manual_focus_entry_scale_mode">Mou d\'escala</string>
-  <string name="pref_camera_manual_focus_entry_diopter_mode">Mou dioptría</string>
-  <string name="pref_camera_manual_focus_entry_off">Apagar</string>
   <!-- Instant Capture entry -->
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
-  <string name="pref_camera_zsl_entry_off">Apagar</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
   <!-- Settings screen, Video HDR location dialog choices -->
-  <string name="pref_camera_video_hdr_entry_off">Apagar</string>
   <!-- Settings screen, CDS location dialog choices -->
-  <string name="pref_camera_cds_entry_off">Apagar</string>
-  <string name="pref_camera_cds_entry_auto">Auto</string>
   <!-- Settings screen, video CDS location dialog choices -->
-  <string name="pref_camera_video_cds_entry_off">Apagar</string>
-  <string name="pref_camera_video_cds_entry_auto">Auto</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, setting title text for Video HDR-->
-  <string name="pref_camera_video_hdr_title">Videu HDR</string>
   <!-- Settings menu, setting title text for cds mode-->
-  <string name="pref_camera_cds_title">Mou CDS</string>
   <!-- Settings menu, setting title text for video cds mode-->
-  <string name="pref_camera_video_cds_title">Mou de videu CDS</string>
   <!-- Default cds mode setting-->
   <!-- Default video cds mode setting-->
   <!-- Settings menu, setting title text for tnr mode-->
-  <string name="pref_camera_tnr_title">Mou TNR</string>
   <!-- Settings menu, setting title text for video tnr mode-->
-  <string name="pref_camera_video_tnr_title">Mou de videu TNR</string>
   <!-- Default tnr mode setting-->
   <!-- Default video tnr mode setting-->
   <!-- Default face  detection setting. -->
   <!-- Settings screen, Select Face Detection -->
-  <string name="pref_camera_facedetection_title">Detección de cares</string>
   <!-- Settings menu, Face Detection choices -->
-  <string name="pref_camera_facedetection_entry_off">Apagar</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
-  <string name="pref_selfie_flash_title">Flash pa selfie</string>
   <!-- Settings menu, Selfie Flash choices -->
-  <string name="pref_selfie_flash_entry_off">Apagar</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
-  <string name="pref_camera_redeyereduction_title">Amenorgamientu de güeyos bermeyos</string>
   <!-- Settings menu, redeye reduction choices -->
   <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
-  <string name="error_app_unsupported_hfr_selection">La grabación d\'alta velocidá de fotogrames nun ye compatible cuando s\'usa la estabilización/TimeLapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
-  <string name="error_app_unsupported_hfr">El mou de cámara lenta nun ye compatible col tamañu del videu esbilláu. Esbilla un tamañu de videu inferior</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
-  <string name="error_app_unsupported_dis">La estabilización nun ye compatible col tamañu del videu esbilláu. Esbilla un tamañu de videu inferior</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HSR mode -->
-  <string name="error_app_unsupported_hsr">Nun ta sofitáu\'l mou d\'alta velocidá pal tamañu de videu esbilláu. Esbilláu un tamañu de videu más baxu</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
-  <string name="error_app_unsupported_hfr_codec">Namái se sofita la codificación de videu H264 al tar habilitáu HFR</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
-  <string name="error_app_unsupported">Resolución de videu non sofitada nesti tipu de codificador</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
-  <string name="error_app_unsupported_raw">El formatu d\'imaxe RAW nun ye compatible col retrasu de obturador en mou cero. Seleiciona JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
-  <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Esposición HDR automática</string>
-  <string name="pref_camera_ae_bracket_hdr_title">Esposición HDR automática</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
-  <string name="pref_camera_hfr_title">Grabación d\'alta velocidá de fotogrames</string>
   <!-- Settings screen, hfr radio button choices -->
-  <string name="pref_camera_hfr_entry_off">Desactiváu</string>
-  <string name="pref_camera_hfr_entry_2x">Cámara lenta a 60 FPS</string>
-  <string name="pref_camera_hfr_entry_3x">Cámara lenta a 90 FPS</string>
-  <string name="pref_camera_hfr_entry_4x">Cámara lenta a 120 FPS</string>
-  <string name="pref_camera_hfr_entry_8x">Cámara lenta a 240 FPS</string>
-  <string name="pref_camera_hfr_entry_hsr_60">Alta velocidá a 60 FPS</string>
-  <string name="pref_camera_hfr_entry_hsr_90">Alta velocidá a 90 FPS</string>
-  <string name="pref_camera_hfr_entry_hsr_120">Alta velocidá a 90 FPS</string>
   <!-- HFR entry values. Do not translate. -->
   <!-- Default noise reduction setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
-  <string name="pref_camera_noise_reduction_entry_off">Apagar</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
-  <string name="pref_camera_see_more_entry_off">Apagar</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
-  <string name="pref_camera_denoise_title">Mou reductor de ruiu</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
-  <string name="pref_camera_denoise_entry_off">Apagar</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
-  <string name="pref_camera_iso_title">ISO</string>
   <!-- Settings screen, ISO dialog radio button choices -->
-  <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_iso100">ISO100</string>
-  <string name="pref_camera_iso_entry_iso200">ISO200</string>
-  <string name="pref_camera_iso_entry_iso400">ISO400</string>
-  <string name="pref_camera_iso_entry_iso800">ISO800</string>
-  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
   <!-- ISO entry values. Do not translate. -->
   <!-- Settings screen, Anti Banding title -->
-  <string name="pref_camera_antibanding_title">Anti-bandéu</string>
   <!-- Default Anti Banding setting. -->
   <!-- Settings screen, Anti Banding entries -->
-  <string name="pref_camera_antibanding_entry_0">Apagar</string>
-  <string name="pref_camera_antibanding_entry_1">50 Hz (Europa)</string>
-  <string name="pref_camera_antibanding_entry_2">60 Hz (EE.XX)</string>
-  <string name="pref_camera_antibanding_entry_3">Auto</string>
   <!-- Default color effect setting. -->
-  <string name="pref_camera_filter_mode_entry_off">Apagar</string>
   <!-- Settings screen, Select Color effect title -->
-  <string name="pref_camera_coloreffect_title">Efeutu de color</string>
-  <string name="pref_camera_filter_mode_title">Efeutu de color</string>
   <!-- Settings screen, Color effect dialog radio button choices -->
-  <string name="pref_camera_coloreffect_entry_none">Nengún</string>
-  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
-  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
-  <string name="pref_camera_coloreffect_entry_negative">Negativu</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
-  <string name="pref_camera_coloreffect_entry_solarize">Solarizar</string>
-  <string name="pref_camera_coloreffect_entry_posterize">Posterizar</string>
-  <string name="pref_camera_coloreffect_entry_aqua">Agua</string>
-  <string name="pref_camera_coloreffect_entry_emboss">Realzar</string>
-  <string name="pref_camera_coloreffect_entry_sketch">Croquis</string>
-  <string name="pref_camera_coloreffect_entry_neon">Neón</string>
-  <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
-  <string name="pref_camera_coloreffect_entry_mosaic">Mosaicu</string>
-  <string name="pref_camera_coloreffect_entry_redtint">Tinta encarnao</string>
-  <string name="pref_camera_coloreffect_entry_bluetint">Tinta azul</string>
-  <string name="pref_camera_coloreffect_entry_greentint">Tinta verde</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
-  <string name="pref_camera_touchafaec_entry_off">Apagar</string>
   <!-- Select IS title -->
-  <string name="pref_camera_dis_title">Estabilización dixital d\'imaxe</string>
   <!-- DIS choices -->
-  <string name="pref_camera_dis_entry_off">Apagar</string>
   <!-- Select Face Recognition title -->
-  <string name="pref_camera_facerc_title">Reconocimientu de cares</string>
   <!-- Face Recognition choices -->
-  <string name="pref_camera_facerc_entry_off">Apagar</string>
   <!-- Settings screen, Multiple levels entries -->
-  <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>
-  <string name="pref_camera_sharpness_entry_level3">Nivel 3</string>
-  <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>
   <!-- Settings screen, Multiple levels entries -->
-  <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>
-  <string name="pref_camera_contrast_entry_level3">Nivel 3</string>
-  <string name="pref_camera_contrast_entry_level4">Nivel 4</string>
-  <string name="pref_camera_contrast_entry_level5">Nivel 5 (por defeutu)</string>
-  <string name="pref_camera_contrast_entry_level6">Nivel 6</string>
-  <string name="pref_camera_contrast_entry_level7">Nivel 7</string>
-  <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>
   <!-- Settings screen, Multiple levels entries -->
-  <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>
-  <string name="pref_camera_saturation_entry_level3">Nivel 3</string>
-  <string name="pref_camera_saturation_entry_level4">Nivel 4</string>
-  <string name="pref_camera_saturation_entry_level5">Nivel 5 (por defeutu)</string>
-  <string name="pref_camera_saturation_entry_level6">Nivel 6</string>
-  <string name="pref_camera_saturation_entry_level7">Nivel 7</string>
-  <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>
   <!-- Default sharpness setting. Do not translate. -->
   <!-- Settings screen, Select sharpness title -->
-  <string name="pref_camera_sharpness_title">Nitidez</string>
   <!-- Default contrast setting. Do not translate. -->
   <!-- Settings screen, Select contrast title -->
-  <string name="pref_camera_contrast_title">Contraste</string>
   <!-- Default saturation setting. Do not translate. -->
   <!-- Settings screen, Select saturation title -->
-  <string name="pref_camera_saturation_title">Saturación</string>
   <!-- Default picture quality setting. See pref_camera_jpegquality_entryvalues for possible values -->
   <!-- Default Picture format setting. Do not translate. -->
   <!-- Settings screen, Select Picture format title -->
-  <string name="pref_camera_picture_format_title">Formatu d\'imaxe</string>
   <!-- Settings screen, picture format dialog radio button choices -->
   <!-- Picture format entry values. Do not translate. -->
   <!-- Settings screen, Picture quality title -->
-  <string name="pref_camera_jpegquality_title">Calidá d\'imaxe</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
-  <string name="pref_camera_histogram_title">Histograma</string>
   <!-- Settings screen, Histogram radio button choices -->
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
-  <string name="pref_camera_scenedetect_title">Auto Detección d\'Escenes</string>
   <!-- Settings menu, auto scene detection choices -->
-  <string name="pref_camera_scenedetect_entry_off">Apagar</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
   <!-- longshot value -->
-  <string name="pref_camera_longshot_title">Disparu continuu</string>
-  <string name="msg_cancel_longshot_for_limited_memory">La memoria ta escosando, encaboxando\'l disparu continuu</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
-  <string name="flash_aebracket_message">El flash nun ye compatible col mou AE bracketing</string>
   <!-- Settings screen, setting title text for Auto HDR-->
-  <string name="pref_camera_auto_hdr_title">HDR auto</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
   <!-- toast message for storage location switch -->
-  <string name="on_switch_save_path_to_sdcard">Nun ye abondu l\'espaciu nel almacenamientu internu, cambióse al allugamientu d\'almacenamientu na tarxeta SD</string>
   <!-- Settings screen, Selectable HDR mode title -->
-  <string name="pref_camera_hdr_mode_title">Mou HDR</string>
   <!-- Settings screen, Selectable HDR mode radio button choices -->
-  <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
-  <string name="pref_camera_hdr_mode_entry_multi_frame">HDR de marcos múltiples</string>
   <!-- HDR mode entry values. Do not translate. -->
   <!-- Settings screen, Selectable HDR need 1x frame default value -->
   <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR necesita marcu de 1x</string>
   <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
   <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
-  <string name="pref_camera_video_rotation_title">Voltéu de videu</string>
   <!--Menu, video rotation label-->
   <!-- Settings screen, Video rotation dialog radio button choices -->
-  <string name="pref_camera_video_rotation_entry_0">0 graos</string>
-  <string name="pref_camera_video_rotation_entry_90">90 graos</string>
-  <string name="pref_camera_video_rotation_entry_180">180 graos</string>
-  <string name="pref_camera_video_rotation_entry_270">270 graos</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
-  <string name="map_activity_not_found_err">Nun hai aplicación de mapes instalada dala p\'amosar l\'allugamientu</string>
   <!-- Continuous shot enable message -->
-  <string name="longshot_enable_message">Carauterístiques avanzaes que nun tán sofitaes nel mou de disparu continuu</string>
   <!-- Advanced features enable message -->
-  <string name="advance_feature_enable_msg">Nun tán sofitáu\'l disparu continuu al tar habilitaes les carauterístiques avanzaes</string>
   <!-- The alas of CameraActivity for gesture operation -->
-  <string name="camera_gesture_title">Llanzar cámara</string>
-  <string name="pref_camera_tsmakeup_entry_off">Apagar</string>
-  <string name="all_in_focus">Too nel focu</string>
-  <string name="refocus_toast">Pa volver a enfocar la postrer semeya, primi equí</string>
   <!-- Help menu strings -->
-  <string name="pref_camera2_mono_preview_entry_off">Apagar</string>
-  <string name="pref_camera2_clearsight_entry_off">Apagar</string>
-  <string name="pref_camera2_mpo_entry_off">Apagar</string>
-  <string name="pref_camera2_noise_reduction_entry_off">Apagar</string>
-  <string name="pref_camera2_shutter_sound_entry_off">Apagar</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 5df146d4e..fa844fc34 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -16,175 +16,89 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
-  <string name="app_name">Cámara</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
-  <string name="video_camera_label">Videocámara</string>
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
-  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
-  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
-  <string name="set_image">Afitar como</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
-  <string name="delete">Desaniciar</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
-  <plurals name="delete_selection">
-    <item quantity="one">Desaniciar l\'elementu esbilláu?</item>
-    <item quantity="other">Desaniciar los elementos esbillaos?</item>
-  </plurals>
-  <string name="share">Compartir</string>
-  <string name="share_panorama">Compartir panorámica</string>
-  <string name="share_as_photo">Compartir como semeya</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
-  <string name="deleted">Desaniciáu</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
-  <string name="undo">DESFACER</string>
-  <string name="details">Detalles</string>
-  <string name="close">Zarrar</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_items_selected">
-    <item quantity="one">%1$d esbilláu</item>
-    <item quantity="other">%1$d esbillaos</item>
-  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_albums_selected">
-    <item quantity="one">%1$d esbilláu</item>
-    <item quantity="other">%1$d esbillaos</item>
-  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_groups_selected">
-    <item quantity="one">%1$d esbilláu</item>
-    <item quantity="other">%1$d esbillaos</item>
-  </plurals>
   <!-- String indicating timestamp of photo or video -->
-  <string name="show_on_map">Amosar nel mapa</string>
-  <string name="rotate_left">Xirar a la esquierda</string>
-  <string name="rotate_right">Xirar a la derecha</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
-  <string name="edit">Editar</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
-  <string name="crop_action">Recortar</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
-  <string name="trim_action">Recortar</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
-  <string name="set_as">Afitar como</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
-  <string name="video_err">Nun pue reproducise\'l videu.</string>
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
-  <string name="crop_saved">
-        La imaxe recortada guardóse en <xliff:g id="FOLDER_NAME">%s</xliff:g>.</string>
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
-  <string name="title">Títulu</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
-  <string name="description">Descripción</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
-  <string name="time">Hora</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
-  <string name="location">Llocalización</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
-  <string name="path">Camín</string>
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
-  <string name="width">Anchor</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
-  <string name="height">Altor</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
-  <string name="orientation">Orientación</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
-  <string name="duration">Duración</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
-  <string name="mimetype">Tipu de MIME</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
-  <string name="file_size">Tamañu del ficheru</string>
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
-  <string name="maker">Creador</string>
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
-  <string name="model">Modelu</string>
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
-  <string name="flash">Flash</string>
   <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
-  <string name="aperture">Apertura</string>
   <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
-  <string name="focal_length">Llonxitú focal</string>
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
-  <string name="white_balance">Balance de blancos</string>
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
-  <string name="exposure_time">Tiempu d\'esposición</string>
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
-  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
-  <string name="unit_mm">mm</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
-  <string name="manual">Manual</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
-  <string name="auto">Auto</string>
   <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
-  <string name="flash_on">Flash activáu</string>
   <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
-  <string name="flash_off">Ensin flash</string>
   <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
-  <string name="unknown">Desconocíu</string>
   <!-- Toast message shown after we try to make a local album available offline
          [CHAR LIMIT=150] -->
-  <string name="try_to_set_local_album_available_offline">
-        L\'elementu almacenóse de forma llocal y ta disponible ensin conexón.</string>
   <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
-  <string name="please_wait">Espera</string>
   <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
-  <string name="rendering_photo_sphere">Procesando semeya esférica</string>
   <!-- title for the dialog showing the error of camera hardware -->
-  <string name="camera_error_title">Fallu de cámara</string>
   <!-- message for the dialog showing the error of camera hardware -->
-  <string name="cannot_connect_camera">Nun pue accedese a la cámara.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
-  <string name="camera_disabled">Inhabilitóse la cámara por polítiques de seguridá.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
   <!-- alert to the user to wait for some operation to complete -->
-  <string name="wait">Por favor, espera\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
-  <string name="no_storage" product="default">Pa poder usar la cámara, inxerta una tarxeta SD.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
-  <string name="preparing_sd" product="default">Tresnando tarxeta SD\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
-  <string name="access_sd_fail" product="default">Nun pudo accedese a la tarxeta SD.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
-  <string name="time_lapse_title">Grabación a intervalos de tiempu</string>
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
-  <string name="capturing">Capturando</string>
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
-  <string name="pref_camera_id_title">Seleicionar cámara</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
-  <string name="pref_camera_id_entry_back">Atrás</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
-  <string name="pref_camera_id_entry_front">Delantera</string>
   <!-- Settings screen, setting title text -->
   <!--  Label for record location preference [CHAR LIMIT=50] -->
-  <string name="pref_camera_location_label">LLOCALIZACIÓN</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
-  <string name="pref_camera_timer_title">Temporizador de cuenta atrás</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
   <plurals name="pref_camera_timer_entry">
     <item quantity="one">1 segundu</item>
     <item quantity="other">%d segundos</item>
   </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
-  <string name="pref_camera_timer_sound_title">Usar pitíu</string>
   <!-- Entry of camera save path -->
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
-  <string name="setting_off">Non</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
-  <string name="setting_on">Activáu</string>
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
   <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
-  <string name="pref_video_quality_title">Calidá de videu</string>
   <!-- The default quality value is NULL -->
   <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
@@ -197,95 +111,47 @@
   <!-- Video quality setting entry. Videos will be recorded in 2K quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
-  <string name="pref_video_time_lapse_frame_interval_title">Intervalu de tiempu</string>
   <!-- Settings screen, Camera setting category title -->
-  <string name="pref_camera_settings_category">Axustes de la cámara</string>
   <!-- Settings screen, Camcorder setting category title -->
-  <string name="pref_camcorder_settings_category">Configuración de videocámara</string>
   <!-- Settings screen, Picture size title -->
-  <string name="pref_camera_picturesize_title">Tamañu imaxe</string>
   <!-- Settings screen, Focus mode title -->
-  <string name="pref_camera_focusmode_title">Mou d\'enfoque</string>
   <!-- Settings screen, Focus mode dialog radio button choices -->
-  <string name="pref_camera_focusmode_entry_auto">Automáticu</string>
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
-  <string name="pref_camera_focusmode_entry_infinity">Infinitu</string>
   <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
-  <string name="pref_camera_focusmode_entry_macro">Macro</string>
   <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
-  <string name="pref_camera_focusmode_label_auto">AUTOMÁTICU</string>
-  <string name="pref_camera_focusmode_label_infinity">INFINITU</string>
-  <string name="pref_camera_focusmode_label_macro">MACRO</string>
   <!-- Default flash mode setting.-->
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
-  <string name="pref_camera_flashmode_title">Flash</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
-  <string name="pref_camera_flashmode_entry_auto">Automáticu</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
-  <string name="pref_camera_flashmode_entry_on">Activáu</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
-  <string name="pref_camera_flashmode_entry_off">Non</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
-  <string name="pref_camera_flashmode_label_auto">FLASH AUTOMÁTICU</string>
-  <string name="pref_camera_flashmode_label_on">FLASH ACTIVÁU</string>
-  <string name="pref_camera_flashmode_label_off">FLASH DESACTIVÁU</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
-  <string name="pref_camera_whitebalance_title">Balance de blancos</string>
   <!-- Menu, white balance label -->
-  <string name="pref_camera_whitebalance_label">BALANCE DE BLANCOS</string>
   <!-- Settings screen, White balance dialog radio button choices -->
-  <string name="pref_camera_whitebalance_entry_auto">Automáticu</string>
-  <string name="pref_camera_whitebalance_entry_incandescent">Incandescente</string>
-  <string name="pref_camera_whitebalance_entry_daylight">Lluz natural</string>
-  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescente</string>
-  <string name="pref_camera_whitebalance_entry_cloudy">Ñuble</string>
   <!-- Menu, White balance labels [CHAR LIMIT=50] -->
-  <string name="pref_camera_whitebalance_label_auto">AUTOMÁTICU</string>
-  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENTE</string>
-  <string name="pref_camera_whitebalance_label_daylight">LLUZ NATURAL</string>
-  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENTE</string>
-  <string name="pref_camera_whitebalance_label_cloudy">ÑUBLE</string>
   <!-- Default scene mode setting. -->
   <!-- Settings screen, Select Scene mode -->
-  <string name="pref_camera_scenemode_title">Mou d\'escena</string>
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_auto">Automáticu</string>
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_action">Aición</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_night">Nueche</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_sunset">Atapecer</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_party">Folixa</string>
   <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_auto">NENGÚN</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_action">AICIÓN</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_night">NUECHE</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_sunset">ATAPECER</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_party">FOLIXA</string>
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
-  <string name="pref_camera_countdown_label_off">TEMPORIZADOR DESACTIVÁU</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
   <string name="pref_camera_countdown_label_one">1 SEGUNDU</string>
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
@@ -295,7 +161,6 @@
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
   <string name="pref_camera_countdown_label_fifteen">15 SEGUNDOS</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
-  <string name="not_selectable_in_scene_mode">Nun pue seleicionase nel mou d\'escena.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
@@ -306,234 +171,125 @@
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
   <!-- Exposure settings in preference -->
-  <string name="pref_exposure_title">Esposición</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
-  <string name="pref_exposure_label">ESPOSICIÓN</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
-  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
-  <string name="pref_camera_id_label_back">CÁMARA FRONTAL</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
-  <string name="pref_camera_id_label_front">CÁMARA TRASERA</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
-  <string name="dialog_ok">Aceutar</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
-  <string name="spaceIsLow_content" product="default">Nun hai espaciu na tarxeta SD. Cambia la configuración de calidá o desanicia dalgunes imáxenes o otros ficheros.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
-  <string name="video_reach_size_limit">Algamóse\'l tamañu máximu.</string>
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
-  <string name="pano_too_fast_prompt">Mui rápidu</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
-  <string name="pano_dialog_prepare_preview">Preparando mou panorámicu</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
-  <string name="pano_dialog_panorama_failed">Fallu al guardar imaxe panorámica.</string>
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
-  <string name="pano_dialog_title">Panorámicu</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
-  <string name="pano_capture_indication">Capturando panorámica</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
-  <string name="pano_dialog_waiting_previous">Esperando semeya panorámica anterior</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
-  <string name="pano_review_saving_indication_str">Guardando\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
-  <string name="pano_review_rendering">Creando panorámica</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
-  <string name="tap_to_focus">Toca pa enfocar.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
-  <string name="pref_video_effect_title">Efeutos</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
-  <string name="effect_none">Nengún</string>
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_squeeze">Comprimir</string>
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_big_eyes">Güeyos grandes</string>
   <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_big_mouth">Boca grande</string>
   <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_small_mouth">Boca pequeña</string>
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_big_nose">Nariz grande</string>
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_small_eyes">Güeyos pequeños</string>
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
-  <string name="effect_backdropper_space">Nel espaciu</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
-  <string name="effect_backdropper_sunset">Atapecer</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
-  <string name="effect_backdropper_gallery">El to videu</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
-  <string name="video_snapshot_hint">Toca pa facer una semeya mientres grabes un videu.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
-  <string name="video_recording_started">Anicióse la grabación de videu.</string>
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
-  <string name="video_recording_stopped">La grabación de videu detúvose.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
-  <string name="clear_effects">Quitar efeutos</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
-  <string name="effect_silly_faces">CARES GRACIOSES</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
-  <string name="effect_background">FONDU</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_shutter_button">Disparador</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_menu_button">Botón Menú</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_mode_picker">Cámara, videu o mou panorámicu</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_check_box">Caxellu de verificación %1$s</string>
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_camera">Cambiar a la cámara</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_video">Cambiar a videu</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_panorama">Cambiar a mou panorámicu</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_photo_sphere">Cambiar a fotografía esférica</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_gcam">Cambiar a calidá alta</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_cancel">Revisar encaboxar</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_ok">Revisar fecho</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_retake">Revisar repetición</string>
   <!-- Default text for a button that can be toggled on and off. -->
-  <string name="capital_on">SÍ</string>
   <!-- Default text for a button that can be toggled on and off. -->
-  <string name="capital_off">NON</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_off">Non</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_500">0,5 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_1000">1 segundu</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_1500">1,5 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_2000">2 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_2500">2,5 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_3000">3 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_4000">4 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_5000">5 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_6000">6 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_10000">10 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_12000">12 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_15000">15 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_24000">24 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_30000">0,5 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_60000">1 minutu</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_90000">1,5 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_120000">2 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_150000">2,5 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_180000">3 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_240000">4 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_300000">5 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_360000">6 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_600000">10 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_720000">12 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_900000">15 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_1440000">24 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_1800000">0,5 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_3600000">1 hora</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_5400000">1,5 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_7200000">2 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_9000000">2,5 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_10800000">3 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_14400000">4 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_18000000">5 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_21600000">6 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_36000000">10 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_43200000">12 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_54000000">15 hores</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_86400000">24 hores</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
   <string name="time_lapse_seconds">segundos</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
-  <string name="time_lapse_minutes">minutos</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
-  <string name="time_lapse_hours">hores</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
-  <string name="time_lapse_interval_set">Fecho</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
-  <string name="set_time_interval">Afita intervalu de tiempu</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
-  <string name="set_time_interval_help">L\'intervalu de tiempu ta desactiváu. Activa esta función p\'afitar un intervalu.</string>
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
-  <string name="set_duration">Definir duración en segundos</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
-  <string name="count_down_title_text">Cuenta atrás pa facer una semeya</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
-  <string name="remember_location_title">¿Recordar llocalizaciones de les semeyes?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
-  <string name="remember_location_prompt">Etiqueta les tos semeyes y vídeos coles llocalizaciones au se fexeron.\n\nOtres aplicaciones puen acceder a esta información, asina como a les imáxenes guardaes.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
-  <string name="remember_location_no">Non, gracies</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
-  <string name="remember_location_yes">Sí</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
-  <string name="camera_menu_more_label">MÁS OPCIONES</string>
   <!-- settings label [CHAR LIMIT=50] -->
-  <string name="camera_menu_settings_label">AXUSTES</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
-  <string name="create_tiny_planet">Crear Planeta nanu</string>
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
-  <string name="saving_tiny_planet">Guardar Planeta nanu &#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
-  <string name="tiny_planet_zoom">Zoom</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
-  <string name="tiny_planet_rotate">Xirar</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
-  <string name="crop_save">Guardar</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
-  <string name="cannot_load_image">Fallu al cargar la imaxe!</string>
   <!-- Label for album filmstrip button -->
-  <string name="switch_photo_filmstrip">Vista de tira de película</string>
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
-  <string name="setting_wallpaper">Afitando fondu de pantalla</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
 </resources>
diff --git a/res/values-es-rUS/qcomstrings.xml b/res/values-es-rUS/qcomstrings.xml
index 46ea5ba88..bcd5ed755 100644
--- a/res/values-es-rUS/qcomstrings.xml
+++ b/res/values-es-rUS/qcomstrings.xml
@@ -59,7 +59,7 @@
   <string name="pref_camera_skinToneEnhancement_entry_disable">Desactivar</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
-  <string name="pref_camera_zsl_title">Eliminar retraso del disparador</string>
+  <string name="pref_camera_zsl_title">Desactivar retraso del disparador</string>
   <!-- Default selectable zone af setting. Do not translate. -->
   <!-- Settings screen, Selectable zone af title -->
   <string name="pref_camera_selectablezoneaf_title">Zona de enfoque automático</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8d45d506f..fa276fb8c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -27,11 +27,11 @@
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
   <string name="set_image">Establecer imagen como</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
-  <string name="delete">Eliminar</string>
+  <string name="delete">Borrar</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
   <plurals name="delete_selection">
-    <item quantity="one">¿Eliminar elemento?</item>
-    <item quantity="other">¿Eliminar elementos?</item>
+    <item quantity="one">¿Borrar elemento?</item>
+    <item quantity="other">¿Borrar elementos?</item>
   </plurals>
   <string name="share">Compartir</string>
   <string name="share_panorama">Compartir foto panorámica</string>
@@ -388,7 +388,7 @@ La imagen recortada se guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
   <string name="video_recording_stopped">Se detuvo la grabación de video.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
-  <string name="clear_effects">Eliminar efectos</string>
+  <string name="clear_effects">Limpiar efectos</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
   <string name="effect_silly_faces">CARAS GRACIOSAS</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
diff --git a/res/values-eu-rES/camera2arrays.xml b/res/values-eu-rES/camera2arrays.xml
index c5b0b7a8f..9c391e0dc 100644
--- a/res/values-eu-rES/camera2arrays.xml
+++ b/res/values-eu-rES/camera2arrays.xml
@@ -28,6 +28,14 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Bai</item>
+    <item>Ez</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>On</item>
+    <item>Ez</item>
+  </string-array>
   <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
         -1 refers to ones not supported in Camera2 API
         0 is special case added for auto (meaning off)
diff --git a/res/values-eu-rES/qcomstrings.xml b/res/values-eu-rES/qcomstrings.xml
index a7ca54ead..7960f9a50 100644
--- a/res/values-eu-rES/qcomstrings.xml
+++ b/res/values-eu-rES/qcomstrings.xml
@@ -26,7 +26,10 @@
   <!-- Video quality setting entry. Videos will be recorded in QVGA quality. [CHAR LIMIT=24] -->
   <!-- Video quality setting entry. Videos will be recorded in QCIF quality. [CHAR LIMIT=24] -->
   <!-- Settings screen, Power Mode title -->
+  <string name="pref_camera_powermode_title">Energia modua</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Energia baxua</string>
+  <string name="pref_camera_powermode_entry_np">Energia arrunta</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
diff --git a/res/values-in/qcomstrings.xml b/res/values-in/qcomstrings.xml
index a888bd6a9..b9b21794f 100644
--- a/res/values-in/qcomstrings.xml
+++ b/res/values-in/qcomstrings.xml
@@ -382,7 +382,12 @@
   <string name="help_menu_ok">OKE</string>
   <string name="help_menu_scene_mode_1">Pilih</string>
   <string name="help_menu_scene_mode_2">Mode pemotretan</string>
+  <string name="help_menu_scene_mode_3">untuk foto yang lebih bagus</string>
+  <string name="help_menu_color_filter_3">ke</string>
+  <string name="help_menu_beautify_2">dengan</string>
+  <string name="help_menu_switcher_2">antara</string>
   <string name="help_menu_switcher_3">kamera, video, dan panorama</string>
+  <string name="pref_camera2_camera2_title">Mode Camera2</string>
   <string name="pref_camera2_camera2_entry_enable">Hidup</string>
   <string name="pref_camera2_camera2_entry_disable">Mati</string>
   <string name="pref_camera2_mono_only_title">Hanya mono</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e771ca679..353430e33 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -300,6 +300,7 @@ Gambar yang dipotong disimpan ke <xliff:g id="folder_name">%s</xliff:g>.</string
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
   <string name="video_quality_4k_disable_IS">Kualitas video 4k akan menonaktifkan kestabilan gambar.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore tidak dapat diaktifkan selama video 4k.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
   <string name="disable_CDS_during_HighQualityNoiseReduction">Pengurangan derau berkualitas tinggi akan menonaktifkan CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
diff --git a/res/values-ja/qcomstrings.xml b/res/values-ja/qcomstrings.xml
index 1d75fa68c..938929fbc 100644
--- a/res/values-ja/qcomstrings.xml
+++ b/res/values-ja/qcomstrings.xml
@@ -387,7 +387,7 @@
   <string name="advance_feature_enable_msg">上級者向けの機能が有効になっている場合は連写は使用できません</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">カメラを起動</string>
-  <string name="pref_camera_tsmakeup_title">美化</string>
+  <string name="pref_camera_tsmakeup_title">ビューティーモード</string>
   <string name="pref_camera_tsmakeup_entry_on">ON</string>
   <string name="pref_camera_tsmakeup_entry_off">OFF</string>
   <string name="pref_camera_tsmakeup_entry_low">弱</string>
@@ -397,10 +397,10 @@
   <string name="pref_camera_tsmakeup_level_whiten">白くする</string>
   <string name="pref_camera_tsmakeup_level_clean">ソフトにする</string>
   <string name="text_tsmakeup_alert_title">注意</string>
-  <string name="text_tsmakeup_alert_msg">美化機能を使用するには顔検出を有効にしないといけません。続行しますか？</string>
+  <string name="text_tsmakeup_alert_msg">ビューティーモードを使用するには顔検出を有効にしないといけません。続行しますか？</string>
   <string name="text_tsmakeup_alert_continue">続行</string>
   <string name="text_tsmakeup_alert_quit">キャンセル</string>
-  <string name="text_tsmakeup_beautify_toast">美化</string>
+  <string name="text_tsmakeup_beautify_toast">ビューティーモード</string>
   <string name="all_in_focus">全焦点</string>
   <string name="refocus_toast">前の写真をリフォーカスするには、ここをタップしてください</string>
   <string name="refocus_prompt_message">UbiFocus を使用すると、シャッターボタンを押す度に5枚写真を撮影します。5枚の写真を1枚に結合してすべてにフォーカスされているようにします。写真を撮影した後でも再フォーカスできます。</string>
@@ -410,9 +410,19 @@
   <string name="mute_button_desc">ミュートボタン</string>
   <!-- Help menu strings -->
   <string name="help_menu_ok">OK</string>
+  <string name="help_menu_scene_mode_1">最適な</string>
   <string name="help_menu_scene_mode_2">撮影モード</string>
-  <string name="help_menu_color_filter_1">色を適用</string>
-  <string name="help_menu_color_filter_2">フィルター</string>
+  <string name="help_menu_scene_mode_3">で良い写真を撮影しましょう</string>
+  <string name="help_menu_color_filter_1">カラー</string>
+  <string name="help_menu_color_filter_2">フィルタを適用</string>
+  <string name="help_menu_color_filter_3">して、</string>
+  <string name="help_menu_color_filter_4">写真を改善しましょう</string>
+  <string name="help_menu_beautify_1">ビューティーモードで</string>
+  <string name="help_menu_beautify_2">ポートレートを</string>
+  <string name="help_menu_beautify_3">もっと綺麗に</string>
+  <string name="help_menu_switcher_1">カメラやビデオ、パノラマを</string>
+  <string name="help_menu_switcher_2">自由自在に</string>
+  <string name="help_menu_switcher_3">切り替えます</string>
   <string name="pref_camera2_camera2_title">Camera2 モード</string>
   <string name="pref_camera2_camera2_entry_enable">有効</string>
   <string name="pref_camera2_camera2_entry_disable">無効</string>
diff --git a/res/values-ko/camera2arrays.xml b/res/values-ko/camera2arrays.xml
index c5b0b7a8f..ff514c275 100644
--- a/res/values-ko/camera2arrays.xml
+++ b/res/values-ko/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>켜짐</item>
+    <item>꺼짐</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>바이엘</item>
+    <item>흑백</item>
+    <item>전면</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>켜짐</item>
+    <item>꺼짐</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>켜짐</item>
+    <item>꺼짐</item>
+  </string-array>
   <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
         -1 refers to ones not supported in Camera2 API
         0 is special case added for auto (meaning off)
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index b6229cfcc..c19dd47b1 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -18,10 +18,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">와이드</string>
   <!-- format for entries in the picture size menu. Parameter one is aspect ratio
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f만 화소</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">모션 블러 감소</string>
   <string name="pref_camera_scenemode_entry_aqua">아쿠아</string>
@@ -101,4 +103,6 @@
   <string name="pref_camera_shutter_speed_title">셔터 속도</string>
   <string name="auto_hdr_enabled">자동 HDR 사용</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">고급 카메라 옵션이 활성화되었습니다</string>
+  <string name="developer_menu_disabled">고급 카메라 옵션이 비활성화되었습니다</string>
 </resources>
diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml
index 28057c41d..feb442563 100644
--- a/res/values-ko/qcomstrings.xml
+++ b/res/values-ko/qcomstrings.xml
@@ -26,7 +26,10 @@
   <!-- Video quality setting entry. Videos will be recorded in QVGA quality. [CHAR LIMIT=24] -->
   <!-- Video quality setting entry. Videos will be recorded in QCIF quality. [CHAR LIMIT=24] -->
   <!-- Settings screen, Power Mode title -->
+  <string name="pref_camera_powermode_title">전력 모드</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">저전력</string>
+  <string name="pref_camera_powermode_entry_np">일반 전력</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
@@ -52,6 +55,8 @@
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <string name="pref_camera_skinToneEnhancement_title">피부 색 개선</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">사용</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">사용 안 함</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">제로 셔터 랙</string>
@@ -87,21 +92,35 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">디옵터 모드</string>
   <string name="pref_camera_manual_focus_entry_off">끄기</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">순간 캡처</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">적극적 자동 노출 제어(AEC)</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">빠른 자동 노출 제어(AEC)</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">사용 안 함</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">끄기</string>
+  <string name="pref_camera_zsl_entry_on">켜짐</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR이 켜져 있을 때에는 자동 모드만 사용할 수 있습니다</string>
+  <string name="scene_enable_message">HDR은 자동을 제외한 장면 모드를 지원하지 않습니다</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">끄기</string>
+  <string name="pref_camera_video_hdr_entry_on">켜짐</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">끄기</string>
+  <string name="pref_camera_cds_entry_on">켜짐</string>
   <string name="pref_camera_cds_entry_auto">자동</string>
   <!-- Settings screen, video CDS location dialog choices -->
   <string name="pref_camera_video_cds_entry_off">끄기</string>
+  <string name="pref_camera_video_cds_entry_on">켜짐</string>
   <string name="pref_camera_video_cds_entry_auto">자동</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">사용 안 함</string>
+  <string name="pref_camera_tnr_entry_enable">사용</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">사용 안 함</string>
+  <string name="pref_camera_video_tnr_entry_enable">사용</string>
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, setting title text for Video HDR-->
   <string name="pref_camera_video_hdr_title">비디오 HDR</string>
@@ -122,15 +141,25 @@
   <string name="pref_camera_facedetection_title">얼굴 인식</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">끄기</string>
+  <string name="pref_camera_facedetection_entry_on">켜짐</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">셀카 조명</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">끄기</string>
+  <string name="pref_selfie_flash_entry_on">켜짐</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">적목현상 제거</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">사용</string>
+  <string name="pref_camera_redeyereduction_entry_disable">사용 안 함</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">셀카 뒤집기</string>
+  <string name="pref_camera_selfiemirror_entry_enable">사용</string>
+  <string name="pref_camera_selfiemirror_entry_disable">사용 안 함</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">촬영음</string>
+  <string name="pref_camera_shuttersound_entry_enable">사용</string>
+  <string name="pref_camera_shuttersound_entry_disable">사용 안 함</string>
   <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">비디오 안정화 모드, 시간 경과 모드와 HDR 모드에서는 고속 카메라/슬로우 모션이 지원되지 않습니다.</string>
@@ -145,14 +174,20 @@
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <string name="error_app_unsupported">이 코덱에서는 지원되지 않는 비디오 해상도입니다</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">지원되지 않는 영상 프로필</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">RAW 사진 포맷은 제로 셔터 렉 모드에서 지원되지 않습니다. JPEG를 선택하세요</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">자동 노출 브래킷</string>
   <string name="pref_camera_ae_bracket_hdr_title">자동 노출 브래킷</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">켜짐</string>
+  <string name="err_app_unsupport_ae_bracket_code">자동 노출(AE) 브라케팅은 아직 지원하지 않습니다</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">비디오 스냅샷 해상도가 영상의 해상도보다 낮아 해상도를 영상에 맞춥니다. 해상도를 현재 영상 해상도와 같거나 높게 선택해주세요.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">이미지 해상도 변경은 저전력 모드에서 지원되지 않으며, 비디오 스냅샷 해상도로 촬영됩니다. 이미지 해상도를 변경하려면 일반 전력 모드를 선택해주세요.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">이 해상도에서는 비디오 스냅샷 크기만 지원됩니다.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">슬로우 모션</string>
@@ -165,21 +200,27 @@
   <string name="pref_camera_hfr_entry_hsr_60">60 FPS 고속 카메라</string>
   <string name="pref_camera_hfr_entry_hsr_90">90 FPS 고속 카메라</string>
   <string name="pref_camera_hfr_entry_hsr_120">120 FPS 고속 카메라</string>
+  <string name="pref_camera_hfr_entry_hsr_240">240 FPS 고속 카메라</string>
   <!-- HFR entry values. Do not translate. -->
   <!-- Default noise reduction setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
+  <string name="pref_camera_noise_reduction_title">노이즈 감소</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">끄기</string>
+  <string name="pref_camera_noise_reduction_entry_fast">빠르게</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">높은 품질</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_see_more_entry_off">끄기</string>
+  <string name="pref_camera_see_more_entry_on">켜짐</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">노이즈 감쇄</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">끄기</string>
+  <string name="pref_camera_denoise_entry_on">켜짐</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -201,13 +242,14 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (미국)</string>
   <string name="pref_camera_antibanding_entry_3">자동</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">켜짐</string>
   <string name="pref_camera_filter_mode_entry_off">끄기</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">색상 효과</string>
   <string name="pref_camera_filter_mode_title">색상 효과</string>
   <!-- Settings screen, Color effect dialog radio button choices -->
   <string name="pref_camera_coloreffect_entry_none">없음</string>
-  <string name="pref_camera_coloreffect_entry_mono">모노</string>
+  <string name="pref_camera_coloreffect_entry_mono">흑백</string>
   <string name="pref_camera_coloreffect_entry_sepia">세피아</string>
   <string name="pref_camera_coloreffect_entry_negative">네거티브</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
@@ -224,14 +266,17 @@
   <string name="pref_camera_coloreffect_entry_greentint">초록색</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">끄기</string>
+  <string name="pref_camera_touchafaec_entry_on">켜짐</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">비디오 안정화</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">끄기</string>
+  <string name="pref_camera_dis_entry_on">켜짐</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">얼굴 인식</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">끄기</string>
+  <string name="pref_camera_facerc_entry_on">켜짐</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">레벨 0</string>
   <string name="pref_camera_sharpness_entry_level1">레벨 1</string>
@@ -282,10 +327,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">사진 품질</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">낮음</string>
+  <string name="pref_camera_jpegquality_entry_1">표준</string>
+  <string name="pref_camera_jpegquality_entry_2">높음</string>
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
   <string name="pref_camera_histogram_title">히스토그램</string>
   <!-- Settings screen, Histogram radio button choices -->
+  <string name="pref_camera_histogram_entry_enable">사용</string>
+  <string name="pref_camera_histogram_entry_disable">사용 안 함</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -293,7 +343,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">끄기</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">켜짐</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">타임랩스 촬영에서 사용할 수 없는 영상 해상도입니다.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">연속 촬영</string>
   <string name="msg_cancel_longshot_for_limited_memory">메모리가 부족하므로 연속 촬영을 취소합니다</string>
@@ -302,6 +354,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">자동 HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">사용</string>
+  <string name="pref_camera_auto_hdr_entry_disable">사용 안 함</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">내부 저장공간이 충분하지 않습니다. 저장소를 SD 카드로 변경하세요</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -319,6 +373,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">비디오 회전</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">영상 회전</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0도</string>
   <string name="pref_camera_video_rotation_entry_90">90도</string>
@@ -332,13 +387,69 @@
   <string name="advance_feature_enable_msg">연속 촬영은 고급 기능이 켜져있을 때 지원하지 않습니다</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">카메라 실행</string>
+  <string name="pref_camera_tsmakeup_title">미화</string>
+  <string name="pref_camera_tsmakeup_entry_on">켜짐</string>
   <string name="pref_camera_tsmakeup_entry_off">끄기</string>
+  <string name="pref_camera_tsmakeup_entry_low">낮음</string>
+  <string name="pref_camera_tsmakeup_entry_mid">중간</string>
+  <string name="pref_camera_tsmakeup_entry_high">높음</string>
+  <string name="pref_camera_tsmakeup_custom">사용자 지정</string>
+  <string name="pref_camera_tsmakeup_level_whiten">밝게</string>
+  <string name="pref_camera_tsmakeup_level_clean">부드럽게</string>
+  <string name="text_tsmakeup_alert_title">경고</string>
+  <string name="text_tsmakeup_alert_msg">미화 기능을 사용하기 위해서는 먼저 얼굴 인식 기능을 켜야 합니다. 계속하시겠습니까?</string>
+  <string name="text_tsmakeup_alert_continue">계속</string>
+  <string name="text_tsmakeup_alert_quit">취소</string>
+  <string name="text_tsmakeup_beautify_toast">피부 보정</string>
   <string name="all_in_focus">올 인 포커스</string>
   <string name="refocus_toast">이전 사진의 초점을 다시 맞추려면 여기를 탭하세요</string>
+  <string name="refocus_prompt_message">UbiFocus를 사용하면 촬영 버튼을 누를 때마다 5장의 사진을 찍습니다. 5장의 사진은 1장의 사진으로 묶여 모든 곳에 초점을 맞춥니다. 사진 촬영 후에 다시 초점을 맞출 수 있습니다.</string>
+  <string name="camera_thermal_shutdown">휴대전화 과열로 카메라 앱을 종료합니다.</string>
+  <string name="camera_server_died">미디어 서버가 작동하지 않아 카메라 앱을 종료합니다.</string>
+  <string name="camera_unknown_error">알 수 없는 오류로 카메라 앱을 종료합니다.</string>
+  <string name="mute_button_desc">음소거 버튼</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">확인</string>
+  <string name="help_menu_scene_mode_1">더 나은 사진을 위해</string>
+  <string name="help_menu_scene_mode_2">장면 모드를</string>
+  <string name="help_menu_scene_mode_3">선택하세요</string>
+  <string name="help_menu_color_filter_1">더 나은 사진을</string>
+  <string name="help_menu_color_filter_2">위해</string>
+  <string name="help_menu_color_filter_3">색상 필터를</string>
+  <string name="help_menu_color_filter_4">적용하세요</string>
+  <string name="help_menu_beautify_1">피부 보정 기능을</string>
+  <string name="help_menu_beautify_2">사용하여</string>
+  <string name="help_menu_beautify_3">인물 사진을 향상하세요</string>
+  <string name="help_menu_switcher_1">카메라, 비디오, 파노라마 간에</string>
+  <string name="help_menu_switcher_2">촬영 모드를</string>
+  <string name="help_menu_switcher_3">변경하세요</string>
+  <string name="pref_camera2_camera2_title">Camera2 모드</string>
+  <string name="pref_camera2_camera2_entry_enable">사용</string>
+  <string name="pref_camera2_camera2_entry_disable">사용 안 함</string>
+  <string name="pref_camera2_mono_only_title">흑백만 사용</string>
+  <string name="pref_camera2_mono_preview_title">흑백으로 미리보기</string>
+  <string name="pref_camera2_mono_preview_entry_on">켜짐</string>
   <string name="pref_camera2_mono_preview_entry_off">끄기</string>
+  <string name="pref_camera2_clearsight_entry_on">켜짐</string>
   <string name="pref_camera2_clearsight_entry_off">끄기</string>
+  <string name="clearsight_capture_success">ClearSight 촬영 성공</string>
+  <string name="clearsight_capture_fail">ClearSight 촬영 실패</string>
+  <string name="pref_camera2_mpo_title">MPO 포맷</string>
+  <string name="pref_camera2_mpo_entry_on">켜짐</string>
   <string name="pref_camera2_mpo_entry_off">끄기</string>
+  <string name="pref_camera2_makeup_title">메이크업</string>
+  <string name="pref_camera2_noise_reduction_title">노이즈 감소</string>
   <string name="pref_camera2_noise_reduction_entry_off">끄기</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">빠르게</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">높은 품질</string>
+  <string name="pref_camera2_videosnap_title">자동 스냅샷 크기</string>
+  <string name="pref_camera2_videosnap_entry_enable">사용</string>
+  <string name="pref_camera2_videosnap_entry_disable">사용 안 함</string>
+  <string name="pref_camera2_trackingfocus_title">초점 추적</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">잘 찍은 사진</string>
+  <string name="bestpicture_done">완료</string>
+  <string name="bestpicture_at_least_one_picture">적어도 하나의 사진은 선택해야 합니다.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">켜짐</string>
   <string name="pref_camera2_shutter_sound_entry_off">끄기</string>
+  <string name="pref_camera2_shutter_sound_title">촬영음</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a146f235f..e9edcf19f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -70,7 +70,7 @@
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
   <string name="set_as">다음으로 설정</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
-  <string name="video_err">동영상을 재생할 수 없습니다.</string>
+  <string name="video_err">영상을 재생할 수 없습니다.</string>
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
   <string name="crop_saved">
@@ -141,7 +141,9 @@
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <string name="camera_disabled">보안 정책으로 인해 카메라 사용이 중지되었습니다.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">앱을 실행하는 데 필수적인 권한이 부여되지 않았습니다. 권한 설정을 확인해 주세요.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">다시 묻지 않기</string>
   <!-- alert to the user to wait for some operation to complete -->
   <string name="wait">잠시 기다려 주세요\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
@@ -161,6 +163,7 @@
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <string name="pref_camera_id_entry_front">전면</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">GPS 위치</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
   <string name="pref_camera_location_label">위치</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
@@ -172,6 +175,9 @@
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">카운트다운 신호음 켜기</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">저장소</string>
+  <string name="pref_camera_savepath_entry_0">휴대전화</string>
+  <string name="pref_camera_savepath_entry_1">SD 카드</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">OFF</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
@@ -192,7 +198,7 @@
   <!-- Video quality setting entry. Videos will be recorded in 2K quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
-  <string name="pref_video_time_lapse_frame_interval_title">시간 경과</string>
+  <string name="pref_video_time_lapse_frame_interval_title">타임랩스</string>
   <!-- Settings screen, Camera setting category title -->
   <string name="pref_camera_settings_category">카메라 설정</string>
   <!-- Settings screen, Camcorder setting category title -->
@@ -292,14 +298,23 @@
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
   <string name="not_selectable_in_scene_mode">장면 모드에서 선택할 수 없습니다.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">HDR을 사용하면 연속 촬영이 꺼집니다.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">고급 캡처 옵션을 사용하면 연속 촬영이 꺼집니다.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">4K 영상 해상도를 사용하면 이미지 안정화가 꺼집니다.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">4K 영상 기능을 사용하는 동안에는 SeeMore 기능을 사용할 수 없습니다.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">고품질 노이즈 감소 기능을 사용하면 상관 이중 샘플링 기능(CDS)이 꺼집니다.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">고품질 노이즈 감소 기능을 사용하면 시간적 노이즈 감소 기능(TNR)이 꺼집니다.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore를 사용하면 상관 이중 샘플링 기능(CDS)이 꺼집니다.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore 기능을 사용하면 시간적 노이즈 감소 기능(TNR)이 꺼집니다.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore 기능을 사용하면 노이즈 감소 기능이 꺼집니다.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">노출</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
@@ -531,4 +546,6 @@ CHAR LIMIT = NONE] -->
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
   <string name="setting_wallpaper">배경화면 설정 중</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d 남음</string>
+  <string name="makeup_video_size_limit">메이크업은 영상 촬영 시 VGA 해상도 이하에서만 작동합니다.</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 319e8ee92..7a6f9b17e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -308,7 +308,7 @@
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
   <string name="video_quality_4k_disable_IS">Beeldstabilisatie wordt uitgeschakeld bij 4K-video.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
-  <string name="video_quality_4k_disable_SeeMore">SeeMore wordt uitgeschakeld bij bij 4K-video.</string>
+  <string name="video_quality_4k_disable_SeeMore">SeeMore wordt uitgeschakeld bij 4K-video.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
   <string name="disable_CDS_during_HighQualityNoiseReduction">Ruisonderdrukking van hoge kwaliteit zal CDS uitschakelen.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
@@ -551,4 +551,5 @@ CHAR LIMIT = NONE] -->
   <string name="setting_wallpaper">Achtergrond instellen</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
   <string name="remaining_photos_format">%d resterend</string>
+  <string name="makeup_video_size_limit">Make-up werkt alleen bij video-opnamen in VGA.</string>
 </resources>
diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml
index b91f65c93..02099be91 100644
--- a/res/values-pt-rBR/qcomstrings.xml
+++ b/res/values-pt-rBR/qcomstrings.xml
@@ -91,6 +91,8 @@
   <string name="pref_camera_manual_focus_entry_off">Desl.</string>
   <!-- Instant Capture entry -->
   <string name="pref_camera_instant_capture_title" translatable="true">Captura instantânea</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">AEC agressivo</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">AEC rápido</string>
   <string name="pref_camera_instant_capture_entry_disable" translatable="true">Desativar</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
@@ -98,6 +100,7 @@
   <string name="pref_camera_zsl_entry_on">Ativado</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
   <string name="hdr_enable_message">O modo HDR está ativado. Somente o modo de cena automático é suportado</string>
+  <string name="scene_enable_message">O modo HDR é suportado somente no modo de cena automático</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Desl.</string>
   <string name="pref_camera_video_hdr_entry_on">Ativado</string>
@@ -389,6 +392,7 @@
   <string name="refocus_toast">Para re-focar a última foto, toque aqui</string>
   <string name="camera_server_died">O servidor de mídia foi encerrado, fechando a câmera.</string>
   <string name="camera_unknown_error">Erro desconhecido, fechando a câmera.</string>
+  <string name="mute_button_desc">Botão de silêncio</string>
   <!-- Help menu strings -->
   <string name="help_menu_ok">OK</string>
   <string name="help_menu_scene_mode_1">Selecione um</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 1c933291a..6d6de5fe7 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -303,9 +303,13 @@
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">A redução de ruído em alta qualidade desativará o TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">O modo SeeMore desativará o CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">O modo SeeMore desativará o TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">O modo SeeMore desativará a redução de ruído.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Exposição</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
diff --git a/res/values-ru/qcomstrings.xml b/res/values-ru/qcomstrings.xml
index eeb0ca926..69c12f87c 100644
--- a/res/values-ru/qcomstrings.xml
+++ b/res/values-ru/qcomstrings.xml
@@ -192,12 +192,15 @@
   <string name="pref_camera_hfr_entry_hsr_60">Ускор. съёмка — 60 к/с</string>
   <string name="pref_camera_hfr_entry_hsr_90">Ускор. съёмка — 90 к/с</string>
   <string name="pref_camera_hfr_entry_hsr_120">Ускор. съёмка — 120 к/с</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Ускор. съёмка — 240 к/с</string>
   <!-- HFR entry values. Do not translate. -->
   <!-- Default noise reduction setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
+  <string name="pref_camera_noise_reduction_title">Шумоподавление</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">Отключить</string>
   <string name="pref_camera_noise_reduction_entry_fast">Быстро</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Высокое качество</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
@@ -342,6 +345,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Авто HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Включить</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Выключить</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Внутренней памяти недостаточно. Выбрано сохранение на SD-карту</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -359,6 +364,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Поворот видео</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">ПОВОРОТ ВИДЕО</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 градусов</string>
   <string name="pref_camera_video_rotation_entry_90">90 градусов</string>
@@ -373,9 +379,14 @@
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Включить камеру</string>
   <string name="pref_camera_tsmakeup_entry_off">Отключить</string>
+  <string name="text_tsmakeup_alert_continue">Продолжить</string>
+  <string name="text_tsmakeup_alert_quit">Отмена</string>
   <string name="all_in_focus">Все в фокусе</string>
   <string name="refocus_toast">Нажмите, чтобы перефокусировать последнее фото</string>
+  <string name="mute_button_desc">Кнопка отключения звука</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">ОК</string>
+  <string name="help_menu_scene_mode_2">Режим съёмки</string>
   <string name="pref_camera2_camera2_entry_enable">Включить</string>
   <string name="pref_camera2_camera2_entry_disable">Выключить</string>
   <string name="pref_camera2_mono_preview_entry_on">Включено</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 86676d0c2..415b728f9 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -171,7 +171,7 @@
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <string name="pref_camera_id_entry_front">Передня</string>
   <!-- Settings screen, setting title text -->
-  <string name="pref_camera_recordlocation_title">GPS місце розташування</string>
+  <string name="pref_camera_recordlocation_title">GPS місцезнаходження</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
   <string name="pref_camera_location_label">МІСЦЕЗНАХОДЖЕННЯ</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->