Automatic translation import

Change-Id: I77d8227674c75cd357eb0f405672e1cf29e25073

26 files changed, 535 insertions, 37 deletions

diff --git a/res/values-bg/qcomstrings.xml b/res/values-bg/qcomstrings.xml
index 7606adf7f..98daebad0 100644
--- a/res/values-bg/qcomstrings.xml
+++ b/res/values-bg/qcomstrings.xml
@@ -36,9 +36,9 @@
   <!-- Settings screen, Select auto exposure title -->
   <string name="pref_camera_autoexposure_title">Автоматична експозиция</string>
   <!-- Settings screen, auto exposure dialog radio button choices -->
-  <string name="pref_camera_autoexposure_entry_frameaverage">Усреднен</string>
+  <string name="pref_camera_autoexposure_entry_frameaverage">Усреднена</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">В центъра на кадъра</string>
-  <string name="pref_camera_autoexposure_entry_spotmetering">Пунктирана</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Точково измерване</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Video encoder title -->
   <string name="pref_camera_videoencoder_title">Видео кодек</string>
@@ -64,10 +64,10 @@
   <!-- Settings screen, Selectable zone af title -->
   <string name="pref_camera_selectablezoneaf_title">Зона за автофокус</string>
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
-  <string name="pref_camera_selectablezoneaf_entry_auto">Автом</string>
-  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Пунктирана</string>
+  <string name="pref_camera_selectablezoneaf_entry_auto">Автоматично</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Точково измерване</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">В центъра на кадъра</string>
-  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Усреднен</string>
+  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Усреднена</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Selectable advanced features title -->
   <string name="pref_camera_advanced_features_title">Разширени функции</string>
@@ -80,17 +80,17 @@
   <string name="pref_camera_manual_exp_entry_ISO_priority">ISO приоритет</string>
   <string name="pref_camera_manual_exp_entry_exptime_priority">Време за експозиция приоритет</string>
   <string name="pref_camera_manual_exp_entry_user_setting">Потребителска настройка</string>
-  <string name="pref_camera_manual_exp_entry_off">Изключено</string>
+  <string name="pref_camera_manual_exp_entry_off">Изкл.</string>
   <!-- Manual white balance entry values -->
   <string name="pref_camera_manual_wb_title">Ръчен баланс на бялото</string>
   <string name="pref_camera_manual_wb_entry_color_temperature">Температура на цвета</string>
   <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB печалби</string>
-  <string name="pref_camera_manual_wb_entry_off">Изключено</string>
+  <string name="pref_camera_manual_wb_entry_off">Изкл.</string>
   <!-- Manual Focus entry values -->
   <string name="pref_camera_manual_focus_title">Ръчен фокус</string>
   <string name="pref_camera_manual_focus_entry_scale_mode">Мащабен режим</string>
   <string name="pref_camera_manual_focus_entry_diopter_mode">Диоптър режим</string>
-  <string name="pref_camera_manual_focus_entry_off">Изключено</string>
+  <string name="pref_camera_manual_focus_entry_off">Изкл.</string>
   <!-- Instant Capture entry -->
   <string name="pref_camera_instant_capture_title" translatable="true">Моментално стимка</string>
   <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Агресивен AEC</string>
@@ -98,22 +98,22 @@
   <string name="pref_camera_instant_capture_entry_disable" translatable="true">Изкл.</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
-  <string name="pref_camera_zsl_entry_off">Изключено</string>
+  <string name="pref_camera_zsl_entry_off">Изкл.</string>
   <string name="pref_camera_zsl_entry_on">Вкл.</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
   <string name="hdr_enable_message">HDR е разрешен, само автоматичен в режим на сцена</string>
   <string name="scene_enable_message">HDR не се поддържа в решим раличен от автоматичен</string>
   <!-- Settings screen, Video HDR location dialog choices -->
-  <string name="pref_camera_video_hdr_entry_off">Изключено</string>
+  <string name="pref_camera_video_hdr_entry_off">Изкл.</string>
   <string name="pref_camera_video_hdr_entry_on">Вкл.</string>
   <!-- Settings screen, CDS location dialog choices -->
-  <string name="pref_camera_cds_entry_off">Изключено</string>
+  <string name="pref_camera_cds_entry_off">Изкл.</string>
   <string name="pref_camera_cds_entry_on">Вкл.</string>
-  <string name="pref_camera_cds_entry_auto">Автоматично</string>
+  <string name="pref_camera_cds_entry_auto">Автоматичен</string>
   <!-- Settings screen, video CDS location dialog choices -->
-  <string name="pref_camera_video_cds_entry_off">Изключено</string>
+  <string name="pref_camera_video_cds_entry_off">Изкл.</string>
   <string name="pref_camera_video_cds_entry_on">Вкл.</string>
-  <string name="pref_camera_video_cds_entry_auto">Автоматично</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>
@@ -140,13 +140,13 @@
   <!-- Settings screen, Select Face Detection -->
   <string name="pref_camera_facedetection_title">Откриване на лице</string>
   <!-- Settings menu, Face Detection choices -->
-  <string name="pref_camera_facedetection_entry_off">Изключено</string>
+  <string name="pref_camera_facedetection_entry_off">Изкл.</string>
   <string name="pref_camera_facedetection_entry_on">Вкл.</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Светкавица за селфи</string>
   <!-- Settings menu, Selfie Flash choices -->
-  <string name="pref_selfie_flash_entry_off">Изключено</string>
+  <string name="pref_selfie_flash_entry_off">Изкл.</string>
   <string name="pref_selfie_flash_entry_on">Вкл.</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
@@ -206,20 +206,20 @@
   <!-- Settings screen, Select See More title -->
   <string name="pref_camera_noise_reduction_title">Намаляване на шума</string>
   <!-- Settings screen, see more radio button choices -->
-  <string name="pref_camera_noise_reduction_entry_off">Изключено</string>
+  <string name="pref_camera_noise_reduction_entry_off">Изкл.</string>
   <string name="pref_camera_noise_reduction_entry_fast">Бързо</string>
   <string name="pref_camera_noise_reduction_entry_high_quality">Високо качество</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
