Automatic translation import

Change-Id: I2c94d99c51aaeb519d406cbe35bbaf00ffeb6d55

30 files changed, 714 insertions, 35 deletions

diff --git a/res/values-cs/qcomstrings.xml b/res/values-cs/qcomstrings.xml
index e2400c76c..58158a06d 100644
--- a/res/values-cs/qcomstrings.xml
+++ b/res/values-cs/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">Režim výkonu</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Nízký výkon</string>
+  <string name="pref_camera_powermode_entry_np">Normální výkon</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">Vylepšení tónů pleti</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Použít</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Zakázat</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Bez zpoždění závěrky</string>
@@ -87,21 +92,35 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Režim dioptrie</string>
   <string name="pref_camera_manual_focus_entry_off">Vypnuto</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">Okamžité snímání</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Agresivní AEC</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Rychlé AEC</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Vypnuto</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Vypnuto</string>
+  <string name="pref_camera_zsl_entry_on">Zapnuto</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR je povoleno, je podporován pouze režim Automatická scéna</string>
+  <string name="scene_enable_message">HDR není podporováno v jiném než automatickém režimu</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Vypnuto</string>
+  <string name="pref_camera_video_hdr_entry_on">Zapnuto</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Vypnuto</string>
+  <string name="pref_camera_cds_entry_on">Zapnuto</string>
   <string name="pref_camera_cds_entry_auto">Automaticky</string>
   <!-- Settings screen, video CDS location dialog choices -->
   <string name="pref_camera_video_cds_entry_off">Vypnuto</string>
+  <string name="pref_camera_video_cds_entry_on">Zapnuto</string>
   <string name="pref_camera_video_cds_entry_auto">Automaticky</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Zakázat</string>
+  <string name="pref_camera_tnr_entry_enable">Povolit</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Zakázat</string>
+  <string name="pref_camera_video_tnr_entry_enable">Povolit</string>
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, setting title text for Video HDR-->
   <string name="pref_camera_video_hdr_title">Video HDR</string>
@@ -122,15 +141,25 @@
   <string name="pref_camera_facedetection_title">Detekce obličeje</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Vypnuto</string>
+  <string name="pref_camera_facedetection_entry_on">Zapnuto</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Selfie blesk</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">Vypnuto</string>
+  <string name="pref_selfie_flash_entry_on">Zapnuto</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Redukce červených očí</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Povolit</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Zakázat</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Selfie zrcadlo</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Povolit</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Zakázat</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Zvuk závěrky</string>
+  <string name="pref_camera_shuttersound_entry_enable">Povoleno</string>
+  <string name="pref_camera_shuttersound_entry_disable">Zakázáno</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">Vysoká rychlost snímání (zpomalený pohyb) nelze použít pro stabilizátor / časosběr / 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">Nepodporované rozlišení videa pro daný kodek</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Nepodporovaný formát videa</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">Formát obrázku RAW není v režimu „Bez zpoždění závěrky“ podporován. Zvolte JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Automatický expoziční bracketing</string>
   <string name="pref_camera_ae_bracket_hdr_title">Automatický expoziční bracketing</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Zapnuto</string>
+  <string name="err_app_unsupport_ae_bracket_code">AE bracketing není zatím podporován</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Rozlišení snímků z videa je nižší než vlastní rozlišení videa. Zvolte rozlišení vyšší nebo stejné jako snímané video.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Změna velikosti obrázku není povolena v režimu nízkého výkonu, velikost bude stejná jako snímané video. Zvolte normální výkon pro umožnění změny velikosti rozlišení obrázku.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">V tomto rozlišení je pro snímek z videa povolena pouze velikost snímaného videa.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Zpomalený pohyb</string>
@@ -165,22 +200,27 @@
   <string name="pref_camera_hfr_entry_hsr_60">Vysoká rychlost 60 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_90">Vysoká rychlost 90 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_120">Vysoká rychlost 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Vysoká rychlost 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">Redukce šumu</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">Vypnuto</string>
   <string name="pref_camera_noise_reduction_entry_fast">Rychle</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Vysoká kvalita</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">Vypnuto</string>
+  <string name="pref_camera_see_more_entry_on">Zapnuto</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Odstranění šumu</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">Vypnuto</string>
+  <string name="pref_camera_denoise_entry_on">Zapnuto</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -202,6 +242,7 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
   <string name="pref_camera_antibanding_entry_3">Automaticky</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Zapnuto</string>
   <string name="pref_camera_filter_mode_entry_off">Vypnuto</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Barevný efekt</string>
@@ -225,16 +266,20 @@
   <string name="pref_camera_coloreffect_entry_greentint">Odstín zelené</string>
   <!-- Default Touch AF/AEC setting. Do not translate. -->
   <!-- Settings screen, Select Touch AF/AEC title -->
+  <string name="pref_camera_touchafaec_title">AF/AEC dotykem</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">Vypnuto</string>
+  <string name="pref_camera_touchafaec_entry_on">Zapnuto</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Stabilizace obrazu</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Vypnuto</string>
+  <string name="pref_camera_dis_entry_on">Zapnuto</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Detekce obličeje</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Vypnuto</string>
+  <string name="pref_camera_facerc_entry_on">Zapnuto</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Úroveň 0</string>
   <string name="pref_camera_sharpness_entry_level1">Úroveň 1</string>
@@ -285,10 +330,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Kvalita obrázku</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Nízká</string>
+  <string name="pref_camera_jpegquality_entry_1">Standardní</string>
+  <string name="pref_camera_jpegquality_entry_2">Vysoká</string>
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
   <string name="pref_camera_histogram_title">Histogram</string>
   <!-- Settings screen, Histogram radio button choices -->
+  <string name="pref_camera_histogram_entry_enable">Použít</string>
+  <string name="pref_camera_histogram_entry_disable">Zakázat</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -296,7 +346,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Vypnuto</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Zapnuto</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Neplatná velikost videa pro časosběrné nahrávání.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Sekvenční snímání</string>
   <string name="msg_cancel_longshot_for_limited_memory">Dochází paměť, ruší se sekvenční snímání</string>
@@ -305,6 +357,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Auotmatické HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Použít</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Zakázat</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Nedostatek místa na vnitřním úložišti. Ukládání se přepne na kartu SD</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -322,6 +376,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotace video</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">OTÁČENÍ VIDEA</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>
@@ -335,24 +390,69 @@
   <string name="advance_feature_enable_msg">Sekvenční snímání není podporováno při zapnutých rozšířených funkcích</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Spuštění fotoaparátu</string>
+  <string name="pref_camera_tsmakeup_title">Zkrášlování</string>
+  <string name="pref_camera_tsmakeup_entry_on">Zapnuto</string>
   <string name="pref_camera_tsmakeup_entry_off">Vypnuto</string>
+  <string name="pref_camera_tsmakeup_entry_low">Nízká</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Střední</string>
+  <string name="pref_camera_tsmakeup_entry_high">Vysoká</string>
+  <string name="pref_camera_tsmakeup_custom">Vlastní</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Bělení</string>
+  <string name="pref_camera_tsmakeup_level_clean">Změkčit</string>
+  <string name="text_tsmakeup_alert_title">Varování</string>
+  <string name="text_tsmakeup_alert_msg">Detekce obličeje musí být povolena chcete-li použít funkci zkrášlování. Chcete pokračovat?</string>
+  <string name="text_tsmakeup_alert_continue">Pokračovat</string>
+  <string name="text_tsmakeup_alert_quit">Zrušit</string>
+  <string name="text_tsmakeup_beautify_toast">Zkrášlení</string>
   <string name="all_in_focus">Zaostřeno na vše</string>
   <string name="refocus_toast">Dotykem zde znovu zaostřit poslední fotku</string>
+  <string name="refocus_prompt_message">S UbiFocus dojde při stisknutí závěrky ke zhotovení vždy 5 snímků. Tyto snímky se poté sloučí do jednoho. Po vytvoření tohoto snímku si můžete vybrat zaostření.</string>
+  <string name="camera_thermal_shutdown">Telefon se přehřál, fotoaparát se vypne.</string>
+  <string name="camera_server_died">Mediální server zemřel, vypínám fotoaparát.</string>
+  <string name="camera_unknown_error">Neznámá chyba, fotoaparát se vypne.</string>
+  <string name="mute_button_desc">Tlačítko pro ztlumení</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
+  <string name="help_menu_scene_mode_1">Vybrat</string>
+  <string name="help_menu_scene_mode_2">Scénický režim</string>
+  <string name="help_menu_scene_mode_3">pro lepší snímky</string>
+  <string name="help_menu_color_filter_1">Použít barvu</string>
+  <string name="help_menu_color_filter_2">filtry</string>
+  <string name="help_menu_color_filter_3">do</string>
+  <string name="help_menu_color_filter_4">vylepšení obrázků</string>
+  <string name="help_menu_beautify_1">Vylepšené portréty</string>
+  <string name="help_menu_beautify_2">s</string>
+  <string name="help_menu_beautify_3">Funkce zkrášlení</string>
+  <string name="help_menu_switcher_1">Přepnout</string>
+  <string name="help_menu_switcher_2">mezi</string>
+  <string name="help_menu_switcher_3">fotoaparát, video a panorama</string>
+  <string name="pref_camera2_camera2_title">Režim Camera2</string>
   <string name="pref_camera2_camera2_entry_enable">Použít</string>
   <string name="pref_camera2_camera2_entry_disable">Nepoužít</string>
+  <string name="pref_camera2_mono_only_title">Pouze Mono</string>
+  <string name="pref_camera2_mono_preview_title">Náhled Mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Zapnout</string>
   <string name="pref_camera2_mono_preview_entry_off">Vypnuto</string>
   <string name="pref_camera2_clearsight_entry_on">Zapnout</string>
   <string name="pref_camera2_clearsight_entry_off">Vypnuto</string>
   <string name="clearsight_capture_success">ClearSight úspěšně zachyceno</string>
   <string name="clearsight_capture_fail">ClearSight zachycení selhalo</string>
+  <string name="pref_camera2_mpo_title">MPO formát</string>
   <string name="pref_camera2_mpo_entry_on">Zapnout</string>
   <string name="pref_camera2_mpo_entry_off">Vypnuto</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_noise_reduction_title">Redukce šumu</string>
   <string name="pref_camera2_noise_reduction_entry_off">Vypnuto</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rychle</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Vysoká kvalita</string>
+  <string name="pref_camera2_videosnap_title">Automatická velikost snímku</string>
   <string name="pref_camera2_videosnap_entry_enable">Použít</string>
   <string name="pref_camera2_videosnap_entry_disable">Zakázat</string>
+  <string name="pref_camera2_trackingfocus_title">Sledování zaostření</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Nejlepší obraz</string>
+  <string name="bestpicture_done">HOTOVO</string>
+  <string name="bestpicture_at_least_one_picture">Musí být vybrán alespoň jeden obrázek.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Zapnuto</string>
   <string name="pref_camera2_shutter_sound_entry_off">Vypnuto</string>
+  <string name="pref_camera2_shutter_sound_title">Zvuk závěrky</string>
 </resources>
diff --git a/res/values-es-rUS/qcomstrings.xml b/res/values-es-rUS/qcomstrings.xml
index 3f94ba369..cab7fca64 100644
--- a/res/values-es-rUS/qcomstrings.xml
+++ b/res/values-es-rUS/qcomstrings.xml
@@ -79,7 +79,7 @@
   <string name="pref_camera_manual_exp_title">Exposición manual</string>
   <string name="pref_camera_manual_exp_entry_ISO_priority">Prioridad ISO</string>
   <string name="pref_camera_manual_exp_entry_exptime_priority">Prioridad tiempo de exposición</string>
-  <string name="pref_camera_manual_exp_entry_user_setting">Configuración de usuario</string>
+  <string name="pref_camera_manual_exp_entry_user_setting">Ajustes de usuario</string>
   <string name="pref_camera_manual_exp_entry_off">Desactivada</string>
   <!-- Manual white balance entry values -->
   <string name="pref_camera_manual_wb_title">Balance de blancos manual</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e4541887a..ecacc2099 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -204,9 +204,9 @@ La imagen recortada se guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
   <string name="pref_video_time_lapse_frame_interval_title">Intervalo</string>
   <!-- Settings screen, Camera setting category title -->
-  <string name="pref_camera_settings_category">Configuración de la cámara</string>
+  <string name="pref_camera_settings_category">Ajustes de la cámara</string>
   <!-- Settings screen, Camcorder setting category title -->
-  <string name="pref_camcorder_settings_category">Configuración de cámara de video</string>
+  <string name="pref_camcorder_settings_category">Ajustes de la cámara de video</string>
   <!-- Settings screen, Picture size title -->
   <string name="pref_camera_picturesize_title">Tamaño de imagen</string>
   <!-- Settings screen, Focus mode title -->
@@ -334,7 +334,7 @@ La imagen recortada se guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
   <!-- Dialog "OK" button. Dismisses dialog. -->
   <string name="dialog_ok">Aceptar</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
-  <string name="spaceIsLow_content" product="default">Tu tarjeta SD se está quedando sin espacio. Cambia la configuración de calidad o elimina algunas imágenes u otros archivos.</string>
+  <string name="spaceIsLow_content" product="default">Tu tarjeta SD se está quedando sin espacio. Cambia los ajustes de calidad o elimina algunas imágenes u otros archivos.</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. -->
diff --git a/res/values-es/camera2arrays.xml b/res/values-es/camera2arrays.xml
index c5b0b7a8f..15d009360 100644
--- a/res/values-es/camera2arrays.xml
+++ b/res/values-es/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Activado</item>
+    <item>Desactivado</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Mono</item>
+    <item>Frontal</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>Encender</item>
+    <item>Apagado</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Encendido</item>
+    <item>Apagado</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-es/cm_strings.xml b/res/values-es/cm_strings.xml
index d6d5fc8db..f6ac40d86 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/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">Ancho</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 megapíxeles</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">Reductor de desenfoque</string>
   <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
@@ -101,4 +103,6 @@
   <string name="pref_camera_shutter_speed_title">Velocidad del obturador</string>
   <string name="auto_hdr_enabled">Auto HDR activado</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">Has activado las opciones avanzadas de la cámara</string>
+  <string name="developer_menu_disabled">Has desactivado las opciones avanzadas de la cámara</string>
 </resources>
diff --git a/res/values-es/qcomstrings.xml b/res/values-es/qcomstrings.xml
index 7d8daf619..8246839ae 100644
--- a/res/values-es/qcomstrings.xml
+++ b/res/values-es/qcomstrings.xml
@@ -29,6 +29,7 @@
   <string name="pref_camera_powermode_title">Modo de energía</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <string name="pref_camera_powermode_entry_lp">Baja energía</string>
+  <string name="pref_camera_powermode_entry_np">Energía normal</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
@@ -54,6 +55,8 @@
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <string name="pref_camera_skinToneEnhancement_title">Mejorar tono de piel</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Activar</string>
+  <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>
@@ -89,21 +92,35 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Modo dioptría</string>
   <string name="pref_camera_manual_focus_entry_off">Apagar</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 agresivo</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">Desactivar</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Apagar</string>
+  <string name="pref_camera_zsl_entry_on">Activado</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">El HDR está activado, solo el modo de escena automática está soportado</string>
+  <string name="scene_enable_message">El HDR no está disponible en modos de escena diferentes al Auto</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Apagar</string>
+  <string name="pref_camera_video_hdr_entry_on">Activado</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Apagar</string>
+  <string name="pref_camera_cds_entry_on">Activado</string>
   <string name="pref_camera_cds_entry_auto">Automático</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_on">Activado</string>
   <string name="pref_camera_video_cds_entry_auto">Automático</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Desactivar</string>
+  <string name="pref_camera_tnr_entry_enable">Activar</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Desactivar</string>
+  <string name="pref_camera_video_tnr_entry_enable">Activar</string>
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, setting title text for Video HDR-->
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
@@ -124,15 +141,25 @@
   <string name="pref_camera_facedetection_title">Detección de rostros</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Apagar</string>
+  <string name="pref_camera_facedetection_entry_on">Activado</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Flash para selfie</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">Apagar</string>
+  <string name="pref_selfie_flash_entry_on">Activado</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Reducción de ojos rojos</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Activar</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Desactivar</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Espejo Selfie</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Activar</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Desactivar</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Sonido del obturador</string>
+  <string name="pref_camera_shuttersound_entry_enable">Activado</string>
+  <string name="pref_camera_shuttersound_entry_disable">Desactivado</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">La grabación de alta velocidad de fotogramas no es compatible cuando se usa la estabilización/TimeLapse/HDR.</string>
@@ -147,14 +174,20 @@
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <string name="error_app_unsupported">La resolución de vídeo no es compatible con este tipo de códec</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Perfil de vídeo no soportado</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">El formato de imagen RAW no es compatible con el retraso de obturador en modo cero. Selecciona JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Bracketing de exposición automática</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing de exposición automática</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Activado</string>
+  <string name="err_app_unsupport_ae_bracket_code">El horquillado AE no está soportado</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">El tamaño de instantánea es menor que el tamaño de vídeo. Por favor, selecciona una resolución igual o mayor al tamaño actual de vídeo.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">No está disponible la resolución de imagen para el modo de baja energía. Será capturada una instantánea a la resolución de vídeo. Por favor, selecciona el modo normal para usar el tamaño de imagen.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Solamente está soportado el tamaño de vídeo para esta resolución.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Grabación de alta velocidad de fotogramas</string>
@@ -167,21 +200,27 @@
   <string name="pref_camera_hfr_entry_hsr_60">Alta velocidad a 60 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_90">Alta velocidad a 90 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_120">Alta velocidad a 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Alta velocidad 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">Reducción de ruido</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">Apagar</string>
+  <string name="pref_camera_noise_reduction_entry_fast">Rápida</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Alta calidad</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>
+  <string name="pref_camera_see_more_entry_on">Activado</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Reducción de ruido</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">Apagar</string>
+  <string name="pref_camera_denoise_entry_on">Activado</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -203,6 +242,7 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (Estados Unidos)</string>
   <string name="pref_camera_antibanding_entry_3">Automático</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Activado</string>
   <string name="pref_camera_filter_mode_entry_off">Apagar</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Efecto de color</string>