-  <string name="pref_camera_see_more_entry_off">Изключено</string>
+  <string name="pref_camera_see_more_entry_off">Изкл.</string>
   <string name="pref_camera_see_more_entry_on">Вкл.</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Режим за намаляване на шум</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
-  <string name="pref_camera_denoise_entry_off">Изключено</string>
+  <string name="pref_camera_denoise_entry_off">Изкл.</string>
   <string name="pref_camera_denoise_entry_on">Вкл.</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
@@ -237,13 +237,13 @@
   <string name="pref_camera_antibanding_title">Намаляване на трептене</string>
   <!-- Default Anti Banding setting. -->
   <!-- Settings screen, Anti Banding entries -->
-  <string name="pref_camera_antibanding_entry_0">Изключено</string>
+  <string name="pref_camera_antibanding_entry_0">Изкл.</string>
   <string name="pref_camera_antibanding_entry_1">50Hz (Европа)</string>
   <string name="pref_camera_antibanding_entry_2">60Hz(Америка)</string>
-  <string name="pref_camera_antibanding_entry_3">Автом</string>
+  <string name="pref_camera_antibanding_entry_3">Автоматично</string>
   <!-- Default color effect setting. -->
   <string name="pref_camera_filter_mode_entry_on">Вкл.</string>
-  <string name="pref_camera_filter_mode_entry_off">Изключено</string>
+  <string name="pref_camera_filter_mode_entry_off">Изкл.</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Ефект на цвят</string>
   <string name="pref_camera_filter_mode_title">Ефект на цвят</string>
@@ -268,17 +268,17 @@
   <!-- Settings screen, Select Touch AF/AEC title -->
   <string name="pref_camera_touchafaec_title">Touch AF/AEC</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
-  <string name="pref_camera_touchafaec_entry_off">Изключено</string>
+  <string name="pref_camera_touchafaec_entry_off">Изкл.</string>
   <string name="pref_camera_touchafaec_entry_on">Вкл.</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Стабилизация</string>
   <!-- DIS choices -->
-  <string name="pref_camera_dis_entry_off">Изключено</string>
+  <string name="pref_camera_dis_entry_off">Изкл.</string>
   <string name="pref_camera_dis_entry_on">Вкл.</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Разпознаване на лица</string>
   <!-- Face Recognition choices -->
-  <string name="pref_camera_facerc_entry_off">Изключено</string>
+  <string name="pref_camera_facerc_entry_off">Изкл.</string>
   <string name="pref_camera_facerc_entry_on">Вкл.</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Ниво 0</string>
@@ -344,7 +344,7 @@
   <!-- Settings screen, Select Auto Scene Detection -->
   <string name="pref_camera_scenedetect_title">Автоматично откриване на сцена</string>
   <!-- Settings menu, auto scene detection choices -->
-  <string name="pref_camera_scenedetect_entry_off">Изключено</string>
+  <string name="pref_camera_scenedetect_entry_off">Изкл.</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
   <string name="pref_camera_scenedetect_entry_on">Вкл.</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
@@ -392,7 +392,7 @@
   <string name="camera_gesture_title">Стартиране на камерата</string>
   <string name="pref_camera_tsmakeup_title">Разкрасяване</string>
   <string name="pref_camera_tsmakeup_entry_on">Вкл.</string>
-  <string name="pref_camera_tsmakeup_entry_off">Изключено</string>
+  <string name="pref_camera_tsmakeup_entry_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>
@@ -432,17 +432,17 @@
   <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_mono_preview_entry_off">Изкл.</string>
   <string name="pref_camera2_clearsight_entry_on">Включване</string>
-  <string name="pref_camera2_clearsight_entry_off">Изключено</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_mpo_entry_on">Вкл.</string>
+  <string name="pref_camera2_mpo_entry_off">Изкл.</string>
   <string name="pref_camera2_makeup_title">Грим</string>
   <string name="pref_camera2_noise_reduction_title">Намаляване на шума</string>
-  <string name="pref_camera2_noise_reduction_entry_off">Изключено</string>
+  <string name="pref_camera2_noise_reduction_entry_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>
@@ -453,6 +453,6 @@
   <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_entry_off">Изкл.</string>
   <string name="pref_camera2_shutter_sound_title">Зкук на затвора</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8651277c9..16ec5ef22 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -225,7 +225,7 @@
   <!-- Settings screen, Flash mode title -->
   <string name="pref_camera_flashmode_title">Светкавица</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
-  <string name="pref_camera_flashmode_entry_auto">Автоматичен</string>
+  <string name="pref_camera_flashmode_entry_auto">Автоматична</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
   <string name="pref_camera_flashmode_entry_on">Вкл.</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
diff --git a/res/values-de/qcomstrings.xml b/res/values-de/qcomstrings.xml
index 8c2df2c29..e0151f26b 100644
--- a/res/values-de/qcomstrings.xml
+++ b/res/values-de/qcomstrings.xml
@@ -185,6 +185,7 @@
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
   <string name="snapshot_lower_than_video">Die Auflösung des Schnappschusses ist geringer als die Videoauflösung. Bitte wählen Sie die gleiche oder eine höhere Auflösung als die aktuelle Videoauflösung.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Das Verändern der Auflösung wird im Energiesparmodus nicht unterstützt. Der Schnappschuss wird daher in Videoauflösung aufgenommen. Wählen Sie den normalen Energiemodus aus, um die Auflösung einstellen zu können.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
   <string name="snapshot_qcif_and_d1">Schnappschüsse werden nur in der Videoauflösung unterstützt.</string>
   <!-- Default hfr setting. Do not translate. -->
diff --git a/res/values-es-rUS/camera2arrays.xml b/res/values-es-rUS/camera2arrays.xml
index c5b0b7a8f..ff460d780 100644
--- a/res/values-es-rUS/camera2arrays.xml
+++ b/res/values-es-rUS/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>Activado</item>
+    <item>Desactivado</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Activado</item>
+    <item>Desactivado</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-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index b5528f6a8..9c32f20e0 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/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">Amplia</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">Agua</string>
@@ -101,4 +103,6 @@
   <string name="pref_camera_shutter_speed_title">Velocidad de obturación</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-rUS/qcomstrings.xml b/res/values-es-rUS/qcomstrings.xml