@@ -226,16 +266,20 @@
   <string name="pref_camera_coloreffect_entry_greentint">Tinte verde</string>
   <!-- Default Touch AF/AEC setting. Do not translate. -->
   <!-- Settings screen, Select Touch AF/AEC title -->
+  <string name="pref_camera_touchafaec_title">Toque AF/AEC</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">Apagar</string>
+  <string name="pref_camera_touchafaec_entry_on">Activado</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Estabilización</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Apagar</string>
+  <string name="pref_camera_dis_entry_on">Activado</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Reconocimiento de rostros</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Apagar</string>
+  <string name="pref_camera_facerc_entry_on">Activado</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>
@@ -286,10 +330,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Calidad de imagen</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Baja</string>
+  <string name="pref_camera_jpegquality_entry_1">Estándar</string>
+  <string name="pref_camera_jpegquality_entry_2">Alta</string>
   <!-- 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 -->
+  <string name="pref_camera_histogram_entry_enable">Activar</string>
+  <string name="pref_camera_histogram_entry_disable">Desactivar</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -297,7 +346,9 @@
   <!-- 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. -->
+  <string name="pref_camera_scenedetect_entry_on">Activado</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Tamaño de vídeo inválido para el tiempo de grabación.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Disparo continuo</string>
   <string name="msg_cancel_longshot_for_limited_memory">Se está terminando la memoria, cancelando el disparo continuo</string>
@@ -306,6 +357,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">HDR Automático</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Activar</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Desactivar</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">El espacio de almacenamiento interno no es suficiente, se cambió la ubicación de almacenamiento a la tarjeta SD</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -323,6 +376,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotación de vídeo</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">ROTACIÓN DE VIDEO</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 grados</string>
   <string name="pref_camera_video_rotation_entry_90">90 grados</string>
@@ -336,13 +390,69 @@
   <string name="advance_feature_enable_msg">El disparo contínuo no está soportado cuando se activan las características avanzadas</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Iniciar cámara</string>
+  <string name="pref_camera_tsmakeup_title">Embellecimiento</string>
+  <string name="pref_camera_tsmakeup_entry_on">Activado</string>
   <string name="pref_camera_tsmakeup_entry_off">Apagar</string>
+  <string name="pref_camera_tsmakeup_entry_low">Baja</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Media</string>
+  <string name="pref_camera_tsmakeup_entry_high">Alta</string>
+  <string name="pref_camera_tsmakeup_custom">Personalizado</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Blanqueado</string>
+  <string name="pref_camera_tsmakeup_level_clean">Suavizado</string>
+  <string name="text_tsmakeup_alert_title">Aviso</string>
+  <string name="text_tsmakeup_alert_msg">La detección de cara tiene que estar activada para usar el embellecimiento. ¿Quieres continuar?</string>
+  <string name="text_tsmakeup_alert_continue">Continuar</string>
+  <string name="text_tsmakeup_alert_quit">Cancelar</string>
+  <string name="text_tsmakeup_beautify_toast">Embellecer</string>
   <string name="all_in_focus">Todo en foco</string>
   <string name="refocus_toast">Para volver a enfocar la última foto, pulsa aquí</string>
+  <string name="refocus_prompt_message">Con UbiFocus, la cámara tomará 5 fotos, cada vez que pulses el disparador. Las 5 fotos se combinarán en una foto, donde todo estará enfocado. Puedes volver a enfocar, después de tomar la fotografía.</string>
+  <string name="camera_thermal_shutdown">Teléfono sobrecalentado, cerrando cámara.</string>
+  <string name="camera_server_died">El servidor multimedia se ha cerrado, cerrando cámara.</string>
+  <string name="camera_unknown_error">Error desconocido, cerrando cámara.</string>
+  <string name="mute_button_desc">Botón de silencio</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">Aceptar</string>
+  <string name="help_menu_scene_mode_1">Selecciona un</string>
+  <string name="help_menu_scene_mode_2">modo de escena</string>
+  <string name="help_menu_scene_mode_3">para hacer mejores fotos</string>
+  <string name="help_menu_color_filter_1">Aplica filtros</string>
+  <string name="help_menu_color_filter_2">de color</string>
+  <string name="help_menu_color_filter_3">para</string>
+  <string name="help_menu_color_filter_4">mejorar las imágenes</string>
+  <string name="help_menu_beautify_1">Mejora los retratos</string>
+  <string name="help_menu_beautify_2">con la</string>
+  <string name="help_menu_beautify_3">característica de Embellecimiento</string>
+  <string name="help_menu_switcher_1">Cambia</string>
+  <string name="help_menu_switcher_2">entre</string>
+  <string name="help_menu_switcher_3">cámara, vídeo, y panorámico</string>
+  <string name="pref_camera2_camera2_title">Modo Camera2</string>
+  <string name="pref_camera2_camera2_entry_enable">Activar</string>
+  <string name="pref_camera2_camera2_entry_disable">Desactivar</string>
+  <string name="pref_camera2_mono_only_title">Sólo monocromo</string>
+  <string name="pref_camera2_mono_preview_title">Previsualización Mono</string>
+  <string name="pref_camera2_mono_preview_entry_on">Activado</string>
   <string name="pref_camera2_mono_preview_entry_off">Apagar</string>
+  <string name="pref_camera2_clearsight_entry_on">Activado</string>
   <string name="pref_camera2_clearsight_entry_off">Apagar</string>
+  <string name="clearsight_capture_success">Captura ClearSight exitosa</string>
+  <string name="clearsight_capture_fail">Captura ClearSight fallida</string>
+  <string name="pref_camera2_mpo_title">Formato MPO</string>
+  <string name="pref_camera2_mpo_entry_on">Activado</string>
   <string name="pref_camera2_mpo_entry_off">Apagar</string>
+  <string name="pref_camera2_makeup_title">Maquillaje</string>
+  <string name="pref_camera2_noise_reduction_title">Reducción de ruido</string>
   <string name="pref_camera2_noise_reduction_entry_off">Apagar</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">Rápida</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Alta calidad</string>
+  <string name="pref_camera2_videosnap_title">Tamaño de instantánea automático</string>
+  <string name="pref_camera2_videosnap_entry_enable">Activar</string>
+  <string name="pref_camera2_videosnap_entry_disable">Desactivar</string>
+  <string name="pref_camera2_trackingfocus_title">Seguimiento del enfoque</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Mejor imagen</string>
+  <string name="bestpicture_done">HECHO</string>
+  <string name="bestpicture_at_least_one_picture">Al menos una imagen tiene que ser seleccionada.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Activado</string>
   <string name="pref_camera2_shutter_sound_entry_off">Apagar</string>
+  <string name="pref_camera2_shutter_sound_title">Sonido del obturador</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 19dd3e092..c2dab6499 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -144,7 +144,9 @@ La imagen recortada se ha guardado en <xliff:g id="folder_name">%s</xliff:g>.</s
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <string name="camera_disabled">Se ha desactivado la cámara debido a las políticas de seguridad.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">La aplicación no tiene permisos críticos necesarios para ejecutarse. Comprueba la configuración de los permisos.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Descartar</string>
   <!-- alert to the user to wait for some operation to complete -->
   <string name="wait">Espera por favor\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
@@ -164,6 +166,7 @@ La imagen recortada se ha guardado en <xliff:g id="folder_name">%s</xliff:g>.</s
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <string name="pref_camera_id_entry_front">Frontal</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">Localización GPS</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
   <string name="pref_camera_location_label">UBICACIÓN</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
@@ -176,6 +179,9 @@ La imagen recortada se ha guardado en <xliff:g id="folder_name">%s</xliff:g>.</s
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Sonar en cuenta atrás</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Almacenamiento</string>
+  <string name="pref_camera_savepath_entry_0">Teléfono</string>
+  <string name="pref_camera_savepath_entry_1">Tarjeta SD</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">No</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
@@ -296,14 +302,23 @@ La imagen recortada se ha guardado en <xliff:g id="folder_name">%s</xliff:g>.</s
   <!-- 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">No se puede seleccionar en el modo de escena.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">El HDR desactivará el disparo continuo.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">La captura avanzada desactivará el disparo continuo.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">La calidad de vídeo 4K desactivará la estabilización de imagen.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore no puede activarse durante un vídeo 4K.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">La reducción de ruido de alta calidad desactivará el CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">La reducción de ruido de alta calidad desactivará el TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore desactivará el CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore desactivará el TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore desactivará la reducción de ruido.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Exposición</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
@@ -535,4 +550,6 @@ CHAR LIMIT = NONE] -->
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
   <string name="setting_wallpaper">Estableciendo fondo de pantalla...</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d restantes</string>
+  <string name="makeup_video_size_limit">Makeup solo funciona bajo la resolución VGA cuando se graba un vídeo.</string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 23494f006..eff1b41b4 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -23,6 +23,7 @@
          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 megapiksela</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukcija zamagljenja zbog gibanja</string>
   <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index b252858fd..9fc66bdb5 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -23,6 +23,7 @@
          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 megapiksel</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">Reduksi gerakan kabur</string>
   <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c8a4b28a6..7e7b3e560 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -173,6 +173,9 @@ Gambar yang dipotong disimpan ke <xliff:g id="folder_name">%s</xliff:g>.</string
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Bip penghitungan</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Penyimpanan</string>
+  <string name="pref_camera_savepath_entry_0">Telepon</string>
+  <string name="pref_camera_savepath_entry_1">Kartu SD</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">Mati</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
diff --git a/res/values-ja/camera2arrays.xml b/res/values-ja/camera2arrays.xml
index c5b0b7a8f..4679d0907 100644
--- a/res/values-ja/camera2arrays.xml
+++ b/res/values-ja/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>ON</item>
+    <item>OFF</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>ON</item>
+    <item>OFF</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>ON</item>
+    <item>OFF</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-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 4c4e74b37..5ce9cc49f 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -23,6 +23,7 @@
          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 MP</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">被写体ブレ軽減</string>
   <string name="pref_camera_scenemode_entry_aqua">アクア</string>
diff --git a/res/values-ja/qcomstrings.xml b/res/values-ja/qcomstrings.xml
index de8aa0408..dbc2c4795 100644
--- a/res/values-ja/qcomstrings.xml
+++ b/res/values-ja/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">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">OFF</string>
+  <string name="pref_camera_zsl_entry_on">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">OFF</string>
+  <string name="pref_camera_video_hdr_entry_on">ON</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">OFF</string>
+  <string name="pref_camera_cds_entry_on">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">OFF</string>
+  <string name="pref_camera_video_cds_entry_on">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">OFF</string>
+  <string name="pref_camera_facedetection_entry_on">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">OFF</string>
+  <string name="pref_selfie_flash_entry_on">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">ON</string>
+  <string name="err_app_unsupport_ae_bracket_code">自動露出ブラケットはサポートされていません</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,22 +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">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">OFF</string>
+  <string name="pref_camera_see_more_entry_on">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">OFF</string>
+  <string name="pref_camera_denoise_entry_on">ON</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -202,6 +242,7 @@
   <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">ON</string>
   <string name="pref_camera_filter_mode_entry_off">OFF</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">色彩エフェクト</string>
@@ -225,16 +266,20 @@
   <string name="pref_camera_coloreffect_entry_greentint">淡い緑色</string>
   <!-- Default Touch AF/AEC setting. Do not translate. -->
   <!-- Settings screen, Select Touch AF/AEC title -->
+  <string name="pref_camera_touchafaec_title">タッチ AF/AEC</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">OFF</string>
+  <string name="pref_camera_touchafaec_entry_on">ON</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">手ぶれ補正</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">OFF</string>
+  <string name="pref_camera_dis_entry_on">ON</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">顔認識</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">OFF</string>
+  <string name="pref_camera_facerc_entry_on">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>
@@ -285,10 +330,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 -->
@@ -296,7 +346,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">OFF</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">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>
@@ -305,6 +357,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 -->
@@ -322,6 +376,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>
@@ -335,24 +390,58 @@
   <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">ON</string>
   <string name="pref_camera_tsmakeup_entry_off">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">OK</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="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">ON</string>
   <string name="pref_camera2_mono_preview_entry_off">OFF</string>
   <string name="pref_camera2_clearsight_entry_on">ON</string>
   <string name="pref_camera2_clearsight_entry_off">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">ON</string>
   <string name="pref_camera2_mpo_entry_off">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">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="bestpicture_done">完了</string>
+  <string name="bestpicture_at_least_one_picture">少なくとも1枚の写真を選んでください。</string>
+  <string name="pref_camera2_shutter_sound_entry_on">ON</string>
   <string name="pref_camera2_shutter_sound_entry_off">OFF</string>
+  <string name="pref_camera2_shutter_sound_title">シャッター音</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b5702c35e..074cc85fa 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -143,11 +143,11 @@
   <!-- 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>
+  <string name="wait">お待ちください...</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
   <string name="no_storage" product="default">カメラを使用する前にSDカードを挿入してください。</string>
   <!-- alert to the user that the SD card is being disk-checked -->
-  <string name="preparing_sd" product="default">SDカードを準備中u2026</string>
+  <string name="preparing_sd" product="default">SDカードを準備中...</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
   <string name="access_sd_fail" product="default">SDカードにアクセスできませんでした。</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
@@ -161,6 +161,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">撮影場所の記録</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 +173,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] -->
@@ -292,14 +296,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動画が有効になっている間はその他の設定を有効にできません。</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">その他の設定を有効にすると CDS が無効になります。</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">その他の設定を有効にすると TNR が無効になります。</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">その他の設定を有効にするとノイズリダクションが無効になります。</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">露出</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
@@ -334,7 +347,7 @@
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
   <string name="pano_dialog_waiting_previous">前のパノラマを待機しています</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">保存中\u2026</string>
+  <string name="pano_review_saving_indication_str">保存中...</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
   <string name="pano_review_rendering">パノラマをレンダリングしています</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
@@ -531,4 +544,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/cm_strings.xml b/res/values-nl/cm_strings.xml
index 7c27705ba..fb60eb862 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -23,7 +23,7 @@
          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 megapixels</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapixel</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">Beweging verscherpen</string>
   <string name="pref_camera_scenemode_entry_aqua">Water</string>
diff --git a/res/values-nl/qcomstrings.xml b/res/values-nl/qcomstrings.xml
index 5b3b6144b..e7bdc6efd 100644
--- a/res/values-nl/qcomstrings.xml
+++ b/res/values-nl/qcomstrings.xml
@@ -26,9 +26,9 @@
   <!-- 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">Krachtige modus</string>
+  <string name="pref_camera_powermode_title">Energieverbruik</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
-  <string name="pref_camera_powermode_entry_lp">Laag stroomverbruik</string>
+  <string name="pref_camera_powermode_entry_lp">Laag</string>
   <string name="pref_camera_powermode_entry_np">Normaal</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
@@ -92,7 +92,7 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Dioptrie modus</string>
   <string name="pref_camera_manual_focus_entry_off">Uit</string>
   <!-- Instant Capture entry -->
-  <string name="pref_camera_instant_capture_title" translatable="true">Instant opname</string>
+  <string name="pref_camera_instant_capture_title" translatable="true">Directe opname</string>
   <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Agressieve AEC</string>
   <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Snelle AEC</string>
   <string name="pref_camera_instant_capture_entry_disable" translatable="true">Uitschakelen</string>
@@ -157,7 +157,7 @@
   <string name="pref_camera_selfiemirror_title" translatable="true">Selfie-spiegel</string>
   <string name="pref_camera_selfiemirror_entry_enable">Inschakelen</string>
   <string name="pref_camera_selfiemirror_entry_disable">Uitschakelen</string>
-  <string name="pref_camera_shuttersound_title" translatable="true">Afdruk geluid</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Sluitergeluid</string>
   <string name="pref_camera_shuttersound_entry_enable">Ingeschakeld</string>
   <string name="pref_camera_shuttersound_entry_disable">Uitgeschakeld</string>
   <!-- Default mce setting. Do not translate. -->
@@ -196,7 +196,7 @@
   <string name="pref_camera_hfr_entry_hsr_60">Hoge snelheid 60 fps</string>
   <string name="pref_camera_hfr_entry_hsr_90">Hoge snelheid 90 fps</string>
   <string name="pref_camera_hfr_entry_hsr_120">Hoge snelheid 120 fps</string>
-  <string name="pref_camera_hfr_entry_hsr_240">Hoge-snelheid 240 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Hoge snelheid 240 fps</string>
   <!-- HFR entry values. Do not translate. -->
   <!-- Default noise reduction setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
@@ -371,7 +371,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videorotatie</string>
   <!--Menu, video rotation label-->
-  <string name="pref_camera_video_rotation_label">VIDEO ROTATIE</string>
+  <string name="pref_camera_video_rotation_label">VIDEOROTATIE</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 graden</string>
   <string name="pref_camera_video_rotation_entry_90">90 graden</string>
@@ -380,57 +380,59 @@
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
   <string name="map_activity_not_found_err">Er is geen kaart-app geïnstalleerd om de locatie weer te geven</string>
   <!-- Continuous shot enable message -->
-  <string name="longshot_enable_message">Geavanceerde functies worden niet ondersteund in continuopname modus</string>
+  <string name="longshot_enable_message">Geavanceerde functies worden niet ondersteund bij continue opname</string>
   <!-- Advanced features enable message -->
-  <string name="advance_feature_enable_msg">Continuopname wordt niet ondersteund als geavanceerde functies ingeschakeld zijn</string>
+  <string name="advance_feature_enable_msg">Continue opname wordt niet ondersteund als geavanceerde functies ingeschakeld zijn</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Camera openen</string>
+  <string name="pref_camera_tsmakeup_title">Verfraaiing</string>
   <string name="pref_camera_tsmakeup_entry_on">Aan</string>
   <string name="pref_camera_tsmakeup_entry_off">Uit</string>
   <string name="pref_camera_tsmakeup_entry_low">Laag</string>
   <string name="pref_camera_tsmakeup_entry_mid">Middel</string>
   <string name="pref_camera_tsmakeup_entry_high">Hoog</string>
   <string name="pref_camera_tsmakeup_custom">Aangepast</string>