index afbc40bb8..3f94ba369 100644
--- a/res/values-es-rUS/qcomstrings.xml
+++ b/res/values-es-rUS/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">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. -->
@@ -52,6 +55,8 @@
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <string name="pref_camera_skinToneEnhancement_title">Mejora 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>
@@ -87,21 +92,35 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Modo de dioptrías</string>
   <string name="pref_camera_manual_focus_entry_off">Desactivada</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">Desactivada</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">HDR está activado, sólo es compatible el modo de escena automático</string>
+  <string name="scene_enable_message">HDR es incompatible con el modo de escena que no sea Auto</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Desactivada</string>
+  <string name="pref_camera_video_hdr_entry_on">Activado</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Desactivada</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">Desactivada</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">Video HDR</string>
@@ -122,15 +141,25 @@
   <string name="pref_camera_facedetection_title">Detección de rostro</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Desactivada</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">Desactivada</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 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">Alta velocidad/cámara lenta no es compatible con DIS y TimeLapse.</string>
@@ -145,14 +174,20 @@
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <string name="error_app_unsupported">Resolución de video no 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 incompatible</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">Formato de imagen RAW no es compatible en modo cero retraso de obturador. Seleccionar JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE bracketing</string>
   <string name="pref_camera_ae_bracket_hdr_title">AE bracketing</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Activado</string>
+  <string name="err_app_unsupport_ae_bracket_code">Todavía es incompatible el horquillado AE</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 la captura de vídeo es menor que el tamaño del vídeo, limitando el tamaño de vídeo. Seleccione una resolución mayor o igual que el tamaño del vídeo actual.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">La redimensión de la imagen no es compatible en modo de Bajo Consumo, se tomará una captura del tamaño del vídeo. Seleccione el modo de Energía Normal para permitir redimensionar la imagen.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">El tamaño de la captura del vídeo, sólo es compatible con 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>
@@ -165,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 60 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 a 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">Desactivada</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">Desactivada</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">Desactivada</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>
@@ -201,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">Desactivada</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Efecto de color</string>
@@ -224,16 +266,20 @@
   <string name="pref_camera_coloreffect_entry_greentint">Tono en 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">Desactivada</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">Desactivada</string>
+  <string name="pref_camera_dis_entry_on">Activado</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Reconocimiento de rostro</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Desactivada</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>
@@ -284,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">Bajo</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 -->
@@ -295,7 +346,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Desactivada</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 video inválido para la grabación de lapso de tiempo.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Disparo continuo</string>
   <string name="msg_cancel_longshot_for_limited_memory">Poca memoria, cancelación de disparo continuo</string>
@@ -304,6 +357,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Auto HDR</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, cambiar la ubicación de almacenamiento a tarjeta SD</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -321,6 +376,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotación de video</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>
@@ -334,13 +390,69 @@
   <string name="advance_feature_enable_msg">El disparo continuo no es compatible 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">Desactivada</string>
+  <string name="pref_camera_tsmakeup_entry_low">Bajo</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">Blanquear</string>
+  <string name="pref_camera_tsmakeup_level_clean">Suavizar</string>
+  <string name="text_tsmakeup_alert_title">Advertencia</string>
+  <string name="text_tsmakeup_alert_msg">La detección del rostro debe activarse para poder utilizar la función de embellecimiento. ¿Desea 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 centrar la última foto, pulsa aquí</string>
+  <string name="refocus_prompt_message">Con UbiFocus, la cámara tomará 5 cuadros, cada vez que usted presione el botón disparador. Las 5 fotos se combinarán en 1 cuadro, donde todo está en foco. Puede 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">Seleccione un</string>
+  <string name="help_menu_scene_mode_2">Modo de escena</string>
+  <string name="help_menu_scene_mode_3">para mejores fotos</string>
+  <string name="help_menu_color_filter_1">Aplicar color</string>
+  <string name="help_menu_color_filter_2">filtros</string>
+  <string name="help_menu_color_filter_3">para</string>
+  <string name="help_menu_color_filter_4">mejorar fotos</string>
+  <string name="help_menu_beautify_1">Mejorar retratos</string>
+  <string name="help_menu_beautify_2">con el</string>
+  <string name="help_menu_beautify_3">Función de embellecer</string>
+  <string name="help_menu_switcher_1">Interruptor</string>
+  <string name="help_menu_switcher_2">entre</string>
+  <string name="help_menu_switcher_3">cámara, vídeo y panorama</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">Vista previa monocromática</string>
+  <string name="pref_camera2_mono_preview_entry_on">Activado</string>
   <string name="pref_camera2_mono_preview_entry_off">Desactivada</string>
+  <string name="pref_camera2_clearsight_entry_on">Activado</string>
   <string name="pref_camera2_clearsight_entry_off">Desactivada</string>
+  <string name="clearsight_capture_success">Captura de ClearSight exitosa</string>
+  <string name="clearsight_capture_fail">Captura de 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">Desactivada</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">Desactivada</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 automático de foto</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">Se debe marcar al menos una imagen.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Activado</string>
   <string name="pref_camera2_shutter_sound_entry_off">Desactivada</string>
+  <string name="pref_camera2_shutter_sound_title">Sonido del obturador</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5038bb536..e4541887a 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -144,7 +144,9 @@ La imagen recortada se guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <string name="camera_disabled">Se inhabilitó la cámara por 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 los permisos críticos necesarios para funcionar. Comprueba los ajustes 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…</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
@@ -164,6 +166,7 @@ La imagen recortada se guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
   <!-- 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">Ubicació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 guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Marcar cta regr</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">Desactivada</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
@@ -296,14 +302,23 @@ La imagen recortada se guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
   <!-- 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 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 video 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 si está activado el 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 izquierda</string>