-  <string name="text_tsmakeup_alert_title">Attentie</string>
-  <string name="text_tsmakeup_alert_msg">Gezichtsherkenning moet ingeschakeld zijn om beautification te kunnen gebruiken. Wilt u doorgaan?</string>
+  <string name="text_tsmakeup_alert_title">Let op</string>
+  <string name="text_tsmakeup_alert_msg">Gezichtsherkenning moet ingeschakeld zijn om de optie Verfraaien te kunnen gebruiken. Wilt u doorgaan?</string>
   <string name="text_tsmakeup_alert_continue">Doorgaan</string>
-  <string name="text_tsmakeup_alert_quit">Annuleer</string>
-  <string name="text_tsmakeup_beautify_toast">Beautify</string>
+  <string name="text_tsmakeup_alert_quit">Annuleren</string>
+  <string name="text_tsmakeup_beautify_toast">Verfraaien</string>
   <string name="all_in_focus">Alles in focus</string>
   <string name="refocus_toast">Om laatste foto opnieuw scherp te stellen, tap hier</string>
   <string name="refocus_prompt_message">Met UbiFocus maakt uw camera 5 foto\'s, elke keer als u op de sluiterknop drukt. De 5 foto\'s zullen worden samengevoegd tot 1 afbeelding, waarop alles in focus is. U kunt de focus nog verplaatsen, nadat de foto genomen is.</string>
   <string name="camera_thermal_shutdown">Telefoon oververhit, camera wordt afgesloten.</string>
   <string name="camera_server_died">Mediaserver gecrasht, camera wordt gestopt.</string>
   <string name="camera_unknown_error">Onbekende fout, camera wordt gestopt.</string>
-  <string name="mute_button_desc">Mute knop</string>
+  <string name="mute_button_desc">Mute-knop</string>
   <!-- Help menu strings -->
   <string name="help_menu_ok">OK</string>
   <string name="help_menu_scene_mode_1">Selecteer een</string>
-  <string name="help_menu_scene_mode_2">Scene modus</string>
-  <string name="help_menu_scene_mode_3">voor betere resultaten</string>
+  <string name="help_menu_scene_mode_2">scènemodus</string>
+  <string name="help_menu_scene_mode_3">voor betere foto\'s</string>
   <string name="help_menu_color_filter_1">Gebruik kleuren</string>
   <string name="help_menu_color_filter_2">filters</string>
   <string name="help_menu_color_filter_3">om</string>
   <string name="help_menu_color_filter_4">foto\'s te verbeteren</string>
   <string name="help_menu_beautify_1">Verbeter portretfoto\'s</string>
   <string name="help_menu_beautify_2">met de</string>
-  <string name="help_menu_beautify_3">Beautify optie</string>
-  <string name="help_menu_switcher_1">Wijzig</string>
+  <string name="help_menu_beautify_3">optie Verfraaien</string>
+  <string name="help_menu_switcher_1">Wissel</string>
   <string name="help_menu_switcher_2">tussen</string>
   <string name="help_menu_switcher_3">camera, video en panorama</string>
   <string name="pref_camera2_camera2_entry_enable">Inschakelen</string>
   <string name="pref_camera2_camera2_entry_disable">Uitschakelen</string>
-  <string name="pref_camera2_mono_only_title">Enkel Mono</string>
+  <string name="pref_camera2_mono_only_title">Alleen mono</string>
   <string name="pref_camera2_mono_preview_title">Mono preview</string>
   <string name="pref_camera2_mono_preview_entry_on">Aan</string>
   <string name="pref_camera2_mono_preview_entry_off">Uit</string>
   <string name="pref_camera2_clearsight_entry_on">Aan</string>
   <string name="pref_camera2_clearsight_entry_off">Uit</string>
-  <string name="clearsight_capture_success">ClearSight opname geslaagd</string>
-  <string name="clearsight_capture_fail">ClearSight opname mislukt</string>
-  <string name="pref_camera2_mpo_title">MPO formaat</string>
+  <string name="clearsight_capture_success">ClearSight-opname gelukt</string>
+  <string name="clearsight_capture_fail">ClearSight-opname mislukt</string>
+  <string name="pref_camera2_mpo_title">MPO-bestand</string>
   <string name="pref_camera2_mpo_entry_on">Aan</string>
   <string name="pref_camera2_mpo_entry_off">Uit</string>
+  <string name="pref_camera2_makeup_title">Make-up</string>
   <string name="pref_camera2_noise_reduction_title">Ruisonderdrukking</string>
   <string name="pref_camera2_noise_reduction_entry_off">Uit</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Snel</string>
@@ -443,5 +445,5 @@
   <string name="bestpicture_at_least_one_picture">Er moet ten minste één foto worden gekozen.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Aan</string>
   <string name="pref_camera2_shutter_sound_entry_off">Uit</string>
-  <string name="pref_camera2_shutter_sound_title">Afdruk geluid</string>
+  <string name="pref_camera2_shutter_sound_title">Sluitergeluid</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9d5c2fbf6..d7920efa3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -166,7 +166,7 @@
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <string name="pref_camera_id_entry_front">Voorzijde</string>
   <!-- Settings screen, setting title text -->
-  <string name="pref_camera_recordlocation_title">GPS locatie</string>
+  <string name="pref_camera_recordlocation_title">GPS-locatie</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
   <string name="pref_camera_location_label">LOCATIE</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
@@ -302,20 +302,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">Kan niet worden geselecteerd in scènemodus.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
-  <string name="HDR_disable_continuous_shot">Inschakelen van HDR zal doorlopende opnamen uitschakelen.</string>
+  <string name="HDR_disable_continuous_shot">HDR zal continue opnamen uitschakelen.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Geavanceerd vastleggen zal continue opname uitschakelen.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
-  <string name="video_quality_4k_disable_IS">Beeld stabilisatie niet beschikbaar bij 4k video opname.</string>
+  <string name="video_quality_4k_disable_IS">Beeldstabilisatie wordt uitgeschakeld bij 4K-video-opname.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
-  <string name="video_quality_4k_disable_SeeMore">SeeMore kan niet worden ingeschakeld tijdens 4k-video.</string>
+  <string name="video_quality_4k_disable_SeeMore">SeeMore kan niet worden ingeschakeld tijdens 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 -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">Ruisonderdrukking van hoge kwaliteit zal TNR uitschakelen.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
   <string name="disable_CDS_during_SeeMore">SeeMore zal CDS uitschakelen.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
   <string name="disable_TNR_during_SeeMore">SeeMore zal TNR uitschakelen.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
-  <string name="disable_NR_during_SeeMore">SeeMore zal de ruisonderdrukking uitschakelen.</string>
+  <string name="disable_NR_during_SeeMore">SeeMore zal ruisonderdrukking uitschakelen.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Belichting</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml
index b73185e0a..04712eddf 100644
--- a/res/values-pt-rBR/qcomstrings.xml
+++ b/res/values-pt-rBR/qcomstrings.xml
@@ -285,6 +285,8 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Qualidade da imagem</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_1">Padrão</string>
+  <string name="pref_camera_jpegquality_entry_2">Alta</string>
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
   <string name="pref_camera_histogram_title">Histograma</string>
@@ -352,6 +354,7 @@
   <string name="pref_camera2_makeup_title">Maquiagem</string>
   <string name="pref_camera2_noise_reduction_entry_off">Desl.</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rápido</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Alta qualidade</string>
   <string name="pref_camera2_videosnap_entry_enable">Ativar</string>
   <string name="pref_camera2_videosnap_entry_disable">Desativar</string>
   <string name="pref_camera2_shutter_sound_entry_off">Desl.</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 985c5b88f..b3163e7d4 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -299,6 +299,7 @@
   <!-- 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 -->
+  <string name="video_quality_4k_disable_IS">Qualidade de vídeo 4K desativará a estabilização de imagem.</string>
   <!-- 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 -->
diff --git a/res/values-ru/camera2arrays.xml b/res/values-ru/camera2arrays.xml
index c5b0b7a8f..e60daef1c 100644
--- a/res/values-ru/camera2arrays.xml
+++ b/res/values-ru/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-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 534cb5c39..8b461cddf 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -23,6 +23,7 @@
          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>
diff --git a/res/values-sl/camera2arrays.xml b/res/values-sl/camera2arrays.xml
index 95c83e34c..0c5144d07 100644
--- a/res/values-sl/camera2arrays.xml
+++ b/res/values-sl/camera2arrays.xml
@@ -28,11 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Vklopljeno</item>
+    <item>Izklopljeno</item>
+  </string-array>
   <string-array name="pref_camera2_initial_camera_entries">
     <item>Bayer</item>
     <item>Mono</item>
     <item>Sprednja</item>
   </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>Vklopljeno</item>
+    <item>Izklopljeno</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Vklopljeno</item>
+    <item>Izklopljeno</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-sl/qcomstrings.xml b/res/values-sl/qcomstrings.xml
index bf65d8169..68042c0f2 100644
--- a/res/values-sl/qcomstrings.xml
+++ b/res/values-sl/qcomstrings.xml
@@ -26,8 +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">Način napajanja</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <string name="pref_camera_powermode_entry_lp">Nizka poraba</string>
+  <string name="pref_camera_powermode_entry_np">Običajna poraba</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
@@ -97,14 +99,20 @@
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Izklopljeno</string>
+  <string name="pref_camera_zsl_entry_on">Vklopljeno</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR je omogočen, podprt je samo samodejni prizor</string>
+  <string name="scene_enable_message">HDR je podprt samo v samodejnem načinu zaznavanja prizora</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Izklopljeno</string>
+  <string name="pref_camera_video_hdr_entry_on">Vklopljeno</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Izklopljeno</string>
+  <string name="pref_camera_cds_entry_on">Vklopljeno</string>
   <string name="pref_camera_cds_entry_auto">Samod.</string>
   <!-- Settings screen, video CDS location dialog choices -->
   <string name="pref_camera_video_cds_entry_off">Izklopljeno</string>
+  <string name="pref_camera_video_cds_entry_on">Vklopljeno</string>
   <string name="pref_camera_video_cds_entry_auto">Samodejno</string>
   <!-- Settings screen, TNR location dialog choices -->
   <string name="pref_camera_tnr_entry_disable">Onemogoči</string>
@@ -133,19 +141,23 @@
   <string name="pref_camera_facedetection_title">Zaznavanje obraza</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Izklopljeno</string>
+  <string name="pref_camera_facedetection_entry_on">Vklopljeno</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Bliskavica samoposnetka</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">Izklopljeno</string>
+  <string name="pref_selfie_flash_entry_on">Vklopljeno</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Zmanjšanje učinka rdečih oči</string>
   <!-- Settings menu, redeye reduction choices -->
   <string name="pref_camera_redeyereduction_entry_enable">Omogoči</string>
   <string name="pref_camera_redeyereduction_entry_disable">Onemogoči</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Ogledalo samoposnetka</string>
   <string name="pref_camera_selfiemirror_entry_enable">Omogoči</string>
   <string name="pref_camera_selfiemirror_entry_disable">Onemogoči</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Zvok sprožilca</string>
   <string name="pref_camera_shuttersound_entry_enable">Omogočen</string>
   <string name="pref_camera_shuttersound_entry_disable">Onemogočen</string>
   <!-- Default mce setting. Do not translate. -->
@@ -162,14 +174,20 @@
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <string name="error_app_unsupported">Nepodprta ločljivost videoposnetka za to vrsto kodeka</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Video profil ni podprt</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">Slikovna oblika RAW ni podprta v načinu brez zakasnitve sprožilca. Izberite JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Korektura sam. osvetlitve</string>
   <string name="pref_camera_ae_bracket_hdr_title">Korektura sam. osvetlitve</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Vklopljeno</string>
+  <string name="err_app_unsupport_ae_bracket_code">Korektura samodejne osvetlitve še ni podprta</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Velikost samodejnega posnetka je nižja od velikosti videoposnetka, omejevanje na velikost videoposnetka. Izberite ločljivost višjo ali enako velikosti trenutnega videoposnetka.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Sprememba velikosti slike ni podprta v načinu nizke porabe, posnet bo samodejni posnetek v velikosti videoposnetka. Za spremembo velikosti slike izberete način običajne porabe.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Samodejni posnetek za to ločljivost je podprt samo v velikosti videoposnetka.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Počasni posnetek</string>
@@ -196,11 +214,13 @@
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_see_more_entry_off">Izklopljeno</string>
+  <string name="pref_camera_see_more_entry_on">Vklopljeno</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Odstr. šuma</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">Izklopljeno</string>
+  <string name="pref_camera_denoise_entry_on">Vklopljeno</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -222,6 +242,7 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (ZDA)</string>
   <string name="pref_camera_antibanding_entry_3">Samod.</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Vklopljeno</string>
   <string name="pref_camera_filter_mode_entry_off">Izklopljeno</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Barvni učinek</string>
@@ -245,16 +266,20 @@
   <string name="pref_camera_coloreffect_entry_greentint">Zeleni odtenek</string>
   <!-- Default Touch AF/AEC setting. Do not translate. -->
   <!-- Settings screen, Select Touch AF/AEC title -->
+  <string name="pref_camera_touchafaec_title">AF/AEC na dotik</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">Izklopljeno</string>
+  <string name="pref_camera_touchafaec_entry_on">Vklopljeno</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Ustalitev</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Izklopljeno</string>
+  <string name="pref_camera_dis_entry_on">Vklopljeno</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Zaznavanje obraza</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Izklopljeno</string>
+  <string name="pref_camera_facerc_entry_on">Vklopljeno</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Raven 0</string>
   <string name="pref_camera_sharpness_entry_level1">1. raven</string>
@@ -305,6 +330,9 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Kakovost slike</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Nizka</string>
+  <string name="pref_camera_jpegquality_entry_1">Običajna</string>
+  <string name="pref_camera_jpegquality_entry_2">Visoka</string>
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
   <string name="pref_camera_histogram_title">Histogram</string>
@@ -318,7 +346,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Izklopljeno</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Vklopljeno</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Neveljavna velikost videoposnetka za snemanje s časovnim zamikom.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Neprekinjeno fotografiranje</string>
   <string name="msg_cancel_longshot_for_limited_memory">Zmanjkuje pomnilnika, preklicevanje neprekinjenega fotografiranja</string>
@@ -360,23 +390,54 @@
   <string name="advance_feature_enable_msg">Neprekinjeno fotografiranje ni možno z omogočenimi naprednimi značilnostmi</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Zaženi fotoaparat</string>
+  <string name="pref_camera_tsmakeup_title">Polepšava</string>
+  <string name="pref_camera_tsmakeup_entry_on">Vklopljeno</string>
   <string name="pref_camera_tsmakeup_entry_off">Izklopljeno</string>
+  <string name="pref_camera_tsmakeup_entry_low">Nizka</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Srednja</string>
+  <string name="pref_camera_tsmakeup_entry_high">Visoka</string>
+  <string name="pref_camera_tsmakeup_custom">Po meri</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Pobeli</string>
+  <string name="pref_camera_tsmakeup_level_clean">Zmehčaj</string>
   <string name="text_tsmakeup_alert_title">Opozorilo</string>
+  <string name="text_tsmakeup_alert_msg">Zaznavanje obraza mora biti omogočeno za uporabo značilnosti Polepšava. Ali želite nadaljevati?</string>
   <string name="text_tsmakeup_alert_continue">Nadaljuj</string>
   <string name="text_tsmakeup_alert_quit">Prekliči</string>
+  <string name="text_tsmakeup_beautify_toast">Polepšaj</string>
   <string name="all_in_focus">V celoti izostreno</string>
   <string name="refocus_toast">Za ponovno ostrenje zadnje slike tapnite tukaj</string>
+  <string name="refocus_prompt_message">Z UbiFocus, bo vaš fotoaparat z vsakim pritiskom na sprožilec posnel pet fotografij. Teh pet fotografij bo združenih v eno izostreno fotografijo. Posneto fotografijo lahko ponovno izostrite.</string>
+  <string name="camera_thermal_shutdown">Telefon se pregreva, zapiranje fotoaparata.</string>
+  <string name="camera_server_died">Izpad strežnika za predstavnost, zapiranje fotoaparata.</string>
+  <string name="camera_unknown_error">Neznana napaka, zapiranje fotoaparata.</string>
+  <string name="mute_button_desc">Gumb za nemo</string>
   <!-- Help menu strings -->
   <string name="help_menu_ok">V REDU</string>
+  <string name="help_menu_scene_mode_1">Izberi</string>
+  <string name="help_menu_scene_mode_2">Način prizora</string>
+  <string name="help_menu_scene_mode_3">za boljše slike</string>
+  <string name="help_menu_color_filter_1">Uveljavi barvo</string>
   <string name="help_menu_color_filter_2">filtri</string>
+  <string name="help_menu_color_filter_3">v</string>
+  <string name="help_menu_color_filter_4">izboljšava slik</string>
+  <string name="help_menu_beautify_1">Izboljšava portretov</string>
+  <string name="help_menu_beautify_2">z</string>
+  <string name="help_menu_beautify_3">Značilnost Polepšaj</string>
+  <string name="help_menu_switcher_1">Preklopi</string>
+  <string name="help_menu_switcher_2">med</string>
+  <string name="help_menu_switcher_3">fotoaparat, videoposnetki in panorame</string>
+  <string name="pref_camera2_camera2_title">Način Camera2</string>
   <string name="pref_camera2_camera2_entry_enable">Omogoči</string>
   <string name="pref_camera2_camera2_entry_disable">Onemogoči</string>
+  <string name="pref_camera2_mono_only_title">Samo mono</string>
+  <string name="pref_camera2_mono_preview_title">Predogled mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Vkl.</string>
   <string name="pref_camera2_mono_preview_entry_off">Izklopljeno</string>
   <string name="pref_camera2_clearsight_entry_on">Vkl.</string>
   <string name="pref_camera2_clearsight_entry_off">Izklopljeno</string>
   <string name="clearsight_capture_success">Zajem ClearSight je bil upešen</string>
   <string name="clearsight_capture_fail">Zajem ClearSight je spodletel</string>