+  <string name="makeup_video_size_limit">El maquillaje (makeup) trabaja solamente bajo el tamaño VGA en grabación de vídeo.</string>
 </resources>
diff --git a/res/values-es/qcomstrings.xml b/res/values-es/qcomstrings.xml
index 710b43e25..7d8daf619 100644
--- a/res/values-es/qcomstrings.xml
+++ b/res/values-es/qcomstrings.xml
@@ -26,7 +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">Modo de energía</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Baja energía</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
diff --git a/res/values-hu/camera2arrays.xml b/res/values-hu/camera2arrays.xml
index c5b0b7a8f..9a2586f0d 100644
--- a/res/values-hu/camera2arrays.xml
+++ b/res/values-hu/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Be</item>
+    <item>Ki</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Monó</item>
+    <item>Front</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>Be</item>
+    <item>Ki</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Be</item>
+    <item>Ki</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-nb/strings.xml b/res/values-nb/strings.xml
index f1acaddaf..889f9e29b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -147,7 +147,7 @@
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
   <string name="dialog_dismiss">Avvis</string>
   <!-- alert to the user to wait for some operation to complete -->
-  <string name="wait">Vent litt …</string>
+  <string name="wait">Vent litt\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
   <string name="no_storage" product="default">Sett inn et SD-kort før du bruker kameraet.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
diff --git a/res/values-nl/camera2arrays.xml b/res/values-nl/camera2arrays.xml
index c5b0b7a8f..8d64960d4 100644
--- a/res/values-nl/camera2arrays.xml
+++ b/res/values-nl/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Aan</item>
+    <item>Uit</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Mono</item>
+    <item>Voorzijde</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>Aan</item>
+    <item>Uit</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Aan</item>
+    <item>Uit</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-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index bf3ecb08c..7c27705ba 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/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">Breed</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">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 9b9eae202..5b3b6144b 100644
--- a/res/values-nl/qcomstrings.xml
+++ b/res/values-nl/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">Krachtige modus</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_np">Normaal</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">Huidskleurverbetering</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Inschakelen</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Uitschakelen</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Geen ontspanvertraging (ZSL)</string>
@@ -87,21 +92,35 @@
   <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_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>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Uit</string>
+  <string name="pref_camera_zsl_entry_on">Aan</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR is ingeschakeld, alleen Automatische scènedetectie wordt ondersteund</string>
+  <string name="scene_enable_message">HDR wordt alleen ondersteund in Automatische scènedetectie</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Uit</string>
+  <string name="pref_camera_video_hdr_entry_on">Aan</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Uit</string>
+  <string name="pref_camera_cds_entry_on">Aan</string>
   <string name="pref_camera_cds_entry_auto">Automatisch</string>
   <!-- Settings screen, video CDS location dialog choices -->
   <string name="pref_camera_video_cds_entry_off">Uit</string>
+  <string name="pref_camera_video_cds_entry_on">Aan</string>
   <string name="pref_camera_video_cds_entry_auto">Automatisch</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Uitschakelen</string>
+  <string name="pref_camera_tnr_entry_enable">Inschakelen</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Uitschakelen</string>
+  <string name="pref_camera_video_tnr_entry_enable">Inschakelen</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">Gezichtsherkenning</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Uit</string>
+  <string name="pref_camera_facedetection_entry_on">Aan</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Selfie-flits</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">Uit</string>
+  <string name="pref_selfie_flash_entry_on">Aan</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Rode ogen verminderen</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Inschakelen</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Uitschakelen</string>
+  <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_entry_enable">Ingeschakeld</string>
+  <string name="pref_camera_shuttersound_entry_disable">Uitgeschakeld</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">Opname met hoge beeldsnelheid wordt niet ondersteund bij digitale beeldstabilisatie, time-lapse of HDR.</string>
@@ -145,11 +174,13 @@
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <string name="error_app_unsupported">Videoresolutie niet ondersteund bij deze codec</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Niet-ondersteund videoformaat</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">Raw beeldformaat wordt niet ondersteund in Zero shutter lag modus. Selecteer JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Reeksopname met automatische belichting (AEB)</string>
   <string name="pref_camera_ae_bracket_hdr_title">Reeksopname met automatische belichting (AEB)</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Aan</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
@@ -165,22 +196,27 @@
   <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>
   <!-- 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">Ruisonderdrukking</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">Uit</string>
   <string name="pref_camera_noise_reduction_entry_fast">Snel</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Hoge kwaliteit</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">Uit</string>
+  <string name="pref_camera_see_more_entry_on">Aan</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Kleurruis verwijderen</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">Uit</string>
+  <string name="pref_camera_denoise_entry_on">Aan</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -202,6 +238,7 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
   <string name="pref_camera_antibanding_entry_3">Automatisch</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Aan</string>
   <string name="pref_camera_filter_mode_entry_off">Uit</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Kleureffect</string>
@@ -227,14 +264,17 @@
   <!-- Settings screen, Select Touch AF/AEC title -->
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">Uit</string>
+  <string name="pref_camera_touchafaec_entry_on">Aan</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Digitale beeldstabilisatie</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Uit</string>
+  <string name="pref_camera_dis_entry_on">Aan</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Gezichtsherkenning</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Uit</string>
+  <string name="pref_camera_facerc_entry_on">Aan</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Niveau 0</string>
   <string name="pref_camera_sharpness_entry_level1">Niveau 1</string>
@@ -285,10 +325,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Beeldkwaliteit</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Laag</string>
+  <string name="pref_camera_jpegquality_entry_1">Standaard</string>
+  <string name="pref_camera_jpegquality_entry_2">Hoog</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">Inschakelen</string>
+  <string name="pref_camera_histogram_entry_disable">Uitschakelen</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -296,7 +341,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Uit</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Aan</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Ongeldige videoresolutie voor time-lapse opname.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Continue opname</string>
   <string name="msg_cancel_longshot_for_limited_memory">Niet genoeg geheugen, continue opname wordt afgebroken</string>
@@ -305,6 +352,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Auto-HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Inschakelen</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Uitschakelen</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Onvoldoende interne opslagruimte, opslaglocatie veranderd naar SD-kaart</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -322,6 +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>
   <!-- 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>
@@ -335,21 +385,63 @@
   <string name="advance_feature_enable_msg">Continuopname 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_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_continue">Doorgaan</string>
+  <string name="text_tsmakeup_alert_quit">Annuleer</string>
+  <string name="text_tsmakeup_beautify_toast">Beautify</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>
   <!-- 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_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_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_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="pref_camera2_mpo_entry_on">Aan</string>
   <string name="pref_camera2_mpo_entry_off">Uit</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>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Hoge kwaliteit</string>
   <string name="pref_camera2_videosnap_entry_enable">Inschakelen</string>
   <string name="pref_camera2_videosnap_entry_disable">Uitschakelen</string>
+  <string name="pref_camera2_trackingfocus_title">Focus volgt object</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Beste foto</string>
+  <string name="bestpicture_done">KLAAR</string>
+  <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>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 681c1e819..9d5c2fbf6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -166,6 +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>
   <!--  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]-->
@@ -178,6 +179,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">Pieptoon bij aftellen</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Opslag</string>
+  <string name="pref_camera_savepath_entry_0">Telefoon</string>
+  <string name="pref_camera_savepath_entry_1">SD-kaart</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">Uit</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
@@ -298,14 +302,20 @@
   <!-- 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>
   <!-- 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">Beeld stabilisatie niet beschikbaar 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>
   <!-- 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 -->
   <!-- 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>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Belichting</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
@@ -537,4 +547,5 @@ CHAR LIMIT = NONE] -->
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
   <string name="setting_wallpaper">Achtergrond instellen</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d resterend</string>
 </resources>
diff --git a/res/values-sl/camera2arrays.xml b/res/values-sl/camera2arrays.xml
index c5b0b7a8f..95c83e34c 100644
--- a/res/values-sl/camera2arrays.xml
+++ b/res/values-sl/camera2arrays.xml
@@ -28,6 +28,11 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Mono</item>
+    <item>Sprednja</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/cm_strings.xml b/res/values-sl/cm_strings.xml
index 9dc0898ea..2482e74ea 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/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 mio. sl. točk</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">Zmanjševanje zamegljenosti gibanja</string>
   <string name="pref_camera_scenemode_entry_aqua">Akva</string>
diff --git a/res/values-sl/qcomstrings.xml b/res/values-sl/qcomstrings.xml
index db69d4f66..bf65d8169 100644
--- a/res/values-sl/qcomstrings.xml
+++ b/res/values-sl/qcomstrings.xml
@@ -27,6 +27,7 @@
   <!-- Video quality setting entry. Videos will be recorded in QCIF quality. [CHAR LIMIT=24] -->
   <!-- Settings screen, Power Mode title -->
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Nizka poraba</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
@@ -52,6 +53,8 @@
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <string name="pref_camera_skinToneEnhancement_title">Izboljšanje tona kože</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Omogoči</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Onemogoči</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Brez zakasnitve sprožilca</string>
@@ -87,6 +90,10 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Način dioptra</string>
   <string name="pref_camera_manual_focus_entry_off">Izklopljeno</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">Takojšen zajem</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Agresiven AEC</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Hitri AEC</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Onemogoči</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Izklopljeno</string>
@@ -100,8 +107,12 @@
   <string name="pref_camera_video_cds_entry_off">Izklopljeno</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>
+  <string name="pref_camera_tnr_entry_enable">Omogoči</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Onemogoči</string>
+  <string name="pref_camera_video_tnr_entry_enable">Omogoči</string>
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, setting title text for Video HDR-->
   <string name="pref_camera_video_hdr_title">HDR slike</string>
@@ -131,6 +142,12 @@
   <!-- 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_entry_enable">Omogoči</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Onemogoči</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. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Počasni posnetek ni podprt ob uporabi ustalitve/časovnega zamika/HDR-a.</string>
@@ -165,12 +182,15 @@
   <string name="pref_camera_hfr_entry_hsr_60">Visoka hitrost 60 sl./s</string>
   <string name="pref_camera_hfr_entry_hsr_90">Visoka hitrost 90 sl./s</string>
   <string name="pref_camera_hfr_entry_hsr_120">Visoka hitrost 120 sl./s</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Visoka hitrost 240 sl./s</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">Zmanjševanje šuma</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">Izklopljeno</string>
   <string name="pref_camera_noise_reduction_entry_fast">Hitro</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Visoka kakovost</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
@@ -289,6 +309,8 @@
   <!-- 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">Omogoči</string>
+  <string name="pref_camera_histogram_entry_disable">Onemogoči</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -305,6 +327,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Samodejni HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Omogoči</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Onemogoči</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Na notranjem pomnilniku je premalo prostora, preklop na kartico SD</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -322,6 +346,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Sukanje videoposnetka</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">SUKANJE VIDEOPOSNETKA</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 stopinj</string>
   <string name="pref_camera_video_rotation_entry_90">90 stopinj</string>
@@ -336,9 +361,14 @@
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Zaženi fotoaparat</string>
   <string name="pref_camera_tsmakeup_entry_off">Izklopljeno</string>
+  <string name="text_tsmakeup_alert_title">Opozorilo</string>
+  <string name="text_tsmakeup_alert_continue">Nadaljuj</string>
+  <string name="text_tsmakeup_alert_quit">Prekliči</string>
   <string name="all_in_focus">V celoti izostreno</string>
   <string name="refocus_toast">Za ponovno ostrenje zadnje slike tapnite tukaj</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">V REDU</string>
+  <string name="help_menu_color_filter_2">filtri</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_preview_entry_on">Vkl.</string>
@@ -350,8 +380,10 @@
   <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>