+  <string name="pref_camera2_mpo_title">Oblika MPO-ja</string>
   <string name="pref_camera2_mpo_entry_on">Vkl.</string>
   <string name="pref_camera2_mpo_entry_off">Izklopljeno</string>
   <string name="pref_camera2_makeup_title">Ličilo</string>
@@ -384,7 +445,14 @@
   <string name="pref_camera2_noise_reduction_entry_off">Izklopljeno</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Hitro</string>
   <string name="pref_camera2_noise_reduction_entry_high_quality">Visoka kakovost</string>
+  <string name="pref_camera2_videosnap_title">Velikost samodejnega posnetka</string>
   <string name="pref_camera2_videosnap_entry_enable">Omogoči</string>
   <string name="pref_camera2_videosnap_entry_disable">Onemogoči</string>
+  <string name="pref_camera2_trackingfocus_title">Ostrenje s sledenjem</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Najboljša slika</string>
+  <string name="bestpicture_done">OPRAVLJENO</string>
+  <string name="bestpicture_at_least_one_picture">Izbrana mora biti vsaj ena slika.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Vklopljeno</string>
   <string name="pref_camera2_shutter_sound_entry_off">Izklopljeno</string>
+  <string name="pref_camera2_shutter_sound_title">Zvok sprožilca</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ea3fd32ff..a5e32fbb7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -190,7 +190,9 @@ Predmet je shranjen lokalno in na voljo brez povezave.</string>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Pisk med odštev.</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Mesto za shranjevanje</string>
   <string name="pref_camera_savepath_entry_0">Telefon</string>
+  <string name="pref_camera_savepath_entry_1">Kartica SD</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">Izklopljeno</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
@@ -560,4 +562,5 @@ CHAR LIMIT = NONE] -->
   <string name="setting_wallpaper">Nastavljanje ozadja</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
   <string name="remaining_photos_format">preostalo %d</string>
+  <string name="makeup_video_size_limit">Ličila delujejo samo v VGA načinu pri videoposnetkih.</string>
 </resources>
diff --git a/res/values-sr/qcomstrings.xml b/res/values-sr/qcomstrings.xml
index 680b2f424..c6216bb2e 100644
--- a/res/values-sr/qcomstrings.xml
+++ b/res/values-sr/qcomstrings.xml
@@ -154,8 +154,10 @@
   <!-- 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">Omogućeno</string>
   <string name="pref_camera_shuttersound_entry_disable">Онемогућено</string>
   <!-- Default mce setting. Do not translate. -->
@@ -172,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">Држање аутоматске експозитуре још увек није подржано</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Величина snapshot-а је мања од величине видеа, премашена видео величина. Изабери резолуцију већу или једнаку тренутној видео величини.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Промена величине слике није подржана у режиму уштеде енергије, величина snapshot-а биће преузета. Молимо изабери Нормални режим напајања да дозволиш промену величине слике.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Само snapshot величине видеа је подржан за ову резолуцију.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Успорени снимак</string>
@@ -192,12 +200,15 @@
   <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">Smanjenje šuma</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 -->
@@ -373,9 +384,37 @@
   <string name="all_in_focus">Све у фокусу</string>
   <string name="refocus_toast">Да поново фокусираш фото, додирни овде</string>
   <!-- Help menu strings -->
+  <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">Режим Камера2</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">Smanjenje šuma</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">Najbolja slika</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-sr/strings.xml b/res/values-sr/strings.xml
index b0076f62d..f013327d9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -316,9 +316,13 @@
   <!-- 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] -->
@@ -550,4 +554,5 @@ 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>
 </resources>
diff --git a/res/values-vi/camera2arrays.xml b/res/values-vi/camera2arrays.xml
index c5b0b7a8f..2cc9ca2ab 100644
--- a/res/values-vi/camera2arrays.xml
+++ b/res/values-vi/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Bật</item>
+    <item>Tắt</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Âm thanh đơn</item>
+    <item>Trước</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>Bật</item>
+    <item>Tắt</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Bật</item>
+    <item>Tắt</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-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 2fa351a96..56147a2e4 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/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">Rộng</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 megapixels</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">Giảm mờ chuyển động</string>
   <string name="pref_camera_scenemode_entry_aqua">Nước</string>
@@ -101,4 +103,6 @@
   <string name="pref_camera_shutter_speed_title">Tốc độ chụp màn trập</string>
   <string name="auto_hdr_enabled">HDR tự động được kích hoạt</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">Bạn đã bật tùy chọn máy ảnh nâng cao</string>
+  <string name="developer_menu_disabled">Bạn đã tắt tùy chọn máy ảnh nâng cao</string>
 </resources>
diff --git a/res/values-vi/qcomstrings.xml b/res/values-vi/qcomstrings.xml
index 17b888764..193eccba9 100644
--- a/res/values-vi/qcomstrings.xml
+++ b/res/values-vi/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">Chế độ pin</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Điện năng thấp</string>
+  <string name="pref_camera_powermode_entry_np">Điện năng bình thường</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">Tăng cường màu da</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Bật</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Tắt</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Độ trễ chụp bằng không</string>
@@ -87,21 +92,35 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Chế độ thước ngắm</string>
   <string name="pref_camera_manual_focus_entry_off">Tắt</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">Chụp ảnh tức thì</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">AEC tích cực</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">AEC nhanh</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Tắt</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Tắt</string>
+  <string name="pref_camera_zsl_entry_on">Bật</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR được bật, chỉ hỗ trợ chế độ cảnh tự động</string>
+  <string name="scene_enable_message">HDR không hỗ trợ chế độ cảnh nào ngoài tự động</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Tắt</string>
+  <string name="pref_camera_video_hdr_entry_on">Bật</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Tắt</string>
+  <string name="pref_camera_cds_entry_on">Bật</string>
   <string name="pref_camera_cds_entry_auto">Tự động</string>
   <!-- Settings screen, video CDS location dialog choices -->
   <string name="pref_camera_video_cds_entry_off">Tắt</string>
+  <string name="pref_camera_video_cds_entry_on">Bật</string>
   <string name="pref_camera_video_cds_entry_auto">Tự động</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Tắt</string>
+  <string name="pref_camera_tnr_entry_enable">Bật</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Tắt</string>
+  <string name="pref_camera_video_tnr_entry_enable">Bật</string>
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, setting title text for Video HDR-->
   <string name="pref_camera_video_hdr_title">Video HDR</string>
@@ -122,15 +141,25 @@
   <string name="pref_camera_facedetection_title">Nhận diện khuôn mặt</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Tắt</string>
+  <string name="pref_camera_facedetection_entry_on">Bật</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Đèn flash tự sướng</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">Tắt</string>
+  <string name="pref_selfie_flash_entry_on">Bật</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Giảm mắt đỏ</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Bật</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Tắt</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Gương Selfie</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Bật</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Tắt</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Âm chụp ảnh</string>
+  <string name="pref_camera_shuttersound_entry_enable">Đã bật</string>
+  <string name="pref_camera_shuttersound_entry_disable">Đã tắt</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">Quay với tốc độ khung cao không được hỗ trợ khi sử dụng chế độ Ổn định/Tua thời gian/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">Độ phân giải video không được hỗ trợ cho kiểu bộ giải mã này</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Không hỗ trợ cấu hình video</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">Không hỗ trợ định dạng ảnh raw trong chế độ màn trập không độ trễ. Chọn JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Chụp liên tục với độ phơi sáng tự động</string>
   <string name="pref_camera_ae_bracket_hdr_title">Chụp liên tục với độ phơi sáng tự động</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Bật</string>
+  <string name="err_app_unsupport_ae_bracket_code">AE bracketing chưa được hỗ trợ</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Kích thước ảnh chụp nhanh video thấp hơn kích thước video xuất ra. Vui lòng chọn độ phân giải cao hơn hoặc bằng kích thước video hiện tại.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Thay đổi kích thước ảnh không được hỗ trợ trong chế độ nguồn điện thấp, kích thước video sẽ được chụp nhanh lại. Vui lòng chọn chế độ nguồn điện bình thường để cho phép thay đổi kích thước ảnh.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Chỉ có ảnh chụp kích thước video hỗ trợ độ phân giải này.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Quay với tốc độ khung cao</string>
@@ -165,21 +200,27 @@
   <string name="pref_camera_hfr_entry_hsr_60">Tốc độ cao 60 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_90">Tốc độ cao 90 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_120">Tốc độ cao 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Tốc độ cao 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">Giảm nhiễu</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">Tắt</string>
+  <string name="pref_camera_noise_reduction_entry_fast">Nhanh</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Chất lượng cao</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">Tắt</string>
+  <string name="pref_camera_see_more_entry_on">Bật</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Giảm nhiễu</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">Tắt</string>
+  <string name="pref_camera_denoise_entry_on">Bật</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -201,6 +242,7 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (Hoa Kỳ)</string>
   <string name="pref_camera_antibanding_entry_3">Tự động</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Bật</string>
   <string name="pref_camera_filter_mode_entry_off">Tắt</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Hiệu ứng màu sắc</string>