+  <string name="pref_camera2_noise_reduction_title">Zmanjševanje šuma</string>
   <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_entry_enable">Omogoči</string>
   <string name="pref_camera2_videosnap_entry_disable">Onemogoči</string>
   <string name="pref_camera2_shutter_sound_entry_off">Izklopljeno</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b4dc67e02..ea3fd32ff 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -175,6 +175,7 @@ Predmet je shranjen lokalno in na voljo brez povezave.</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <string name="pref_camera_id_entry_front">Spredaj</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">GPS lokacija</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
   <string name="pref_camera_location_label">LOKACIJA</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
@@ -189,6 +190,7 @@ 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_entry_0">Telefon</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] -->
@@ -309,14 +311,23 @@ Predmet je shranjen lokalno in na voljo brez povezave.</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
   <string name="not_selectable_in_scene_mode">Ni mogoče izbrati v načinu prizora.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">HDR bo onemogočil neprekinjeno fotografiranje.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Napredni zajem bo onemogočil neprekinjeno fotografiranje.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">4k kakovost videoposnetka bo onemogočila stabilizacijo slike.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMora ni možno omogočiti v videoposnetku 4k.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">Zmanjševanje šuma visoke kakovosti bo onemogočilo CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">Zmanjševanje šuma visoke kakovosti bo onemogočilo TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore bo onemogočil CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore bo onemogočil TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore bo onemogočil zmanjševanje šuma.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Osvetlitev</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