@@ -224,16 +266,20 @@
   <string name="pref_camera_coloreffect_entry_greentint">Sắc xanh lá cây</string>
   <!-- Default Touch AF/AEC setting. Do not translate. -->
   <!-- Settings screen, Select Touch AF/AEC title -->
+  <string name="pref_camera_touchafaec_title">Chạm AF/AEC</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">Tắt</string>
+  <string name="pref_camera_touchafaec_entry_on">Bật</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Ổn định</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Tắt</string>
+  <string name="pref_camera_dis_entry_on">Bật</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Nhận diện khuôn mặt</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Tắt</string>
+  <string name="pref_camera_facerc_entry_on">Bật</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Mức 0</string>
   <string name="pref_camera_sharpness_entry_level1">Mức 1</string>
@@ -284,10 +330,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Chất lượng ảnh</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Thấp</string>
+  <string name="pref_camera_jpegquality_entry_1">Tiêu chuẩn</string>
+  <string name="pref_camera_jpegquality_entry_2">Cao</string>
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
   <string name="pref_camera_histogram_title">Biểu đồ</string>
   <!-- Settings screen, Histogram radio button choices -->
+  <string name="pref_camera_histogram_entry_enable">Bật</string>
+  <string name="pref_camera_histogram_entry_disable">Tắt</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -295,7 +346,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Tắt</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Bật</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Kích thước video không hợp lệ cho quay video tua nhanh thời gian.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Chụp liên tục</string>
   <string name="msg_cancel_longshot_for_limited_memory">Hết bộ nhớ, đang huỷ chụp liên tục</string>
@@ -304,6 +357,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">HDR Tự động</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Bật</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Tắt</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Bộ nhớ trong không đủ, đã chuyển vị trí lưu trữ sang thẻ nhớ</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -321,6 +376,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Xoay video</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">XOAY VIDEO</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>
@@ -334,13 +390,69 @@
   <string name="advance_feature_enable_msg">Chụp liên tục không được hỗ trợ khi các tính năng nâng cao được kích hoạt</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Khởi động máy ảnh</string>
+  <string name="pref_camera_tsmakeup_title">Làm đẹp</string>
+  <string name="pref_camera_tsmakeup_entry_on">Bật</string>
   <string name="pref_camera_tsmakeup_entry_off">Tắt</string>
+  <string name="pref_camera_tsmakeup_entry_low">Thấp</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Trung bình</string>
+  <string name="pref_camera_tsmakeup_entry_high">Cao</string>
+  <string name="pref_camera_tsmakeup_custom">Tùy chỉnh</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Làm trắng</string>
+  <string name="pref_camera_tsmakeup_level_clean">Làm mềm</string>
+  <string name="text_tsmakeup_alert_title">Cảnh báo</string>
+  <string name="text_tsmakeup_alert_msg">Phát hiện khuôn mặt phải được kích hoạt để sử dụng tính năng làm đẹp. Bạn có muốn tiếp tục?</string>
+  <string name="text_tsmakeup_alert_continue">Tiếp tục</string>
+  <string name="text_tsmakeup_alert_quit">Hủy</string>
+  <string name="text_tsmakeup_beautify_toast">Làm đẹp</string>
   <string name="all_in_focus">Lấy nét tất cả</string>
   <string name="refocus_toast">Để lấy nét lại ảnh cuối, chạm vào đây</string>
+  <string name="refocus_prompt_message">Với UbiFocus, máy ảnh của bạn sẽ chụp 5 hình ảnh, mỗi khi bạn nhấn nút chụp. 5 hình ảnh này sẽ được kết hợp thành 1 ảnh, nơi mà tất cả mọi thứ được lấy nét. Bạn có thể chọn để lấy nét lại, sau khi bạn chụp ảnh.</string>
+  <string name="camera_thermal_shutdown">Điện thoại quá nóng, đang tắt máy ảnh.</string>
+  <string name="camera_server_died">Máy chủ phương tiện đã đóng, đang tắt máy ảnh.</string>
+  <string name="camera_unknown_error">Lỗi không xác định, đang tắt máy ảnh.</string>
+  <string name="mute_button_desc">Nút tắt âm</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
+  <string name="help_menu_scene_mode_1">Chọn một</string>
+  <string name="help_menu_scene_mode_2">Chế độ phong cảnh</string>
+  <string name="help_menu_scene_mode_3">cho hình ảnh tốt hơn</string>
+  <string name="help_menu_color_filter_1">Áp dụng màu</string>
+  <string name="help_menu_color_filter_2">bộ lọc</string>
+  <string name="help_menu_color_filter_3">để</string>
+  <string name="help_menu_color_filter_4">cải thiện hình ảnh</string>
+  <string name="help_menu_beautify_1">Chân dung nâng cao</string>
+  <string name="help_menu_beautify_2">với</string>
+  <string name="help_menu_beautify_3">Tính năng làm đẹp</string>
+  <string name="help_menu_switcher_1">Chuyển đổi</string>
+  <string name="help_menu_switcher_2">giữa</string>
+  <string name="help_menu_switcher_3">máy ảnh, video và panorama</string>
+  <string name="pref_camera2_camera2_title">Chế độ Camera2</string>
+  <string name="pref_camera2_camera2_entry_enable">Bật</string>
+  <string name="pref_camera2_camera2_entry_disable">Tắt</string>
+  <string name="pref_camera2_mono_only_title">Chỉ âm thanh đơn</string>
+  <string name="pref_camera2_mono_preview_title">Xem trước âm thanh đơn</string>
+  <string name="pref_camera2_mono_preview_entry_on">Bật</string>
   <string name="pref_camera2_mono_preview_entry_off">Tắt</string>
+  <string name="pref_camera2_clearsight_entry_on">Bật</string>
   <string name="pref_camera2_clearsight_entry_off">Tắt</string>
+  <string name="clearsight_capture_success">Chụp ClearSight thành công</string>
+  <string name="clearsight_capture_fail">Chụp ClearSight không thành công</string>
+  <string name="pref_camera2_mpo_title">Định dạng MPO</string>
+  <string name="pref_camera2_mpo_entry_on">Bật</string>
   <string name="pref_camera2_mpo_entry_off">Tắt</string>
+  <string name="pref_camera2_makeup_title">Làm đẹp</string>
+  <string name="pref_camera2_noise_reduction_title">Giảm nhiễu</string>
   <string name="pref_camera2_noise_reduction_entry_off">Tắt</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">Nhanh</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Chất lượng cao</string>
+  <string name="pref_camera2_videosnap_title">Kích cỡ ảnh chụp tự động</string>
+  <string name="pref_camera2_videosnap_entry_enable">Bật</string>
+  <string name="pref_camera2_videosnap_entry_disable">Tắt</string>
+  <string name="pref_camera2_trackingfocus_title">Lấy nét bám đuổi</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Hình ảnh tốt nhất</string>
+  <string name="bestpicture_done">XONG</string>
+  <string name="bestpicture_at_least_one_picture">Ít nhất một hình ảnh phải được chọn.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Bật</string>
   <string name="pref_camera2_shutter_sound_entry_off">Tắt</string>
+  <string name="pref_camera2_shutter_sound_title">Âm chụp ảnh</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 6d5817619..b2fc6354e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -140,7 +140,9 @@
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <string name="camera_disabled">Máy ảnh đã bị tắt do chính sách bảo mật.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">Ứng dụng không có quyền quan trọng cần thiết để chạy. Hãy kiểm tra cài đặt quyền của bạn.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Bỏ qua</string>
   <!-- alert to the user to wait for some operation to complete -->
   <string name="wait">Vui lòng đợi\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
@@ -160,6 +162,7 @@
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <string name="pref_camera_id_entry_front">Trước</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">Vị trí GPS</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
   <string name="pref_camera_location_label">VỊ TRÍ</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
@@ -171,6 +174,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">Tiếng bíp khi đếm ngược</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Bộ nhớ</string>
+  <string name="pref_camera_savepath_entry_0">Điện thoại</string>
+  <string name="pref_camera_savepath_entry_1">Thẻ SD</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">Tắt</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
@@ -291,14 +297,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">Không thể chọn trong chế độ phong cảnh.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">HDR sẽ tắt chụp liên tục.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Chụp ảnh nâng cao sẽ tắt chụp liên tục.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">Chất lượng video 4k sẽ tắt ổn định hình ảnh.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">Không thể kích hoạt SeeMore lúc quay video 4k.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">Giảm nhiễu chất lượng cao sẽ tắt CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">Giảm nhiễu chất lượng cao sẽ tắt TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore sẽ tắt CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore sẽ tắt TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore sẽ tắt giảm nhiễu.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Độ phơi sáng</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
@@ -530,4 +545,6 @@ CHAR LIMIT = NONE] -->
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
   <string name="setting_wallpaper">Đang đặt hình nền</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d còn lại</string>
+  <string name="makeup_video_size_limit">Làm đẹp chỉ hoạt động dưới kích thước VGA trong khi quay video.</string>
 </resources>