@@ -548,4 +559,5 @@ CHAR LIMIT = NONE] -->
   <!--  String shown when setting the homepage wallpaper in the background [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>
 </resources>
diff --git a/res/values-sv/camera2arrays.xml b/res/values-sv/camera2arrays.xml
index c5b0b7a8f..e4799e030 100644
--- a/res/values-sv/camera2arrays.xml
+++ b/res/values-sv/camera2arrays.xml
@@ -28,6 +28,10 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>På</item>
+    <item>Av</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-sv/qcomstrings.xml b/res/values-sv/qcomstrings.xml
index b88a0d1d2..79e99f7cd 100644
--- a/res/values-sv/qcomstrings.xml
+++ b/res/values-sv/qcomstrings.xml
@@ -52,6 +52,7 @@
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <string name="pref_camera_skinToneEnhancement_title">Hudfärgsförstärkning</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Aktivera</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Ingen slutarfördröjning</string>
@@ -131,6 +132,7 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Röda ögon-reduktion</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Aktivera</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">Höghastighetsinspelning stöds inte när du använder stabilisering/intervallinspelning/HDR.</string>
diff --git a/res/values-tr/camera2arrays.xml b/res/values-tr/camera2arrays.xml
index c5b0b7a8f..4fc79816c 100644
--- a/res/values-tr/camera2arrays.xml
+++ b/res/values-tr/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Açık</item>
+    <item>Kapalı</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Mono</item>
+    <item>Ön</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>Açık</item>
+    <item>Kapalı</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Açık</item>
+    <item>Kapalı</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-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 77af478bd..cf79ce1fd 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/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">Geniş</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 megapixel</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">Hareket bulanıklığı düşürücü</string>
   <string name="pref_camera_scenemode_entry_aqua">Su</string>
@@ -101,4 +103,6 @@
   <string name="pref_camera_shutter_speed_title">Çekim hızı</string>
   <string name="auto_hdr_enabled">Otomatik HDR etkin</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">Gelişmiş kamera seçeneklerini etkinleştirdiniz</string>
+  <string name="developer_menu_disabled">Gelişmiş kamera seçeneklerini devre dışı bıraktınız</string>
 </resources>
diff --git a/res/values-tr/qcomstrings.xml b/res/values-tr/qcomstrings.xml
index c7bb10425..919c0769c 100644
--- a/res/values-tr/qcomstrings.xml
+++ b/res/values-tr/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">Güç modu</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Düşük güç</string>
+  <string name="pref_camera_powermode_entry_np">Normal güç</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">Cilt rengi geliştirmesi</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Etkin</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Devre dışı</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Sıfır çekim gecikmesi</string>
@@ -87,21 +92,35 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter modu</string>
   <string name="pref_camera_manual_focus_entry_off">Kapalı</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">Anlık yakalama</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Agresif AEC</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Hızlı AEC</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Devre dışı</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Kapalı</string>
+  <string name="pref_camera_zsl_entry_on">Açık</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR etkinleştirildi, sadece Otomatik mod destekleniyor</string>
+  <string name="scene_enable_message">HDR, Otomatik mod dışında desteklenmiyor</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Kapalı</string>
+  <string name="pref_camera_video_hdr_entry_on">Açık</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Kapalı</string>
+  <string name="pref_camera_cds_entry_on">Açık</string>
   <string name="pref_camera_cds_entry_auto">Otomatik</string>
   <!-- Settings screen, video CDS location dialog choices -->
   <string name="pref_camera_video_cds_entry_off">Kapalı</string>
+  <string name="pref_camera_video_cds_entry_on">Açık</string>
   <string name="pref_camera_video_cds_entry_auto">Otomatik</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Devre Dışı Bırak</string>
+  <string name="pref_camera_tnr_entry_enable">Etkinleştir</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Devre Dışı Bırak</string>
+  <string name="pref_camera_video_tnr_entry_enable">Etkinleştir</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">Yüz tanıma</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Kapalı</string>
+  <string name="pref_camera_facedetection_entry_on">Açık</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Özçekim flaşı</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">Kapalı</string>
+  <string name="pref_selfie_flash_entry_on">Açık</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Kırmızı göz giderme</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Etkin</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Devre dışı</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Selfie ayna</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Etkin</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Devre dışı</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Deklanşör sesi</string>
+  <string name="pref_camera_shuttersound_entry_enable">Etkinleştirildi</string>
+  <string name="pref_camera_shuttersound_entry_disable">Devre dışı</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">Yüksek-framerate kayıt sabitleme, Sabitleştirme/Zaman atlama/HDR kullanılırken desteklenmiyor.</string>
@@ -145,14 +174,20 @@
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <string name="error_app_unsupported">Bu kodlayıcı için desteklenmeyen video çözünürlüğü</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Desteklenmeyen video profili</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">İşlenmemiş görüntü biçimi Sıfır deklanşör gecikmesi modunda desteklenmiyor. JPEG biçimini seçiniz</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE braketleme</string>
   <string name="pref_camera_ae_bracket_hdr_title">AE braketleme</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Açık</string>
+  <string name="err_app_unsupport_ae_bracket_code">AE tarama henüz desteklenmiyor</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Video resim boyutu video boyutundan küçük ve video boyutuyla sınırlı olmalıdır. Lütfen şu anki video boyutunu eşit ya da daha küçük bir çözünürlük seçin.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Düşük güç modunda resim boyutunu düzenleme desteklenmiyor. Video boyutunda görüntü çekilecek. Lütfen resim boyutunu değiştirmek için Normal Güç moduna geçin.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Bu çözünürlükte sadece video boyutunda fotoğraf desteklenmekte.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Ağır çekim</string>
@@ -165,21 +200,27 @@
   <string name="pref_camera_hfr_entry_hsr_60">Hızlı çekim 60 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_90">Hızlı çekim 90 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_120">Hızlı çekim 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Yüksek hız 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">Parazit Azaltma</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">Kapalı</string>
+  <string name="pref_camera_noise_reduction_entry_fast">Hızlı</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Yüksek kalite</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">Kapalı</string>
+  <string name="pref_camera_see_more_entry_on">Açık</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Wavelet Gürültü giderme modu</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">Kapalı</string>
+  <string name="pref_camera_denoise_entry_on">Açık</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 (ABD)</string>
   <string name="pref_camera_antibanding_entry_3">Oto</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Açık</string>
   <string name="pref_camera_filter_mode_entry_off">Kapalı</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Renk efekti</string>
@@ -224,16 +266,20 @@
   <string name="pref_camera_coloreffect_entry_greentint">Yeşil tonlama</string>
   <!-- Default Touch AF/AEC setting. Do not translate. -->
   <!-- Settings screen, Select Touch AF/AEC title -->
+  <string name="pref_camera_touchafaec_title">Dokunarak AF/AEC</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">Kapalı</string>
+  <string name="pref_camera_touchafaec_entry_on">Açık</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Sayısal Görüntü Dengeleme</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Kapalı</string>
+  <string name="pref_camera_dis_entry_on">Açık</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Yüz tanıma</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Kapalı</string>
+  <string name="pref_camera_facerc_entry_on">Açık</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Düzey 0</string>
   <string name="pref_camera_sharpness_entry_level1">Düzey 1</string>
@@ -284,10 +330,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Resim kalitesi</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Düşük</string>
+  <string name="pref_camera_jpegquality_entry_1">Standart</string>
+  <string name="pref_camera_jpegquality_entry_2">Yüksek</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">Etkin</string>
+  <string name="pref_camera_histogram_entry_disable">Devre dışı</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">Kapalı</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Açık</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Hızlandırılmış çekim için geçersiz video boyutu.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Sürekli çekim</string>
   <string name="msg_cancel_longshot_for_limited_memory">Hafıza bitiyor, sürekli çekim iptal ediliyor</string>
@@ -304,6 +357,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Otomatik HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Etkin</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Devre dışı</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Dahili depolama alanı yeterli değil, depolama yeri SD karta geçiş yaptı</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -321,6 +376,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Video döndürme</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">VIDEO DÖNDÜRME</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 derece</string>
   <string name="pref_camera_video_rotation_entry_90">90 derece</string>
@@ -334,13 +390,69 @@
   <string name="advance_feature_enable_msg">Gelişmiş özellikler etkin olduğunda sürekli çekim desteklenmez</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Kamerayı başlat</string>
+  <string name="pref_camera_tsmakeup_title">Güzelleştirme</string>
+  <string name="pref_camera_tsmakeup_entry_on">Açık</string>
   <string name="pref_camera_tsmakeup_entry_off">Kapalı</string>
+  <string name="pref_camera_tsmakeup_entry_low">Düşük</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Orta</string>
+  <string name="pref_camera_tsmakeup_entry_high">Yüksek</string>
+  <string name="pref_camera_tsmakeup_custom">Özel</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Beyazlat</string>
+  <string name="pref_camera_tsmakeup_level_clean">Yumuşat</string>
+  <string name="text_tsmakeup_alert_title">Uyarı</string>
+  <string name="text_tsmakeup_alert_msg">Yüz güzelliği modu için yüz tarama gereklidir. Devam etmek istiyor musunuz?</string>
+  <string name="text_tsmakeup_alert_continue">Devam</string>
+  <string name="text_tsmakeup_alert_quit">İptal</string>
+  <string name="text_tsmakeup_beautify_toast">Güzelleştir</string>
   <string name="all_in_focus">Hepsi odaklandı</string>
   <string name="refocus_toast">Son fotoğrafı yeniden odaklamak için buraya dokunun</string>
+  <string name="refocus_prompt_message">UbiFocus ile siz her deklanşöre bastığınızda 5 resim çekilir. 5 resim 1 resimde birleştirilir. Sonradan odaklama yapabilirsiniz.</string>
+  <string name="camera_thermal_shutdown">Telefon aşırı ısındı, kamera kapatılıyor.</string>
+  <string name="camera_server_died">Medya sunucusu öldü, kamera kapatılıyor.</string>
+  <string name="camera_unknown_error">Bilinmeyen hata, kamera kapatılıyor.</string>
+  <string name="mute_button_desc">Sessiz tuşu</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">TAMAM</string>
+  <string name="help_menu_scene_mode_1">Seçin</string>
+  <string name="help_menu_scene_mode_2">Sahne modu</string>
+  <string name="help_menu_scene_mode_3">daha iyi fotoğraflar için</string>
+  <string name="help_menu_color_filter_1">Rengi uygula</string>
+  <string name="help_menu_color_filter_2">filtreler</string>
+  <string name="help_menu_color_filter_3">-e/-a</string>
+  <string name="help_menu_color_filter_4">resimleri iyileştir</string>
+  <string name="help_menu_beautify_1">Portleri geliştir</string>
+  <string name="help_menu_beautify_2">ile</string>
+  <string name="help_menu_beautify_3">Güzellik özelliği</string>
+  <string name="help_menu_switcher_1">Anahtar</string>
+  <string name="help_menu_switcher_2">arasında</string>
+  <string name="help_menu_switcher_3">kamera, video ve panorama</string>
+  <string name="pref_camera2_camera2_title">Kamera2 modu</string>
+  <string name="pref_camera2_camera2_entry_enable">Etkinleştir</string>
+  <string name="pref_camera2_camera2_entry_disable">Devre dışı</string>
+  <string name="pref_camera2_mono_only_title">Sadece mono</string>
+  <string name="pref_camera2_mono_preview_title">Mono önizleme</string>
+  <string name="pref_camera2_mono_preview_entry_on">Açık</string>
   <string name="pref_camera2_mono_preview_entry_off">Kapalı</string>
+  <string name="pref_camera2_clearsight_entry_on">Açık</string>
   <string name="pref_camera2_clearsight_entry_off">Kapalı</string>
+  <string name="clearsight_capture_success">ClearSight yakalama başarılı</string>
+  <string name="clearsight_capture_fail">ClearSight yakalama başarısız oldu</string>
+  <string name="pref_camera2_mpo_title">MPO formatı</string>
+  <string name="pref_camera2_mpo_entry_on">Açık</string>
   <string name="pref_camera2_mpo_entry_off">Kapalı</string>
+  <string name="pref_camera2_makeup_title">Makyaj</string>
+  <string name="pref_camera2_noise_reduction_title">Parazit azaltma</string>
   <string name="pref_camera2_noise_reduction_entry_off">Kapalı</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">Hızlı</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Yüksek kalite</string>
+  <string name="pref_camera2_videosnap_title">Otomatik anlık görüntü boyutu</string>
+  <string name="pref_camera2_videosnap_entry_enable">Etkinleştir</string>
+  <string name="pref_camera2_videosnap_entry_disable">Devre dışı</string>
+  <string name="pref_camera2_trackingfocus_title">Odak izleme</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">En iyi görüntü</string>
+  <string name="bestpicture_done">BİTTİ</string>
+  <string name="bestpicture_at_least_one_picture">En az bir resim seçilmeli.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Açık</string>
   <string name="pref_camera2_shutter_sound_entry_off">Kapalı</string>
+  <string name="pref_camera2_shutter_sound_title">Deklanşör sesi</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0db27b7ec..986468c06 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -144,7 +144,9 @@ Kesilen resim <xliff:g id="folder_name">%s</xliff:g> klasörüne kaydedildi.</st
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <string name="camera_disabled">Güvenlik politikaları nedeniyle kamera devre dışı bırakıldı.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">Uygulamanın, çalışması için gerekli olan kritik izinleri yok. Lütfen izin ayarlarınızı kontrol edin.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Vazgeç</string>
   <!-- alert to the user to wait for some operation to complete -->
   <string name="wait">Lütfen bekleyin…\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
@@ -164,6 +166,7 @@ Kesilen resim <xliff:g id="folder_name">%s</xliff:g> klasörüne kaydedildi.</st
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <string name="pref_camera_id_entry_front">Ön</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">GPS konumu</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
   <string name="pref_camera_location_label">KONUM</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
@@ -176,6 +179,9 @@ Kesilen resim <xliff:g id="folder_name">%s</xliff:g> klasörüne kaydedildi.</st
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Geri sayımda bip sesi çıkar</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Depolama</string>
+  <string name="pref_camera_savepath_entry_0">Telefon</string>
+  <string name="pref_camera_savepath_entry_1">SD Kart</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">Kapalı</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
@@ -296,14 +302,23 @@ Kesilen resim <xliff:g id="folder_name">%s</xliff:g> klasörüne kaydedildi.</st
   <!-- 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">Sahne modunda seçilemez.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">Sürekli çekimde HDR devre dışı bırakılır.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Sürekli çekimde gelişmiş yakalama devre dışı bırakılır.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">Resim stabilizasyonunda 4K devre dışı bırakılır.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore 4K videoda etkinleştirilemez.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">Yüksek kalitede parazit azaltma CDS\'yi devre dışı bırakır.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">Yüksek kalitede parazit azaltma TNR\'yi devre dışı bırakır.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore CDS\'yi devre dışı bırakır.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore TNR\'yi devre dışı bırakır.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore parazit azaltmayı devre dışı bırakır.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Pozlama</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">Duvar kağıdı ayarlanıyor</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d kaldı</string>
+  <string name="makeup_video_size_limit">Videoda makyaj sadece VGA kalitede çalışır.</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index ffdab30f8..319283c5f 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -57,7 +57,7 @@
   <string name="pref_camera_scenemode_entry_oldfilm">老電影</string>
   <string name="pref_camera_scenemode_entry_pet">寵物</string>
   <string name="pref_camera_scenemode_entry_portrait">肖像</string>
-  <string name="pref_camera_scenemode_entry_snow">雪</string>
+  <string name="pref_camera_scenemode_entry_snow">雪景</string>
   <string name="pref_camera_scenemode_entry_softskin">柔滑膚質</string>
   <string name="pref_camera_scenemode_entry_sports">運動</string>
   <string name="pref_camera_scenemode_entry_spotlight">聚光燈</string>
diff --git a/res/values-zh-rTW/qcomstrings.xml b/res/values-zh-rTW/qcomstrings.xml
index b0038c640..75ad9cdef 100644
--- a/res/values-zh-rTW/qcomstrings.xml
+++ b/res/values-zh-rTW/qcomstrings.xml
@@ -353,7 +353,7 @@
   <string name="pref_camera_longshot_title">連拍</string>
   <string name="msg_cancel_longshot_for_limited_memory">記憶體不足，正取消連拍模式</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
-  <string name="flash_aebracket_message">在 AE 包覆曝光模式下不支援閃光燈</string>
+  <string name="flash_aebracket_message">在自動包圍曝光模式下不支援閃光燈</string>
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">自動 HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->