From 58fa0bd2f88e2f01c0916c36c725e89c7533ddf0 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Thu, 20 Apr 2017 12:09:04 -0700
Subject: Automatic translation import

Change-Id: I43a8bc820f65e167509af1f0899f63874676bbe5
---
 res/values-ast-rES/cm_strings.xml   |   3 +
 res/values-ast-rES/strings.xml      |   7 +-
 res/values-en-rAU/camera2arrays.xml |  17 +++
 res/values-en-rAU/cm_strings.xml    |  74 ++++++++++
 res/values-en-rAU/qcomstrings.xml   | 278 +++++++++++++++++++++++++++++++++++
 res/values-en-rAU/strings.xml       | 269 ++++++++++++++++++++++++++++++++++
 res/values-en-rGB/cm_strings.xml    |  26 ++++
 res/values-en-rGB/qcomstrings.xml   | 245 +++++++++++++++++++++++++++++++
 res/values-en-rGB/strings.xml       | 197 +++++++++++++++++++++++++
 res/values-en-rIN/camera2arrays.xml |  17 +++
 res/values-en-rIN/cm_strings.xml    |  74 ++++++++++
 res/values-en-rIN/qcomstrings.xml   | 279 ++++++++++++++++++++++++++++++++++++
 res/values-en-rIN/strings.xml       | 270 ++++++++++++++++++++++++++++++++++
 res/values-iw/strings.xml           |   8 +-
 res/values-ko/qcomstrings.xml       |   6 +-
 res/values-pl/qcomstrings.xml       |   4 +
 res/values-pl/strings.xml           |   1 +
 res/values-pt-rBR/qcomstrings.xml   |   3 +
 res/values-sq-rAL/camera2arrays.xml |  17 +++
 res/values-sq-rAL/cm_strings.xml    |  22 +++
 res/values-sq-rAL/qcomstrings.xml   | 171 ++++++++++++++++++++++
 res/values-sq-rAL/strings.xml       | 159 ++++++++++++++++++++
 res/values-sr/qcomstrings.xml       |   9 ++
 res/values-sv/cm_strings.xml        |   1 +
 res/values-sv/strings.xml           |   1 +
 25 files changed, 2149 insertions(+), 9 deletions(-)

diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index e96543f0d..cefbfbdd4 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -36,7 +36,10 @@
   <string name="pref_camera_scenemode_entry_barcode">Códigu de barres</string>
   <string name="pref_camera_scenemode_entry_beach">Sablera</string>
   <string name="pref_camera_scenemode_entry_candlelight">Lluz de vela</string>
+  <string name="pref_camera_scenemode_entry_document">Documentu</string>
+  <string name="pref_camera_scenemode_entry_fireworks">Voladores</string>
   <string name="pref_camera_scenemode_entry_highsensitivity">Sensibilidá alta</string>
+  <string name="pref_camera_scenemode_entry_sports">Deportes</string>
   <!-- Settings screen, focus mode -->
   <string name="pref_camera_focusmode_entry_normal">Normal</string>
   <!-- Color effects -->
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 7b1c6b68f..647704492 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -61,10 +61,10 @@
     <item quantity="other">%1$d esbillaos</item>
   </plurals>
   <!-- String indicating timestamp of photo or video -->
-  <string name="show_on_map">Amosar nel mapa</string>
-  <string name="rotate_left">Xirar a la esquierda</string>
+  <string name="rotate_left">Voltiar a esquierda</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
+  <string name="edit">Editar</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
@@ -84,6 +84,7 @@
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
   <string name="orientation">Orientación</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <string name="duration">Duración</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
   <string name="mimetype">Triba MIME</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
@@ -95,6 +96,7 @@
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
   <string name="unit_mm">mm</string>
@@ -126,6 +128,7 @@
   <!-- Settings screen, setting title text -->
   <string name="pref_camera_recordlocation_title">Allugamientu GPS</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">ALLUGAMIENTU</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
   <plurals name="pref_camera_timer_entry">
diff --git a/res/values-en-rAU/camera2arrays.xml b/res/values-en-rAU/camera2arrays.xml
index c5b0b7a8f..503251833 100644
--- a/res/values-en-rAU/camera2arrays.xml
+++ b/res/values-en-rAU/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>On</item>
+    <item>Off</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Mono</item>
+    <item>Front</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>On</item>
+    <item>Off</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>On</item>
+    <item>Off</item>
+  </string-array>
   <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
         -1 refers to ones not supported in Camera2 API
         0 is special case added for auto (meaning off)
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index ebca1dc44..0dd062828 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -18,17 +18,91 @@
 <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">Wide</string>
   <!-- format for entries in the picture size menu. Parameter one is aspect ratio
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapixels</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string>
+  <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
+  <string name="pref_camera_scenemode_entry_ar">Augmented reality</string>
+  <string name="pref_camera_scenemode_entry_asd">Best shot</string>
+  <string name="pref_camera_scenemode_entry_baby">Baby</string>
+  <string name="pref_camera_scenemode_entry_backgroundblur">Background blur</string>
+  <string name="pref_camera_scenemode_entry_backlight">Backlight</string>
+  <string name="pref_camera_scenemode_entry_backlightportrait">Backlight portrait</string>
+  <string name="pref_camera_scenemode_entry_barcode">Barcode</string>
+  <string name="pref_camera_scenemode_entry_beach">Beach</string>
+  <string name="pref_camera_scenemode_entry_beauty">Beauty</string>
+  <string name="pref_camera_scenemode_entry_candlelight">Candlelight</string>
+  <string name="pref_camera_scenemode_entry_cine">Cine</string>
+  <string name="pref_camera_scenemode_entry_closeup">Close-up</string>
+  <string name="pref_camera_scenemode_entry_dark">Dark</string>
+  <string name="pref_camera_scenemode_entry_dish">Dish</string>
+  <string name="pref_camera_scenemode_entry_duskdawn">Dusk/dawn</string>
+  <string name="pref_camera_scenemode_entry_document">Document</string>
+  <string name="pref_camera_scenemode_entry_fallcolor">Autumn</string>
+  <string name="pref_camera_scenemode_entry_fireworks">Fireworks</string>
+  <string name="pref_camera_scenemode_entry_flowers">Flowers</string>
+  <string name="pref_camera_scenemode_entry_handheldtwilight">Handheld twilight</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">High sensitivity</string>
+  <string name="pref_camera_scenemode_entry_indoor">Indoor</string>
+  <string name="pref_camera_scenemode_entry_landscape">Landscape</string>
+  <string name="pref_camera_scenemode_entry_mix_illuminant">Mixed lighting</string>
+  <string name="pref_camera_scenemode_entry_mood">Mood</string>
+  <string name="pref_camera_scenemode_entry_nightportrait">Night portrait</string>
+  <string name="pref_camera_scenemode_entry_nightindoor">Night indoor</string>
+  <string name="pref_camera_scenemode_entry_oldfilm">Old film</string>
+  <string name="pref_camera_scenemode_entry_pet">Pet</string>
+  <string name="pref_camera_scenemode_entry_portrait">Portrait</string>
+  <string name="pref_camera_scenemode_entry_snow">Snow</string>
+  <string name="pref_camera_scenemode_entry_softskin">Soft skin</string>
+  <string name="pref_camera_scenemode_entry_sports">Sports</string>
+  <string name="pref_camera_scenemode_entry_spotlight">Spotlight</string>
+  <string name="pref_camera_scenemode_entry_steadyphoto">Steady photo</string>
+  <string name="pref_camera_scenemode_entry_supernight">Dark night</string>
+  <string name="pref_camera_scenemode_entry_sweepstitch">Sweep stitch</string>
+  <string name="pref_camera_scenemode_entry_text">Text</string>
+  <string name="pref_camera_scenemode_entry_theatre">Theatre</string>
+  <string name="pref_camera_scenemode_entry_whiteboard">Whiteboard</string>
   <!-- Settings screen, focus mode -->
+  <string name="pref_camera_focusmode_entry_continuous">Continuous</string>
+  <string name="pref_camera_focusmode_entry_mw_continuous">Continuous (MW)</string>
+  <string name="pref_camera_focusmode_entry_extended">Extended</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Face detect</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Face priority</string>
+  <string name="pref_camera_focusmode_entry_fixed">Fixed</string>
+  <string name="pref_camera_focusmode_entry_normal">Normal</string>
+  <string name="pref_camera_focusmode_entry_portrait">Portrait</string>
+  <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
   <!-- Color effects -->
+  <string name="pref_camera_coloreffect_entry_washed">Washed</string>
+  <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage warm</string>
+  <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage cold</string>
+  <string name="pref_camera_coloreffect_entry_point_blue">Point blue</string>
+  <string name="pref_camera_coloreffect_entry_point_green">Point green</string>
+  <string name="pref_camera_coloreffect_entry_point_red_yellow">Point red-yellow</string>
+  <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonise</string>
   <!-- Red eye flash mode title -->
+  <string name="pref_camera_flashmode_entry_redeye">Red-eye</string>
+  <string name="pref_camera_flashmode_label_redeye">RED EYE</string>
   <!-- Power shutter -->
+  <string name="pref_camera_power_shutter_title">Power shutter</string>
   <!-- Max brightness -->
+  <string name="pref_camera_max_brightness_title">Bright screen</string>
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_title">Touch focus duration</string>
+  <string name="pref_camera_focustime_entry_0">0s</string>
+  <string name="pref_camera_focustime_entry_3">3s</string>
+  <string name="pref_camera_focustime_entry_5">5s</string>
+  <string name="pref_camera_focustime_entry_10">10s</string>
+  <string name="pref_camera_focustime_entry_infinite">Infinite</string>
   <!-- Shutter speed -->
+  <string name="pref_camera_shutter_speed_title">Shutter speed</string>
+  <string name="auto_hdr_enabled">Auto HDR enabled</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">You have enabled advanced camera options</string>
+  <string name="developer_menu_disabled">You have disabled advanced camera options</string>
 </resources>
diff --git a/res/values-en-rAU/qcomstrings.xml b/res/values-en-rAU/qcomstrings.xml
index eb31e645f..8e3146be1 100644
--- a/res/values-en-rAU/qcomstrings.xml
+++ b/res/values-en-rAU/qcomstrings.xml
@@ -26,152 +26,430 @@
   <!-- 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">Power mode</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Low power</string>
+  <string name="pref_camera_powermode_entry_np">Normal power</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
   <!-- Settings screen, Select auto exposure title -->
+  <string name="pref_camera_autoexposure_title">Auto exposure</string>
   <!-- Settings screen, auto exposure dialog radio button choices -->
+  <string name="pref_camera_autoexposure_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_autoexposure_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Video encoder title -->
+  <string name="pref_camera_videoencoder_title">Video codec</string>
   <!-- Settings screen, Video encoder dialog radio button choices -->
   <!-- Default video encoder setting. A numerical value. -->
   <!-- Settings screen, Video encoder dialog title -->
+  <string name="pref_camera_videoencoder_dialogtitle">Video codec</string>
   <!-- Default audio encoder setting. A numerical value. -->
   <!-- Settings screen, Audio encoder title -->
+  <string name="pref_camera_audioencoder_title">Audio codec</string>
   <!-- Settings screen, Audio encoder dialog radio button choices -->
   <!-- Default video duration setting. A numerical value.-->
   <!-- Default Skin Tone Enhancement setting. Do not translate. -->
   <!-- Settings screen, Select Skin Tone Enhancement title -->
+  <string name="pref_camera_skinToneEnhancement_title">Skin tone enhancement</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Enable</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Disable</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
+  <string name="pref_camera_zsl_title">Zero shutter lag</string>
   <!-- Default selectable zone af setting. Do not translate. -->
   <!-- Settings screen, Selectable zone af title -->
+  <string name="pref_camera_selectablezoneaf_title">Auto-focus zone</string>
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spot metering</string>
+  <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame average</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Selectable advanced features title -->
+  <string name="pref_camera_advanced_features_title">Advanced features</string>
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <string name="pref_camera_advanced_feature_entry_none">None</string>
+  <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Multi-touch Focus</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Manual exposure control entry values -->
+  <string name="pref_camera_manual_exp_title">Manual exposure</string>
+  <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string>
+  <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string>
+  <string name="pref_camera_manual_exp_entry_user_setting">User setting</string>
+  <string name="pref_camera_manual_exp_entry_off">Off</string>
   <!-- Manual white balance entry values -->
+  <string name="pref_camera_manual_wb_title">Manual white balance</string>
+  <string name="pref_camera_manual_wb_entry_color_temperature">Colour temperature</string>
+  <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
+  <string name="pref_camera_manual_wb_entry_off">Off</string>
   <!-- Manual Focus entry values -->
+  <string name="pref_camera_manual_focus_title">Manual focus</string>
+  <string name="pref_camera_manual_focus_entry_scale_mode">Scale mode</string>
+  <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string>
+  <string name="pref_camera_manual_focus_entry_off">Off</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">Instant capture</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Aggressive AEC</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Fast AEC</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Disable</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
+  <string name="pref_camera_zsl_entry_off">Off</string>
+  <string name="pref_camera_zsl_entry_on">On</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR is enabled, Only Auto scene mode is supported</string>
+  <string name="scene_enable_message">HDR is not supported in scene modes other than Auto</string>
   <!-- Settings screen, Video HDR location dialog choices -->
+  <string name="pref_camera_video_hdr_entry_off">Off</string>
+  <string name="pref_camera_video_hdr_entry_on">On</string>
   <!-- Settings screen, CDS location dialog choices -->
+  <string name="pref_camera_cds_entry_off">Off</string>
+  <string name="pref_camera_cds_entry_on">On</string>
+  <string name="pref_camera_cds_entry_auto">Auto</string>
   <!-- Settings screen, video CDS location dialog choices -->
+  <string name="pref_camera_video_cds_entry_off">Off</string>
+  <string name="pref_camera_video_cds_entry_on">On</string>
+  <string name="pref_camera_video_cds_entry_auto">Auto</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Disable</string>
+  <string name="pref_camera_tnr_entry_enable">Enable</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Disable</string>
+  <string name="pref_camera_video_tnr_entry_enable">Enable</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>
   <!-- Settings menu, setting title text for cds mode-->
+  <string name="pref_camera_cds_title">CDS mode</string>
   <!-- Settings menu, setting title text for video cds mode-->
+  <string name="pref_camera_video_cds_title">Video CDS mode</string>
   <!-- Default cds mode setting-->
   <!-- Default video cds mode setting-->
   <!-- Settings menu, setting title text for tnr mode-->
+  <string name="pref_camera_tnr_title">TNR mode</string>
   <!-- Settings menu, setting title text for video tnr mode-->
+  <string name="pref_camera_video_tnr_title">Video TNR mode</string>
   <!-- Default tnr mode setting-->
   <!-- Default video tnr mode setting-->
   <!-- Default face  detection setting. -->
   <!-- Settings screen, Select Face Detection -->
+  <string name="pref_camera_facedetection_title">Face detection</string>
   <!-- Settings menu, Face Detection choices -->
+  <string name="pref_camera_facedetection_entry_off">Off</string>
+  <string name="pref_camera_facedetection_entry_on">On</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
+  <string name="pref_selfie_flash_title">Selfie flash</string>
   <!-- Settings menu, Selfie Flash choices -->
+  <string name="pref_selfie_flash_entry_off">Off</string>
+  <string name="pref_selfie_flash_entry_on">On</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
+  <string name="pref_camera_redeyereduction_title">Red-eye reduction</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Enable</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Disable</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Selfie mirror</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Enable</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Disable</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Shutter sound</string>
+  <string name="pref_camera_shuttersound_entry_enable">Enabled</string>
+  <string name="pref_camera_shuttersound_entry_disable">Disabled</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">High-framerate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
+  <string name="error_app_unsupported_hfr">Slow motion mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
+  <string name="error_app_unsupported_dis">Stabilisation is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HSR mode -->
+  <string name="error_app_unsupported_hsr">High speed mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
+  <string name="error_app_unsupported_hfr_codec">Only H264 video encoding is supported when HFR is ON</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
+  <string name="error_app_unsupported">Unsupported video resolution for this encoder type</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Unsupported video profile</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
+  <string name="error_app_unsupported_raw">Raw picture format is not supported in Zero shutter lag mode. Select 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">On</string>
+  <string name="err_app_unsupport_ae_bracket_code">AE bracketing is not supported yet</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Video snapshot size is lower than video size, capping to video size. Please select a resolution higher or equal to the current video size.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Changing picture size is not supported in Low Power mode, video size snapshot will be taken. Please select Normal Power mode to allow changing picture size.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Only video size snapshot is supported for this resolution.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
+  <string name="pref_camera_hfr_title">High-framerate recording</string>
   <!-- Settings screen, hfr radio button choices -->
+  <string name="pref_camera_hfr_entry_off">Off</string>
+  <string name="pref_camera_hfr_entry_2x">Slow motion 60 FPS</string>
+  <string name="pref_camera_hfr_entry_3x">Slow motion 90 FPS</string>
+  <string name="pref_camera_hfr_entry_4x">Slow motion 120 FPS</string>
+  <string name="pref_camera_hfr_entry_8x">Slow motion 240 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_60">High speed 60 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_90">High speed 90 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_120">High speed 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">High speed 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">Noise reduction</string>
   <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_noise_reduction_entry_off">Off</string>
+  <string name="pref_camera_noise_reduction_entry_fast">Fast</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">High quality</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_see_more_entry_off">Off</string>
+  <string name="pref_camera_see_more_entry_on">On</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
+  <string name="pref_camera_denoise_title">Denoise</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
+  <string name="pref_camera_denoise_entry_off">Off</string>
+  <string name="pref_camera_denoise_entry_on">On</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
+  <string name="pref_camera_iso_title">ISO</string>
   <!-- Settings screen, ISO dialog radio button choices -->
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
   <!-- ISO entry values. Do not translate. -->
   <!-- Settings screen, Anti Banding title -->
+  <string name="pref_camera_antibanding_title">Anti-Banding</string>
   <!-- Default Anti Banding setting. -->
   <!-- Settings screen, Anti Banding entries -->
+  <string name="pref_camera_antibanding_entry_0">Off</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz (Europe)</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
+  <string name="pref_camera_antibanding_entry_3">Auto</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">On</string>
+  <string name="pref_camera_filter_mode_entry_off">Off</string>
   <!-- Settings screen, Select Color effect title -->
+  <string name="pref_camera_coloreffect_title">Colour effect</string>
+  <string name="pref_camera_filter_mode_title">Colour effect</string>
   <!-- Settings screen, Color effect dialog radio button choices -->
+  <string name="pref_camera_coloreffect_entry_none">None</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negative</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
+  <string name="pref_camera_coloreffect_entry_solarize">Solarise</string>
+  <string name="pref_camera_coloreffect_entry_posterize">Posterise</string>
+  <string name="pref_camera_coloreffect_entry_aqua">Aqua</string>
+  <string name="pref_camera_coloreffect_entry_emboss">Emboss</string>
+  <string name="pref_camera_coloreffect_entry_sketch">Sketch</string>
+  <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+  <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
+  <string name="pref_camera_coloreffect_entry_mosaic">Mosaic</string>
+  <string name="pref_camera_coloreffect_entry_redtint">Red tint</string>
+  <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
+  <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
+  <string name="pref_camera_touchafaec_entry_off">Off</string>
+  <string name="pref_camera_touchafaec_entry_on">On</string>
   <!-- Select IS title -->
+  <string name="pref_camera_dis_title">Stabilisation</string>
   <!-- DIS choices -->
+  <string name="pref_camera_dis_entry_off">Off</string>
+  <string name="pref_camera_dis_entry_on">On</string>
   <!-- Select Face Recognition title -->
+  <string name="pref_camera_facerc_title">Face recognition</string>
   <!-- Face Recognition choices -->
+  <string name="pref_camera_facerc_entry_off">Off</string>
+  <string name="pref_camera_facerc_entry_on">On</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_sharpness_entry_level0">Level 0</string>
+  <string name="pref_camera_sharpness_entry_level1">Level 1</string>
+  <string name="pref_camera_sharpness_entry_level2">Level 2 (default)</string>
+  <string name="pref_camera_sharpness_entry_level3">Level 3</string>
+  <string name="pref_camera_sharpness_entry_level4">Level 4</string>
+  <string name="pref_camera_sharpness_entry_level5">Level 5</string>
+  <string name="pref_camera_sharpness_entry_level6">Level 6</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_contrast_entry_level0">Level 0</string>
+  <string name="pref_camera_contrast_entry_level1">Level 1</string>
+  <string name="pref_camera_contrast_entry_level2">Level 2</string>
+  <string name="pref_camera_contrast_entry_level3">Level 3</string>
+  <string name="pref_camera_contrast_entry_level4">Level 4</string>
+  <string name="pref_camera_contrast_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_contrast_entry_level6">Level 6</string>
+  <string name="pref_camera_contrast_entry_level7">Level 7</string>
+  <string name="pref_camera_contrast_entry_level8">Level 8</string>
+  <string name="pref_camera_contrast_entry_level9">Level 9</string>
+  <string name="pref_camera_contrast_entry_level10">Level 10</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_saturation_entry_level0">Level 0</string>
+  <string name="pref_camera_saturation_entry_level1">Level 1</string>
+  <string name="pref_camera_saturation_entry_level2">Level 2</string>
+  <string name="pref_camera_saturation_entry_level3">Level 3</string>
+  <string name="pref_camera_saturation_entry_level4">Level 4</string>
+  <string name="pref_camera_saturation_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_saturation_entry_level6">Level 6</string>
+  <string name="pref_camera_saturation_entry_level7">Level 7</string>
+  <string name="pref_camera_saturation_entry_level8">Level 8</string>
+  <string name="pref_camera_saturation_entry_level9">Level 9</string>
+  <string name="pref_camera_saturation_entry_level10">Level 10</string>
   <!-- Default sharpness setting. Do not translate. -->
   <!-- Settings screen, Select sharpness title -->
+  <string name="pref_camera_sharpness_title">Sharpness</string>
   <!-- Default contrast setting. Do not translate. -->
   <!-- Settings screen, Select contrast title -->
+  <string name="pref_camera_contrast_title">Contrast</string>
   <!-- Default saturation setting. Do not translate. -->
   <!-- Settings screen, Select saturation title -->
+  <string name="pref_camera_saturation_title">Saturation</string>
   <!-- Default picture quality setting. See pref_camera_jpegquality_entryvalues for possible values -->
   <!-- Default Picture format setting. Do not translate. -->
   <!-- Settings screen, Select Picture format title -->
+  <string name="pref_camera_picture_format_title">Picture format</string>
   <!-- Settings screen, picture format dialog radio button choices -->
   <!-- Picture format entry values. Do not translate. -->
   <!-- Settings screen, Picture quality title -->
+  <string name="pref_camera_jpegquality_title">Picture quality</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Low</string>
+  <string name="pref_camera_jpegquality_entry_1">Standard</string>
+  <string name="pref_camera_jpegquality_entry_2">High</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">Enable</string>
+  <string name="pref_camera_histogram_entry_disable">Disable</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
+  <string name="pref_camera_scenedetect_title">Auto scene detection</string>
   <!-- Settings menu, auto scene detection choices -->
+  <string name="pref_camera_scenedetect_entry_off">Off</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">On</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Invalid video-size for time-lapse recording.</string>
   <!-- longshot value -->
+  <string name="pref_camera_longshot_title">Continuous shot</string>
+  <string name="msg_cancel_longshot_for_limited_memory">Running out of memory, cancelling continuous shot</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
+  <string name="flash_aebracket_message">Flash is not supported in AE bracketing mode</string>
   <!-- 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">Enable</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Disable</string>
   <!-- toast message for storage location switch -->
+  <string name="on_switch_save_path_to_sdcard">Internal storage space is not enough, switched storage location to SD card</string>
   <!-- Settings screen, Selectable HDR mode title -->
+  <string name="pref_camera_hdr_mode_title">HDR mode</string>
   <!-- Settings screen, Selectable HDR mode radio button choices -->
+  <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
+  <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
   <!-- Settings screen, Selectable HDR need 1x frame default value -->
   <!-- Settings screen, Selectable HDR need 1x frame title -->
+  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
   <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
   <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
+  <string name="pref_camera_video_rotation_title">Video rotation</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">VIDEO ROTATION</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
+  <string name="pref_camera_video_rotation_entry_0">0 degrees</string>
+  <string name="pref_camera_video_rotation_entry_90">90 degrees</string>
+  <string name="pref_camera_video_rotation_entry_180">180 degrees</string>
+  <string name="pref_camera_video_rotation_entry_270">270 degrees</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+  <string name="map_activity_not_found_err">There is no maps app installed to show the location</string>
   <!-- Continuous shot enable message -->
+  <string name="longshot_enable_message">Advanced features are not supported in continuous shot mode</string>
   <!-- Advanced features enable message -->
+  <string name="advance_feature_enable_msg">Continuous shot is not supported when advanced features are enabled</string>
   <!-- The alas of CameraActivity for gesture operation -->
+  <string name="camera_gesture_title">Launch camera</string>
+  <string name="pref_camera_tsmakeup_title">Beautification</string>
+  <string name="pref_camera_tsmakeup_entry_on">On</string>
+  <string name="pref_camera_tsmakeup_entry_off">Off</string>
+  <string name="pref_camera_tsmakeup_entry_low">Low</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Medium</string>
+  <string name="pref_camera_tsmakeup_entry_high">High</string>
+  <string name="pref_camera_tsmakeup_custom">Custom</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Whiten</string>
+  <string name="pref_camera_tsmakeup_level_clean">Soften</string>
+  <string name="text_tsmakeup_alert_title">Warning</string>
+  <string name="text_tsmakeup_alert_msg">Face detection must be enabled in order to use the beautification feature. Do you want to continue?</string>
+  <string name="text_tsmakeup_alert_continue">Continue</string>
+  <string name="text_tsmakeup_alert_quit">Cancel</string>
+  <string name="text_tsmakeup_beautify_toast">Beautify</string>
+  <string name="all_in_focus">All in focus</string>
+  <string name="refocus_toast">To re-focus last photo, tap here</string>
+  <string name="refocus_prompt_message">With UbiFocus, your camera will take 5 pictures, each time that you press the shutter button. The 5 pictures will be combined into 1 picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string>
+  <string name="camera_thermal_shutdown">Phone overheated, closing camera.</string>
+  <string name="camera_server_died">Media server died, closing camera.</string>
+  <string name="camera_unknown_error">Unknown error, closing camera.</string>
+  <string name="mute_button_desc">Mute button</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
+  <string name="help_menu_scene_mode_1">Select a</string>
+  <string name="help_menu_scene_mode_2">Scene mode</string>
+  <string name="help_menu_scene_mode_3">for better pictures</string>
+  <string name="help_menu_color_filter_1">Apply colour</string>
+  <string name="help_menu_color_filter_2">filters</string>
+  <string name="help_menu_color_filter_3">to</string>
+  <string name="help_menu_color_filter_4">improve pictures</string>
+  <string name="help_menu_beautify_1">Enhance portraits</string>
+  <string name="help_menu_beautify_2">with the</string>
+  <string name="help_menu_beautify_3">Beautify feature</string>
+  <string name="help_menu_switcher_1">Switch</string>
+  <string name="help_menu_switcher_2">between</string>
+  <string name="help_menu_switcher_3">camera, video, and panorama</string>
+  <string name="pref_camera2_camera2_title">Camera2 mode</string>
+  <string name="pref_camera2_camera2_entry_enable">Enable</string>
+  <string name="pref_camera2_camera2_entry_disable">Disable</string>
+  <string name="pref_camera2_mono_only_title">Mono only</string>
+  <string name="pref_camera2_mono_preview_title">Mono preview</string>
+  <string name="pref_camera2_mono_preview_entry_on">On</string>
+  <string name="pref_camera2_mono_preview_entry_off">Off</string>
+  <string name="pref_camera2_clearsight_entry_on">On</string>
+  <string name="pref_camera2_clearsight_entry_off">Off</string>
+  <string name="clearsight_capture_success">ClearSight capture successful</string>
+  <string name="clearsight_capture_fail">ClearSight capture failed</string>
+  <string name="pref_camera2_mpo_title">MPO format</string>
+  <string name="pref_camera2_mpo_entry_on">On</string>
+  <string name="pref_camera2_mpo_entry_off">Off</string>
+  <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_noise_reduction_title">Noise reduction</string>
+  <string name="pref_camera2_noise_reduction_entry_off">Off</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">Fast</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">High quality</string>
+  <string name="pref_camera2_videosnap_title">Auto snapshot size</string>
+  <string name="pref_camera2_videosnap_entry_enable">Enable</string>
+  <string name="pref_camera2_videosnap_entry_disable">Disable</string>
+  <string name="pref_camera2_trackingfocus_title">Tracking focus</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Best picture</string>
+  <string name="bestpicture_done">DONE</string>
+  <string name="bestpicture_at_least_one_picture">At least one picture has to be chosen.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">On</string>
+  <string name="pref_camera2_shutter_sound_entry_off">Off</string>
+  <string name="pref_camera2_shutter_sound_title">Shutter sound</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 5ffe9a0b2..be60c54cf 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -16,85 +16,181 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <string name="app_name">Camera</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+  <string name="video_camera_label">Camcorder</string>
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <string name="set_image">Set picture as</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <string name="delete">Delete</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <plurals name="delete_selection">
+    <item quantity="one">Delete selected item?</item>
+    <item quantity="other">Delete selected items?</item>
+  </plurals>
+  <string name="share">Share</string>
+  <string name="share_panorama">Share panorama</string>
+  <string name="share_as_photo">Share as photo</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <string name="deleted">Deleted</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <string name="undo">UNDO</string>
+  <string name="details">Details</string>
+  <string name="close">Close</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating timestamp of photo or video -->
+  <string name="show_on_map">Show on map</string>
+  <string name="rotate_left">Rotate left</string>
+  <string name="rotate_right">Rotate right</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
+  <string name="edit">Edit</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <string name="crop_action">Crop</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <string name="trim_action">Trim</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <string name="set_as">Set as</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
+  <string name="video_err">Can\'t play video.</string>
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
+  <string name="crop_saved">
+        Cropped image saved to <xliff:g id="folder_name">%s</xliff:g>.</string>
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <string name="title">Title</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <string name="description">Description</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="time">Time</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <string name="location">Location</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
+  <string name="path">Path</string>
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <string name="width">Width</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <string name="height">Height</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <string name="orientation">Orientation</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <string name="duration">Duration</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
+  <string name="mimetype">MIME type</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
+  <string name="file_size">File size</string>
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
+  <string name="maker">Maker</string>
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
+  <string name="model">Model</string>
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
+  <string name="flash">Flash</string>
   <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
+  <string name="aperture">Aperture</string>
   <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
+  <string name="focal_length">Focal Length</string>
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
+  <string name="white_balance">White balance</string>
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="exposure_time">Exposure time</string>
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
+  <string name="unit_mm">mm</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
+  <string name="manual">Manual</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
+  <string name="auto">Auto</string>
   <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
+  <string name="flash_on">Flash fired</string>
   <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
+  <string name="flash_off">No flash</string>
   <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
+  <string name="unknown">Unknown</string>
   <!-- Toast message shown after we try to make a local album available offline
          [CHAR LIMIT=150] -->
+  <string name="try_to_set_local_album_available_offline">
+        This item is stored locally and available offline.</string>
   <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
+  <string name="please_wait">Please wait</string>
   <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
+  <string name="rendering_photo_sphere">Rendering photo sphere</string>
   <!-- title for the dialog showing the error of camera hardware -->
+  <string name="camera_error_title">Camera error</string>
   <!-- message for the dialog showing the error of camera hardware -->
+  <string name="cannot_connect_camera">Can\'t connect to the camera.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
+  <string name="camera_disabled">Camera has been disabled because of security policies.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">The app does not have critical permissions needed to run. Please check your permissions settings.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Dismiss</string>
   <!-- alert to the user to wait for some operation to complete -->
+  <string name="wait">Please wait\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
+  <string name="no_storage" product="default">Insert an SD card before using the camera.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
+  <string name="preparing_sd" product="default">Preparing SD card\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <string name="access_sd_fail" product="default">Couldn\'t access SD card.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+  <string name="time_lapse_title">Time lapse recording</string>
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+  <string name="capturing">Capturing</string>
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <string name="pref_camera_id_title">Choose camera</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">Back</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_front">Front</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">GPS location</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">LOCATION</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
+  <string name="pref_camera_timer_title">Countdown timer</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">1 second</item>
+    <item quantity="other">%d seconds</item>
+  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
+  <string name="pref_camera_timer_sound_title">Beep during countdown</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Storage</string>
+  <string name="pref_camera_savepath_entry_0">Phone</string>
+  <string name="pref_camera_savepath_entry_1">SD Card</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <string name="setting_off">Off</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
+  <string name="setting_on">On</string>
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
   <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
+  <string name="pref_video_quality_title">Video quality</string>
   <!-- The default quality value is NULL -->
   <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
@@ -107,181 +203,354 @@
   <!-- Video quality setting entry. Videos will be recorded in 2K quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
+  <string name="pref_video_time_lapse_frame_interval_title">Time lapse</string>
   <!-- Settings screen, Camera setting category title -->
+  <string name="pref_camera_settings_category">Camera settings</string>
   <!-- Settings screen, Camcorder setting category title -->
+  <string name="pref_camcorder_settings_category">Camcorder settings</string>
   <!-- Settings screen, Picture size title -->
+  <string name="pref_camera_picturesize_title">Picture size</string>
   <!-- Settings screen, Focus mode title -->
+  <string name="pref_camera_focusmode_title">Focus mode</string>
   <!-- Settings screen, Focus mode dialog radio button choices -->
+  <string name="pref_camera_focusmode_entry_auto">Auto</string>
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_infinity">Infinity</string>
   <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_macro">Macro</string>
   <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_focusmode_label_auto">AUTO</string>
+  <string name="pref_camera_focusmode_label_infinity">INFINITY</string>
+  <string name="pref_camera_focusmode_label_macro">MACRO</string>
   <!-- Default flash mode setting.-->
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
+  <string name="pref_camera_flashmode_title">Flash</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_auto">Auto</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_on">On</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_off">Off</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label_auto">FLASH AUTO</string>
+  <string name="pref_camera_flashmode_label_on">FLASH ON</string>
+  <string name="pref_camera_flashmode_label_off">FLASH OFF</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
+  <string name="pref_camera_whitebalance_title">White balance</string>
   <!-- Menu, white balance label -->
+  <string name="pref_camera_whitebalance_label">WHITE BALANCE</string>
   <!-- Settings screen, White balance dialog radio button choices -->
+  <string name="pref_camera_whitebalance_entry_auto">Auto</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">Incandescent</string>
+  <string name="pref_camera_whitebalance_entry_daylight">Daylight</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescent</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">Cloudy</string>
   <!-- Menu, White balance labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_whitebalance_label_auto">AUTO</string>
+  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENT</string>
+  <string name="pref_camera_whitebalance_label_daylight">DAYLIGHT</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENT</string>
+  <string name="pref_camera_whitebalance_label_cloudy">CLOUDY</string>
   <!-- Default scene mode setting. -->
   <!-- Settings screen, Select Scene mode -->
+  <string name="pref_camera_scenemode_title">Scene mode</string>
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_auto">Auto</string>
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_action">Action</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_night">Night</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_sunset">Sunset</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_party">Party</string>
   <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_auto">NONE</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_action">ACTION</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_night">NIGHT</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_sunset">SUNSET</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_party">PARTY</string>
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_off">TIMER OFF</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_one">1 SECOND</string>
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_three">3 SECONDS</string>
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 SECONDS</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_fifteen">15 SECONDS</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">Not selectable in scene mode.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">HDR will disable continuous shot.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Advanced capture will disable continuous shot.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
   <string name="video_quality_4k_disable_IS">4k video quality will disable image stabilisation.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">High quality noise reduction will disable CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">High quality noise reduction will disable TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore will disable TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore will disable noise reduction.</string>
   <!-- Exposure settings in preference -->
+  <string name="pref_exposure_title">Exposure</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <string name="pref_exposure_label">EXPOSURE</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
+  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_back">FRONT CAMERA</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_front">BACK CAMERA</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <string name="spaceIsLow_content" product="default">Your SD card is running out of space. Change the quality setting or delete some images or other files.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
+  <string name="video_reach_size_limit">Size limit reached.</string>
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <string name="pano_too_fast_prompt">Too fast</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <string name="pano_dialog_prepare_preview">Preparing panorama</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
+  <string name="pano_dialog_panorama_failed">Couldn\'t save panorama.</string>
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <string name="pano_dialog_title">Panorama</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <string name="pano_capture_indication">Capturing panorama</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <string name="pano_dialog_waiting_previous">Waiting for previous panorama</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <string name="pano_review_saving_indication_str">Saving\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
+  <string name="pano_review_rendering">Rendering panorama</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <string name="tap_to_focus">Touch to focus.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
+  <string name="pref_video_effect_title">Effects</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
+  <string name="effect_none">None</string>
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_squeeze">Squeeze</string>
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_eyes">Big eyes</string>
   <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_mouth">Big mouth</string>
   <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_mouth">Small mouth</string>
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_nose">Big nose</string>
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_eyes">Small eyes</string>
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_space">In space</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_sunset">Sunset</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_gallery">Your video</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <string name="video_snapshot_hint">Touch to take photo while recording.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
+  <string name="video_recording_started">Video recording has started.</string>
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <string name="video_recording_stopped">Video recording has stopped.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+  <string name="clear_effects">Clear effects</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+  <string name="effect_silly_faces">SILLY FACES</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">BACKGROUND</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_shutter_button">Shutter</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_menu_button">Menu button</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_mode_picker">Camera, video, or panorama selector</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_check_box">%1$s check box</string>
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_camera">Switch to photo</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_video">Switch to video</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_panorama">Switch to panorama</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_photo_sphere">Switch to Photo Sphere</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_gcam">Switch to high quality</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_cancel">Review cancel</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_ok">Review done</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_retake">Review retake</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_on">ON</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_off">OFF</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_off">Off</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1000">1 second</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2000">2 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2500">2.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3000">3 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_4000">4 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5000">5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_6000">6 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_15000">15 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_24000">24 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">0.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minute</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 hours</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_seconds">seconds</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_minutes">minutes</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_hours">hours</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_interval_set">Done</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <string name="set_time_interval">Set Time Interval</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
+  <string name="set_time_interval_help">Time lapse feature is off. Turn it on to set time interval.</string>
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <string name="set_duration">Set duration in seconds</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <string name="count_down_title_text">Counting down to take a photo</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
+  <string name="remember_location_title">Remember photo locations?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
+  <string name="remember_location_prompt">Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_no">No, thanks</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_yes">Yes</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
+  <string name="camera_menu_more_label">MORE OPTIONS</string>
   <!-- settings label [CHAR LIMIT=50] -->
+  <string name="camera_menu_settings_label">SETTINGS</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
+  <string name="create_tiny_planet">Create Tiny Planet</string>
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
+  <string name="saving_tiny_planet">Saving Tiny Planet &#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_zoom">Zoom</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_rotate">Rotate</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <string name="crop_save">Save</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <string name="cannot_load_image">Cannot load the image!</string>
   <!-- Label for album filmstrip button -->
+  <string name="switch_photo_filmstrip">Filmstrip view</string>
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <string name="setting_wallpaper">Setting wallpaper</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d left</string>
+  <string name="makeup_video_size_limit">Makeup works only under VGA size in video recording.</string>
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index b446dc92e..4ef69825f 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -71,12 +71,38 @@
   <string name="pref_camera_focusmode_entry_continuous">Continuous</string>
   <string name="pref_camera_focusmode_entry_mw_continuous">Continuous (MW)</string>
   <string name="pref_camera_focusmode_entry_extended">Extended</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Face detect</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Face priority</string>
+  <string name="pref_camera_focusmode_entry_fixed">Fixed</string>
+  <string name="pref_camera_focusmode_entry_normal">Normal</string>
+  <string name="pref_camera_focusmode_entry_portrait">Portrait</string>
+  <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
   <!-- Color effects -->
+  <string name="pref_camera_coloreffect_entry_washed">Washed</string>
+  <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage warm</string>
+  <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage cold</string>
+  <string name="pref_camera_coloreffect_entry_point_blue">Point blue</string>
+  <string name="pref_camera_coloreffect_entry_point_green">Point green</string>
+  <string name="pref_camera_coloreffect_entry_point_red_yellow">Point red-yellow</string>
   <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonise</string>
   <!-- Red eye flash mode title -->
+  <string name="pref_camera_flashmode_entry_redeye">Red eye</string>
+  <string name="pref_camera_flashmode_label_redeye">RED EYE</string>
   <!-- Power shutter -->
+  <string name="pref_camera_power_shutter_title">Power shutter</string>
   <!-- Max brightness -->
+  <string name="pref_camera_max_brightness_title">Bright screen</string>
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_title">Touch focus duration</string>
+  <string name="pref_camera_focustime_entry_0">0s</string>
+  <string name="pref_camera_focustime_entry_3">3s</string>
+  <string name="pref_camera_focustime_entry_5">5s</string>
+  <string name="pref_camera_focustime_entry_10">10s</string>
+  <string name="pref_camera_focustime_entry_infinite">Infinite</string>
   <!-- Shutter speed -->
+  <string name="pref_camera_shutter_speed_title">Shutter speed</string>
+  <string name="auto_hdr_enabled">Auto HDR enabled</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">You have enabled advanced camera options</string>
+  <string name="developer_menu_disabled">You have disabled advanced camera options</string>
 </resources>
diff --git a/res/values-en-rGB/qcomstrings.xml b/res/values-en-rGB/qcomstrings.xml
index 00aab96eb..cbb368bfc 100644
--- a/res/values-en-rGB/qcomstrings.xml
+++ b/res/values-en-rGB/qcomstrings.xml
@@ -76,135 +76,380 @@
   <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Multi-touch Focus</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Manual exposure control entry values -->
+  <string name="pref_camera_manual_exp_title">Manual exposure</string>
+  <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string>
+  <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string>
+  <string name="pref_camera_manual_exp_entry_user_setting">User setting</string>
+  <string name="pref_camera_manual_exp_entry_off">Off</string>
   <!-- Manual white balance entry values -->
+  <string name="pref_camera_manual_wb_title">Manual white balance</string>
   <string name="pref_camera_manual_wb_entry_color_temperature">Colour temperature</string>
+  <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
+  <string name="pref_camera_manual_wb_entry_off">Off</string>
   <!-- Manual Focus entry values -->
+  <string name="pref_camera_manual_focus_title">Manual focus</string>
+  <string name="pref_camera_manual_focus_entry_scale_mode">Scale mode</string>
+  <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string>
+  <string name="pref_camera_manual_focus_entry_off">Off</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">Instant capture</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Aggressive AEC</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Fast AEC</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Disable</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
+  <string name="pref_camera_zsl_entry_off">Off</string>
+  <string name="pref_camera_zsl_entry_on">On</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR is enabled, only Auto scene mode is supported</string>
+  <string name="scene_enable_message">HDR is not supported in the scene mode other than Auto</string>
   <!-- Settings screen, Video HDR location dialog choices -->
+  <string name="pref_camera_video_hdr_entry_off">Off</string>
+  <string name="pref_camera_video_hdr_entry_on">On</string>
   <!-- Settings screen, CDS location dialog choices -->
+  <string name="pref_camera_cds_entry_off">Off</string>
+  <string name="pref_camera_cds_entry_on">On</string>
+  <string name="pref_camera_cds_entry_auto">Auto</string>
   <!-- Settings screen, video CDS location dialog choices -->
+  <string name="pref_camera_video_cds_entry_off">Off</string>
+  <string name="pref_camera_video_cds_entry_on">On</string>
+  <string name="pref_camera_video_cds_entry_auto">Auto</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Disable</string>
+  <string name="pref_camera_tnr_entry_enable">Enable</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Disable</string>
+  <string name="pref_camera_video_tnr_entry_enable">Enable</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>
   <!-- Settings menu, setting title text for cds mode-->
+  <string name="pref_camera_cds_title">CDS mode</string>
   <!-- Settings menu, setting title text for video cds mode-->
+  <string name="pref_camera_video_cds_title">Video CDS mode</string>
   <!-- Default cds mode setting-->
   <!-- Default video cds mode setting-->
   <!-- Settings menu, setting title text for tnr mode-->
+  <string name="pref_camera_tnr_title">TNR mode</string>
   <!-- Settings menu, setting title text for video tnr mode-->
+  <string name="pref_camera_video_tnr_title">Video TNR mode</string>
   <!-- Default tnr mode setting-->
   <!-- Default video tnr mode setting-->
   <!-- Default face  detection setting. -->
   <!-- Settings screen, Select Face Detection -->
+  <string name="pref_camera_facedetection_title">Face detection</string>
   <!-- Settings menu, Face Detection choices -->
+  <string name="pref_camera_facedetection_entry_off">Off</string>
+  <string name="pref_camera_facedetection_entry_on">On</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
+  <string name="pref_selfie_flash_title">Selfie flash</string>
   <!-- Settings menu, Selfie Flash choices -->
+  <string name="pref_selfie_flash_entry_off">Off</string>
+  <string name="pref_selfie_flash_entry_on">On</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
+  <string name="pref_camera_redeyereduction_title">Red eye reduction</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Enable</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Disable</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Selfie mirror</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Enable</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Disable</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Shutter sound</string>
+  <string name="pref_camera_shuttersound_entry_enable">Enabled</string>
+  <string name="pref_camera_shuttersound_entry_disable">Disabled</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">High-frame rate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
+  <string name="error_app_unsupported_hfr">Slow motion mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
+  <string name="error_app_unsupported_dis">Stabilisation is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HSR mode -->
+  <string name="error_app_unsupported_hsr">High speed mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
+  <string name="error_app_unsupported_hfr_codec">Only H264 video encoding is supported when HFR is ON</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
+  <string name="error_app_unsupported">Unsupported video resolution for this encoder type</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Unsupported video profile</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
+  <string name="error_app_unsupported_raw">Raw picture format is not supported in Zero shutter lag mode. Select 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">On</string>
+  <string name="err_app_unsupport_ae_bracket_code">AE bracketing is not supported yet</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
   <string name="snapshot_lower_than_video">Video snapshot size is lower than video size, capping to video size. Please select a resolution higher or equal to the current video size.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
   <string name="snapshotsize_low_powermode">Changing picture size is not supported in Low Power mode, video size snapshot will be taken. Please select Normal Power mode to allow changing picture size.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Only video size snapshot is supported for this resolution.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
+  <string name="pref_camera_hfr_title">High-framerate recording</string>
   <!-- Settings screen, hfr radio button choices -->
+  <string name="pref_camera_hfr_entry_off">Off</string>
+  <string name="pref_camera_hfr_entry_2x">Slow motion 60 FPS</string>
+  <string name="pref_camera_hfr_entry_3x">Slow motion 90 FPS</string>
+  <string name="pref_camera_hfr_entry_4x">Slow motion 120 FPS</string>
+  <string name="pref_camera_hfr_entry_8x">Slow motion 240 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_60">High speed 60 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_90">High speed 90 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_120">High speed 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">High speed 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">Noise reduction</string>
   <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_noise_reduction_entry_off">Off</string>
+  <string name="pref_camera_noise_reduction_entry_fast">Fast</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">High quality</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_see_more_entry_off">Off</string>
+  <string name="pref_camera_see_more_entry_on">On</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
+  <string name="pref_camera_denoise_title">Denoise</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
+  <string name="pref_camera_denoise_entry_off">Off</string>
+  <string name="pref_camera_denoise_entry_on">On</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
+  <string name="pref_camera_iso_title">ISO</string>
   <!-- Settings screen, ISO dialog radio button choices -->
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
   <!-- ISO entry values. Do not translate. -->
   <!-- Settings screen, Anti Banding title -->
+  <string name="pref_camera_antibanding_title">Antibanding</string>
   <!-- Default Anti Banding setting. -->
   <!-- Settings screen, Anti Banding entries -->
+  <string name="pref_camera_antibanding_entry_0">Off</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz (Europe)</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
   <string name="pref_camera_antibanding_entry_3">Auto</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">On</string>
+  <string name="pref_camera_filter_mode_entry_off">Off</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Colour effect</string>
   <string name="pref_camera_filter_mode_title">Colour effect</string>
   <!-- Settings screen, Color effect dialog radio button choices -->
+  <string name="pref_camera_coloreffect_entry_none">None</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negative</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
   <string name="pref_camera_coloreffect_entry_solarize">Solarise</string>
   <string name="pref_camera_coloreffect_entry_posterize">Posterise</string>
+  <string name="pref_camera_coloreffect_entry_aqua">Aqua</string>
+  <string name="pref_camera_coloreffect_entry_emboss">Emboss</string>
+  <string name="pref_camera_coloreffect_entry_sketch">Sketch</string>
+  <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+  <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
+  <string name="pref_camera_coloreffect_entry_mosaic">Mosaic</string>
+  <string name="pref_camera_coloreffect_entry_redtint">Red tint</string>
+  <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
+  <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
+  <string name="pref_camera_touchafaec_entry_off">Off</string>
+  <string name="pref_camera_touchafaec_entry_on">On</string>
   <!-- Select IS title -->
+  <string name="pref_camera_dis_title">Stabilisation</string>
   <!-- DIS choices -->
+  <string name="pref_camera_dis_entry_off">Off</string>
+  <string name="pref_camera_dis_entry_on">On</string>
   <!-- Select Face Recognition title -->
+  <string name="pref_camera_facerc_title">Face recognition</string>
   <!-- Face Recognition choices -->
+  <string name="pref_camera_facerc_entry_off">Off</string>
+  <string name="pref_camera_facerc_entry_on">On</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_sharpness_entry_level0">Level 0</string>
+  <string name="pref_camera_sharpness_entry_level1">Level 1</string>
+  <string name="pref_camera_sharpness_entry_level2">Level 2 (default)</string>
+  <string name="pref_camera_sharpness_entry_level3">Level 3</string>
+  <string name="pref_camera_sharpness_entry_level4">Level 4</string>
+  <string name="pref_camera_sharpness_entry_level5">Level 5</string>
+  <string name="pref_camera_sharpness_entry_level6">Level 6</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_contrast_entry_level0">Level 0</string>
+  <string name="pref_camera_contrast_entry_level1">Level 1</string>
+  <string name="pref_camera_contrast_entry_level2">Level 2</string>
+  <string name="pref_camera_contrast_entry_level3">Level 3</string>
+  <string name="pref_camera_contrast_entry_level4">Level 4</string>
+  <string name="pref_camera_contrast_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_contrast_entry_level6">Level 6</string>
+  <string name="pref_camera_contrast_entry_level7">Level 7</string>
+  <string name="pref_camera_contrast_entry_level8">Level 8</string>
+  <string name="pref_camera_contrast_entry_level9">Level 9</string>
+  <string name="pref_camera_contrast_entry_level10">Level 10</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_saturation_entry_level0">Level 0</string>
+  <string name="pref_camera_saturation_entry_level1">Level 1</string>
+  <string name="pref_camera_saturation_entry_level2">Level 2</string>
+  <string name="pref_camera_saturation_entry_level3">Level 3</string>
+  <string name="pref_camera_saturation_entry_level4">Level 4</string>
+  <string name="pref_camera_saturation_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_saturation_entry_level6">Level 6</string>
+  <string name="pref_camera_saturation_entry_level7">Level 7</string>
+  <string name="pref_camera_saturation_entry_level8">Level 8</string>
+  <string name="pref_camera_saturation_entry_level9">Level 9</string>
+  <string name="pref_camera_saturation_entry_level10">Level 10</string>
   <!-- Default sharpness setting. Do not translate. -->
   <!-- Settings screen, Select sharpness title -->
+  <string name="pref_camera_sharpness_title">Sharpness</string>
   <!-- Default contrast setting. Do not translate. -->
   <!-- Settings screen, Select contrast title -->
+  <string name="pref_camera_contrast_title">Contrast</string>
   <!-- Default saturation setting. Do not translate. -->
   <!-- Settings screen, Select saturation title -->
+  <string name="pref_camera_saturation_title">Saturation</string>
   <!-- Default picture quality setting. See pref_camera_jpegquality_entryvalues for possible values -->
   <!-- Default Picture format setting. Do not translate. -->
   <!-- Settings screen, Select Picture format title -->
+  <string name="pref_camera_picture_format_title">Picture format</string>
   <!-- Settings screen, picture format dialog radio button choices -->
   <!-- Picture format entry values. Do not translate. -->
   <!-- Settings screen, Picture quality title -->
+  <string name="pref_camera_jpegquality_title">Picture quality</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Low</string>
+  <string name="pref_camera_jpegquality_entry_1">Standard</string>
+  <string name="pref_camera_jpegquality_entry_2">High</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">Enable</string>
+  <string name="pref_camera_histogram_entry_disable">Disable</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
+  <string name="pref_camera_scenedetect_title">Auto scene detection</string>
   <!-- Settings menu, auto scene detection choices -->
+  <string name="pref_camera_scenedetect_entry_off">Off</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">On</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
   <string name="time_lapse_error">Invalid video-size for time-lapse recording.</string>
   <!-- longshot value -->
+  <string name="pref_camera_longshot_title">Continuous shot</string>
+  <string name="msg_cancel_longshot_for_limited_memory">Running out of memory, cancelling continuous shot</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
+  <string name="flash_aebracket_message">Flash is not supported in AE bracketing mode</string>
   <!-- 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">Enable</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Disable</string>
   <!-- toast message for storage location switch -->
+  <string name="on_switch_save_path_to_sdcard">Internal storage space is not enough, switched storage location to SD card</string>
   <!-- Settings screen, Selectable HDR mode title -->
+  <string name="pref_camera_hdr_mode_title">HDR mode</string>
   <!-- Settings screen, Selectable HDR mode radio button choices -->
+  <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
+  <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
   <!-- Settings screen, Selectable HDR need 1x frame default value -->
   <!-- Settings screen, Selectable HDR need 1x frame title -->
+  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
   <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
   <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
+  <string name="pref_camera_video_rotation_title">Video rotation</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">VIDEO ROTATION</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
+  <string name="pref_camera_video_rotation_entry_0">0 degrees</string>
+  <string name="pref_camera_video_rotation_entry_90">90 degrees</string>
+  <string name="pref_camera_video_rotation_entry_180">180 degrees</string>
+  <string name="pref_camera_video_rotation_entry_270">270 degrees</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+  <string name="map_activity_not_found_err">There is no maps app installed to show the location</string>
   <!-- Continuous shot enable message -->
+  <string name="longshot_enable_message">Advanced features are not supported in continuous shot mode</string>
   <!-- Advanced features enable message -->
+  <string name="advance_feature_enable_msg">Continuous shot is not supported when advanced features are enabled</string>
   <!-- The alas of CameraActivity for gesture operation -->
+  <string name="camera_gesture_title">Launch camera</string>
+  <string name="pref_camera_tsmakeup_title">Beautification</string>
+  <string name="pref_camera_tsmakeup_entry_on">On</string>
+  <string name="pref_camera_tsmakeup_entry_off">Off</string>
+  <string name="pref_camera_tsmakeup_entry_low">Low</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Medium</string>
+  <string name="pref_camera_tsmakeup_entry_high">High</string>
+  <string name="pref_camera_tsmakeup_custom">Custom</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Whiten</string>
+  <string name="pref_camera_tsmakeup_level_clean">Soften</string>
+  <string name="text_tsmakeup_alert_title">Warning</string>
+  <string name="text_tsmakeup_alert_msg">Face detection must be enabled in order to use the beautification feature. Do you want to continue?</string>
+  <string name="text_tsmakeup_alert_continue">Continue</string>
+  <string name="text_tsmakeup_alert_quit">Cancel</string>
+  <string name="text_tsmakeup_beautify_toast">Beautify</string>
+  <string name="all_in_focus">All in focus</string>
+  <string name="refocus_toast">To re-focus last photo, tap here</string>
+  <string name="refocus_prompt_message">With UbiFocus, your camera will take 5 pictures, each time that you press the shutter button. The 5 pictures will be combined into 1 picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string>
+  <string name="camera_thermal_shutdown">Phone overheated, closing camera.</string>
+  <string name="camera_server_died">Media server died, closing camera.</string>
+  <string name="camera_unknown_error">Unknown error, closing camera.</string>
+  <string name="mute_button_desc">Mute button</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
+  <string name="help_menu_scene_mode_1">Select a</string>
+  <string name="help_menu_scene_mode_2">Scene mode</string>
+  <string name="help_menu_scene_mode_3">for better pictures</string>
   <string name="help_menu_color_filter_1">Apply colour</string>
+  <string name="help_menu_color_filter_2">filters</string>
+  <string name="help_menu_color_filter_3">to</string>
+  <string name="help_menu_color_filter_4">improve pictures</string>
+  <string name="help_menu_beautify_1">Enhance portraits</string>
+  <string name="help_menu_beautify_2">with the</string>
+  <string name="help_menu_beautify_3">Beautify feature</string>
+  <string name="help_menu_switcher_1">Switch</string>
+  <string name="help_menu_switcher_2">between</string>
+  <string name="help_menu_switcher_3">camera, video, and panorama</string>
+  <string name="pref_camera2_camera2_title">Camera2 mode</string>
+  <string name="pref_camera2_camera2_entry_enable">Enable</string>
+  <string name="pref_camera2_camera2_entry_disable">Disable</string>
+  <string name="pref_camera2_mono_only_title">Mono only</string>
+  <string name="pref_camera2_mono_preview_title">Mono preview</string>
+  <string name="pref_camera2_mono_preview_entry_on">On</string>
+  <string name="pref_camera2_mono_preview_entry_off">Off</string>
+  <string name="pref_camera2_clearsight_entry_on">On</string>
+  <string name="pref_camera2_clearsight_entry_off">Off</string>
+  <string name="clearsight_capture_success">ClearSight capture successful</string>
+  <string name="clearsight_capture_fail">ClearSight capture failed</string>
+  <string name="pref_camera2_mpo_title">MPO format</string>
+  <string name="pref_camera2_mpo_entry_on">On</string>
+  <string name="pref_camera2_mpo_entry_off">Off</string>
+  <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_noise_reduction_title">Noise reduction</string>
+  <string name="pref_camera2_noise_reduction_entry_off">Off</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">Fast</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">High quality</string>
+  <string name="pref_camera2_videosnap_title">Auto snapshot size</string>
+  <string name="pref_camera2_videosnap_entry_enable">Enable</string>
+  <string name="pref_camera2_videosnap_entry_disable">Disable</string>
+  <string name="pref_camera2_trackingfocus_title">Tracking focus</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Best picture</string>
+  <string name="bestpicture_done">DONE</string>
+  <string name="bestpicture_at_least_one_picture">At least one picture has to be chosen.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">On</string>
+  <string name="pref_camera2_shutter_sound_entry_off">Off</string>
+  <string name="pref_camera2_shutter_sound_title">Shutter sound</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8c61ad2c5..0d910a120 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -139,30 +139,58 @@
   <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
   <string name="rendering_photo_sphere">Rendering photo sphere</string>
   <!-- title for the dialog showing the error of camera hardware -->
+  <string name="camera_error_title">Camera error</string>
   <!-- message for the dialog showing the error of camera hardware -->
+  <string name="cannot_connect_camera">Can\'t connect to the camera.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
+  <string name="camera_disabled">Camera has been disabled because of security policies.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">The app does not have critical permissions needed to run. Please check your permissions settings.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Dismiss</string>
   <!-- alert to the user to wait for some operation to complete -->
+  <string name="wait">Please wait\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
+  <string name="no_storage" product="default">Insert an SD card before using the camera.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
+  <string name="preparing_sd" product="default">Preparing SD card\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <string name="access_sd_fail" product="default">Couldn\'t access SD card.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+  <string name="time_lapse_title">Time lapse recording</string>
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+  <string name="capturing">Capturing</string>
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <string name="pref_camera_id_title">Choose camera</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">Back</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_front">Front</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">GPS location</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">LOCATION</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
+  <string name="pref_camera_timer_title">Countdown timer</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">1 second</item>
+    <item quantity="other">%d seconds</item>
+  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
+  <string name="pref_camera_timer_sound_title">Beep during countdown</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Storage</string>
+  <string name="pref_camera_savepath_entry_0">Phone</string>
+  <string name="pref_camera_savepath_entry_1">SD Card</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <string name="setting_off">Off</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
+  <string name="setting_on">On</string>
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
   <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
+  <string name="pref_video_quality_title">Video quality</string>
   <!-- The default quality value is NULL -->
   <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
@@ -175,185 +203,354 @@
   <!-- Video quality setting entry. Videos will be recorded in 2K quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
+  <string name="pref_video_time_lapse_frame_interval_title">Time lapse</string>
   <!-- Settings screen, Camera setting category title -->
+  <string name="pref_camera_settings_category">Camera settings</string>
   <!-- Settings screen, Camcorder setting category title -->
+  <string name="pref_camcorder_settings_category">Camcorder settings</string>
   <!-- Settings screen, Picture size title -->
   <string name="pref_camera_picturesize_title">Picture size</string>
   <!-- Settings screen, Focus mode title -->
+  <string name="pref_camera_focusmode_title">Focus mode</string>
   <!-- Settings screen, Focus mode dialog radio button choices -->
+  <string name="pref_camera_focusmode_entry_auto">Auto</string>
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_infinity">Infinity</string>
   <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_macro">Macro</string>
   <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_focusmode_label_auto">AUTO</string>
+  <string name="pref_camera_focusmode_label_infinity">INFINITY</string>
+  <string name="pref_camera_focusmode_label_macro">MACRO</string>
   <!-- Default flash mode setting.-->
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
   <string name="pref_camera_flashmode_title">Flash</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_auto">Auto</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_on">On</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_off">Off</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label_auto">FLASH AUTO</string>
+  <string name="pref_camera_flashmode_label_on">FLASH ON</string>
+  <string name="pref_camera_flashmode_label_off">FLASH OFF</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
+  <string name="pref_camera_whitebalance_title">White balance</string>
   <!-- Menu, white balance label -->
+  <string name="pref_camera_whitebalance_label">WHITE BALANCE</string>
   <!-- Settings screen, White balance dialog radio button choices -->
+  <string name="pref_camera_whitebalance_entry_auto">Auto</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">Incandescent</string>
+  <string name="pref_camera_whitebalance_entry_daylight">Daylight</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescent</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">Cloudy</string>
   <!-- Menu, White balance labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_whitebalance_label_auto">AUTO</string>
+  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENT</string>
+  <string name="pref_camera_whitebalance_label_daylight">DAYLIGHT</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENT</string>
+  <string name="pref_camera_whitebalance_label_cloudy">CLOUDY</string>
   <!-- Default scene mode setting. -->
   <!-- Settings screen, Select Scene mode -->
+  <string name="pref_camera_scenemode_title">Scene mode</string>
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_auto">Auto</string>
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_action">Action</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_night">Night</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_sunset">Sunset</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_party">Party</string>
   <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_auto">NONE</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_action">ACTION</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_night">NIGHT</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_sunset">SUNSET</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_party">PARTY</string>
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_off">TIMER OFF</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_one">1 SECOND</string>
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_three">3 SECONDS</string>
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 SECONDS</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_fifteen">15 SECONDS</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">Not selectable in scene mode.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">HDR will disable continuous shot.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Advanced capture will disable continuous shot.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">4k video quality will disable image stabilisation.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">High quality noise reduction will disable CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">High quality noise reduction will disable TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore will disable TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore will disable noise reduction.</string>
   <!-- Exposure settings in preference -->
+  <string name="pref_exposure_title">Exposure</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <string name="pref_exposure_label">EXPOSURE</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
+  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_back">FRONT CAMERA</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_front">BACK CAMERA</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <string name="spaceIsLow_content" product="default">Your SD card is running out of space. Change the quality setting or delete some images or other files.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
   <string name="video_reach_size_limit">Size limit reached.</string>
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <string name="pano_too_fast_prompt">Too fast</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <string name="pano_dialog_prepare_preview">Preparing panorama</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
+  <string name="pano_dialog_panorama_failed">Couldn\'t save panorama.</string>
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <string name="pano_dialog_title">Panorama</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <string name="pano_capture_indication">Capturing panorama</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <string name="pano_dialog_waiting_previous">Waiting for previous panorama</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <string name="pano_review_saving_indication_str">Saving\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
+  <string name="pano_review_rendering">Rendering panorama</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <string name="tap_to_focus">Touch to focus.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
+  <string name="pref_video_effect_title">Effects</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
+  <string name="effect_none">None</string>
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_squeeze">Squeeze</string>
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_eyes">Big eyes</string>
   <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_mouth">Big mouth</string>
   <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_mouth">Small mouth</string>
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_nose">Big nose</string>
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_eyes">Small eyes</string>
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_space">In space</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_sunset">Sunset</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_gallery">Your video</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <string name="video_snapshot_hint">Touch to take photo while recording.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
+  <string name="video_recording_started">Video recording has started.</string>
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <string name="video_recording_stopped">Video recording has stopped.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+  <string name="clear_effects">Clear effects</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+  <string name="effect_silly_faces">SILLY FACES</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">BACKGROUND</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_shutter_button">Shutter</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_menu_button">Menu button</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_mode_picker">Camera, video or panorama selector</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_check_box">%1$s check box</string>
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_camera">Switch to photo</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_video">Switch to video</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_panorama">Switch to panorama</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_photo_sphere">Switch to Photo Sphere</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_gcam">Switch to high quality</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
   <string name="accessibility_review_cancel">Review cancel</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_ok">Review done</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_retake">Review retake</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_on">ON</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_off">OFF</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_off">Off</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1000">1 second</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2000">2 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2500">2.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3000">3 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_4000">4 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5000">5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_6000">6 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_15000">15 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_24000">24 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">30 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minute</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">30 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 hours</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_seconds">seconds</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_minutes">minutes</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_hours">hours</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_interval_set">Done</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <string name="set_time_interval">Set Time Interval</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
+  <string name="set_time_interval_help">Time lapse feature is off. Turn it on to set time interval.</string>
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <string name="set_duration">Set duration in seconds</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <string name="count_down_title_text">Counting down to take a photo</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
+  <string name="remember_location_title">Remember photo locations?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
+  <string name="remember_location_prompt">Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_no">No thanks</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_yes">Yes</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
+  <string name="camera_menu_more_label">MORE OPTIONS</string>
   <!-- settings label [CHAR LIMIT=50] -->
+  <string name="camera_menu_settings_label">SETTINGS</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
+  <string name="create_tiny_planet">Create Tiny Planet</string>
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
+  <string name="saving_tiny_planet">Saving Tiny Planet&#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_zoom">Zoom</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_rotate">Rotate</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <string name="crop_save">Save</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <string name="cannot_load_image">Cannot load the image!</string>
   <!-- Label for album filmstrip button -->
+  <string name="switch_photo_filmstrip">Filmstrip view</string>
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <string name="setting_wallpaper">Setting wallpaper</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d left</string>
   <string name="makeup_video_size_limit">Makeup works only under VGA size in video recording.</string>
 </resources>
diff --git a/res/values-en-rIN/camera2arrays.xml b/res/values-en-rIN/camera2arrays.xml
index c5b0b7a8f..503251833 100644
--- a/res/values-en-rIN/camera2arrays.xml
+++ b/res/values-en-rIN/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>On</item>
+    <item>Off</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Mono</item>
+    <item>Front</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>On</item>
+    <item>Off</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>On</item>
+    <item>Off</item>
+  </string-array>
   <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
         -1 refers to ones not supported in Camera2 API
         0 is special case added for auto (meaning off)
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index ebca1dc44..4ef69825f 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -18,17 +18,91 @@
 <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">Wide</string>
   <!-- format for entries in the picture size menu. Parameter one is aspect ratio
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapixels</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string>
+  <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
+  <string name="pref_camera_scenemode_entry_ar">Augmented reality</string>
+  <string name="pref_camera_scenemode_entry_asd">Best shot</string>
+  <string name="pref_camera_scenemode_entry_baby">Baby</string>
+  <string name="pref_camera_scenemode_entry_backgroundblur">Background blur</string>
+  <string name="pref_camera_scenemode_entry_backlight">Backlight</string>
+  <string name="pref_camera_scenemode_entry_backlightportrait">Backlight portrait</string>
+  <string name="pref_camera_scenemode_entry_barcode">Barcode</string>
+  <string name="pref_camera_scenemode_entry_beach">Beach</string>
+  <string name="pref_camera_scenemode_entry_beauty">Beauty</string>
+  <string name="pref_camera_scenemode_entry_candlelight">Candlelight</string>
+  <string name="pref_camera_scenemode_entry_cine">Cine</string>
+  <string name="pref_camera_scenemode_entry_closeup">Closeup</string>
+  <string name="pref_camera_scenemode_entry_dark">Dark</string>
+  <string name="pref_camera_scenemode_entry_dish">Dish</string>
+  <string name="pref_camera_scenemode_entry_duskdawn">Duskdawn</string>
+  <string name="pref_camera_scenemode_entry_document">Document</string>
+  <string name="pref_camera_scenemode_entry_fallcolor">Autumn</string>
+  <string name="pref_camera_scenemode_entry_fireworks">Fireworks</string>
+  <string name="pref_camera_scenemode_entry_flowers">Flowers</string>
+  <string name="pref_camera_scenemode_entry_handheldtwilight">Handheld twilight</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">High sensitivity</string>
+  <string name="pref_camera_scenemode_entry_indoor">Indoor</string>
+  <string name="pref_camera_scenemode_entry_landscape">Landscape</string>
+  <string name="pref_camera_scenemode_entry_mix_illuminant">Mixed lighting</string>
+  <string name="pref_camera_scenemode_entry_mood">Mood</string>
+  <string name="pref_camera_scenemode_entry_nightportrait">Night portrait</string>
+  <string name="pref_camera_scenemode_entry_nightindoor">Night indoor</string>
+  <string name="pref_camera_scenemode_entry_oldfilm">Old film</string>
+  <string name="pref_camera_scenemode_entry_pet">Pet</string>
+  <string name="pref_camera_scenemode_entry_portrait">Portrait</string>
+  <string name="pref_camera_scenemode_entry_snow">Snow</string>
+  <string name="pref_camera_scenemode_entry_softskin">Soft skin</string>
+  <string name="pref_camera_scenemode_entry_sports">Sports</string>
+  <string name="pref_camera_scenemode_entry_spotlight">Spotlight</string>
+  <string name="pref_camera_scenemode_entry_steadyphoto">Steady photo</string>
+  <string name="pref_camera_scenemode_entry_supernight">Dark night</string>
+  <string name="pref_camera_scenemode_entry_sweepstitch">Sweep stitch</string>
+  <string name="pref_camera_scenemode_entry_text">Text</string>
+  <string name="pref_camera_scenemode_entry_theatre">Theatre</string>
+  <string name="pref_camera_scenemode_entry_whiteboard">Whiteboard</string>
   <!-- Settings screen, focus mode -->
+  <string name="pref_camera_focusmode_entry_continuous">Continuous</string>
+  <string name="pref_camera_focusmode_entry_mw_continuous">Continuous (MW)</string>
+  <string name="pref_camera_focusmode_entry_extended">Extended</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Face detect</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Face priority</string>
+  <string name="pref_camera_focusmode_entry_fixed">Fixed</string>
+  <string name="pref_camera_focusmode_entry_normal">Normal</string>
+  <string name="pref_camera_focusmode_entry_portrait">Portrait</string>
+  <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
   <!-- Color effects -->
+  <string name="pref_camera_coloreffect_entry_washed">Washed</string>
+  <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage warm</string>
+  <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage cold</string>
+  <string name="pref_camera_coloreffect_entry_point_blue">Point blue</string>
+  <string name="pref_camera_coloreffect_entry_point_green">Point green</string>
+  <string name="pref_camera_coloreffect_entry_point_red_yellow">Point red-yellow</string>
+  <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonise</string>
   <!-- Red eye flash mode title -->
+  <string name="pref_camera_flashmode_entry_redeye">Red eye</string>
+  <string name="pref_camera_flashmode_label_redeye">RED EYE</string>
   <!-- Power shutter -->
+  <string name="pref_camera_power_shutter_title">Power shutter</string>
   <!-- Max brightness -->
+  <string name="pref_camera_max_brightness_title">Bright screen</string>
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_title">Touch focus duration</string>
+  <string name="pref_camera_focustime_entry_0">0s</string>
+  <string name="pref_camera_focustime_entry_3">3s</string>
+  <string name="pref_camera_focustime_entry_5">5s</string>
+  <string name="pref_camera_focustime_entry_10">10s</string>
+  <string name="pref_camera_focustime_entry_infinite">Infinite</string>
   <!-- Shutter speed -->
+  <string name="pref_camera_shutter_speed_title">Shutter speed</string>
+  <string name="auto_hdr_enabled">Auto HDR enabled</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">You have enabled advanced camera options</string>
+  <string name="developer_menu_disabled">You have disabled advanced camera options</string>
 </resources>
diff --git a/res/values-en-rIN/qcomstrings.xml b/res/values-en-rIN/qcomstrings.xml
index eb31e645f..b36eeeaab 100644
--- a/res/values-en-rIN/qcomstrings.xml
+++ b/res/values-en-rIN/qcomstrings.xml
@@ -26,152 +26,431 @@
   <!-- 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">Power mode</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Low power</string>
+  <string name="pref_camera_powermode_entry_np">Normal power</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
   <!-- Settings screen, Select auto exposure title -->
+  <string name="pref_camera_autoexposure_title">Auto exposure</string>
   <!-- Settings screen, auto exposure dialog radio button choices -->
+  <string name="pref_camera_autoexposure_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_autoexposure_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Video encoder title -->
+  <string name="pref_camera_videoencoder_title">Video codec</string>
   <!-- Settings screen, Video encoder dialog radio button choices -->
   <!-- Default video encoder setting. A numerical value. -->
   <!-- Settings screen, Video encoder dialog title -->
+  <string name="pref_camera_videoencoder_dialogtitle">Video codec</string>
   <!-- Default audio encoder setting. A numerical value. -->
   <!-- Settings screen, Audio encoder title -->
+  <string name="pref_camera_audioencoder_title">Audio codec</string>
   <!-- Settings screen, Audio encoder dialog radio button choices -->
   <!-- Default video duration setting. A numerical value.-->
   <!-- Default Skin Tone Enhancement setting. Do not translate. -->
+  <string name="pref_camera_skinToneEnhancement_default">disable</string>
   <!-- Settings screen, Select Skin Tone Enhancement title -->
+  <string name="pref_camera_skinToneEnhancement_title">Skin tone enhancement</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Enable</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Disable</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
+  <string name="pref_camera_zsl_title">Zero shutter lag</string>
   <!-- Default selectable zone af setting. Do not translate. -->
   <!-- Settings screen, Selectable zone af title -->
+  <string name="pref_camera_selectablezoneaf_title">Autofocus zone</string>
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spot metering</string>
+  <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame average</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Selectable advanced features title -->
+  <string name="pref_camera_advanced_features_title">Advanced features</string>
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <string name="pref_camera_advanced_feature_entry_none">None</string>
+  <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Multi-touch Focus</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Manual exposure control entry values -->
+  <string name="pref_camera_manual_exp_title">Manual exposure</string>
+  <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string>
+  <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string>
+  <string name="pref_camera_manual_exp_entry_user_setting">User setting</string>
+  <string name="pref_camera_manual_exp_entry_off">Off</string>
   <!-- Manual white balance entry values -->
+  <string name="pref_camera_manual_wb_title">Manual white balance</string>
+  <string name="pref_camera_manual_wb_entry_color_temperature">Colour temperature</string>
+  <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
+  <string name="pref_camera_manual_wb_entry_off">Off</string>
   <!-- Manual Focus entry values -->
+  <string name="pref_camera_manual_focus_title">Manual focus</string>
+  <string name="pref_camera_manual_focus_entry_scale_mode">Scale mode</string>
+  <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string>
+  <string name="pref_camera_manual_focus_entry_off">Off</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">Instant capture</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Aggressive AEC</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Fast AEC</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Disable</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
+  <string name="pref_camera_zsl_entry_off">Off</string>
+  <string name="pref_camera_zsl_entry_on">On</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR is enabled, only Auto scene mode is supported</string>
+  <string name="scene_enable_message">HDR is not supported in the scene mode other than Auto</string>
   <!-- Settings screen, Video HDR location dialog choices -->
+  <string name="pref_camera_video_hdr_entry_off">Off</string>
+  <string name="pref_camera_video_hdr_entry_on">On</string>
   <!-- Settings screen, CDS location dialog choices -->
+  <string name="pref_camera_cds_entry_off">Off</string>
+  <string name="pref_camera_cds_entry_on">On</string>
+  <string name="pref_camera_cds_entry_auto">Auto</string>
   <!-- Settings screen, video CDS location dialog choices -->
+  <string name="pref_camera_video_cds_entry_off">Off</string>
+  <string name="pref_camera_video_cds_entry_on">On</string>
+  <string name="pref_camera_video_cds_entry_auto">Auto</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Disable</string>
+  <string name="pref_camera_tnr_entry_enable">Enable</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Disable</string>
+  <string name="pref_camera_video_tnr_entry_enable">Enable</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>
   <!-- Settings menu, setting title text for cds mode-->
+  <string name="pref_camera_cds_title">CDS mode</string>
   <!-- Settings menu, setting title text for video cds mode-->
+  <string name="pref_camera_video_cds_title">Video CDS mode</string>
   <!-- Default cds mode setting-->
   <!-- Default video cds mode setting-->
   <!-- Settings menu, setting title text for tnr mode-->
+  <string name="pref_camera_tnr_title">TNR mode</string>
   <!-- Settings menu, setting title text for video tnr mode-->
+  <string name="pref_camera_video_tnr_title">Video TNR mode</string>
   <!-- Default tnr mode setting-->
   <!-- Default video tnr mode setting-->
   <!-- Default face  detection setting. -->
   <!-- Settings screen, Select Face Detection -->
+  <string name="pref_camera_facedetection_title">Face detection</string>
   <!-- Settings menu, Face Detection choices -->
+  <string name="pref_camera_facedetection_entry_off">Off</string>
+  <string name="pref_camera_facedetection_entry_on">On</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
+  <string name="pref_selfie_flash_title">Selfie flash</string>
   <!-- Settings menu, Selfie Flash choices -->
+  <string name="pref_selfie_flash_entry_off">Off</string>
+  <string name="pref_selfie_flash_entry_on">On</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
+  <string name="pref_camera_redeyereduction_title">Red eye reduction</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Enable</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Disable</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Selfie mirror</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Enable</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Disable</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Shutter sound</string>
+  <string name="pref_camera_shuttersound_entry_enable">Enabled</string>
+  <string name="pref_camera_shuttersound_entry_disable">Disabled</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">High-framerate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
+  <string name="error_app_unsupported_hfr">Slow motion mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
+  <string name="error_app_unsupported_dis">Stabilisation is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HSR mode -->
+  <string name="error_app_unsupported_hsr">High speed mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
+  <string name="error_app_unsupported_hfr_codec">Only H264 video encoding is supported when HFR is ON</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
+  <string name="error_app_unsupported">Unsupported video resolution for this encoder type</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Unsupported video profile</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
+  <string name="error_app_unsupported_raw">Raw picture format is not supported in Zero shutter lag mode. Select 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">On</string>
+  <string name="err_app_unsupport_ae_bracket_code">AE bracketing is not supported yet</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Video snapshot size is lower than video size, capping to video size. Please select a resolution higher or equal to the current video size.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Changing picture size is not supported in Low Power mode, video size snapshot will be taken. Please select Normal Power mode to allow changing picture size.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Only video size snapshot is supported for this resolution.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
+  <string name="pref_camera_hfr_title">High-framerate recording</string>
   <!-- Settings screen, hfr radio button choices -->
+  <string name="pref_camera_hfr_entry_off">Off</string>
+  <string name="pref_camera_hfr_entry_2x">Slow motion 60 FPS</string>
+  <string name="pref_camera_hfr_entry_3x">Slow motion 90 FPS</string>
+  <string name="pref_camera_hfr_entry_4x">Slow motion 120 FPS</string>
+  <string name="pref_camera_hfr_entry_8x">Slow motion 240 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_60">High speed 60 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_90">High speed 90 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_120">High speed 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">High speed 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">Noise reduction</string>
   <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_noise_reduction_entry_off">Off</string>
+  <string name="pref_camera_noise_reduction_entry_fast">Fast</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">High quality</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_see_more_entry_off">Off</string>
+  <string name="pref_camera_see_more_entry_on">On</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
+  <string name="pref_camera_denoise_title">Denoise</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
+  <string name="pref_camera_denoise_entry_off">Off</string>
+  <string name="pref_camera_denoise_entry_on">On</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
+  <string name="pref_camera_iso_title">ISO</string>
   <!-- Settings screen, ISO dialog radio button choices -->
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
   <!-- ISO entry values. Do not translate. -->
   <!-- Settings screen, Anti Banding title -->
+  <string name="pref_camera_antibanding_title">Antibanding</string>
   <!-- Default Anti Banding setting. -->
   <!-- Settings screen, Anti Banding entries -->
+  <string name="pref_camera_antibanding_entry_0">Off</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz (Europe)</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
+  <string name="pref_camera_antibanding_entry_3">Auto</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">On</string>
+  <string name="pref_camera_filter_mode_entry_off">Off</string>
   <!-- Settings screen, Select Color effect title -->
+  <string name="pref_camera_coloreffect_title">Colour effect</string>
+  <string name="pref_camera_filter_mode_title">Colour effect</string>
   <!-- Settings screen, Color effect dialog radio button choices -->
+  <string name="pref_camera_coloreffect_entry_none">None</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negative</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
+  <string name="pref_camera_coloreffect_entry_solarize">Solarise</string>
+  <string name="pref_camera_coloreffect_entry_posterize">Posterise</string>
+  <string name="pref_camera_coloreffect_entry_aqua">Aqua</string>
+  <string name="pref_camera_coloreffect_entry_emboss">Emboss</string>
+  <string name="pref_camera_coloreffect_entry_sketch">Sketch</string>
+  <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+  <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
+  <string name="pref_camera_coloreffect_entry_mosaic">Mosaic</string>
+  <string name="pref_camera_coloreffect_entry_redtint">Red tint</string>
+  <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
+  <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
+  <string name="pref_camera_touchafaec_entry_off">Off</string>
+  <string name="pref_camera_touchafaec_entry_on">On</string>
   <!-- Select IS title -->
+  <string name="pref_camera_dis_title">Stabilisation</string>
   <!-- DIS choices -->
+  <string name="pref_camera_dis_entry_off">Off</string>
+  <string name="pref_camera_dis_entry_on">On</string>
   <!-- Select Face Recognition title -->
+  <string name="pref_camera_facerc_title">Face recognition</string>
   <!-- Face Recognition choices -->
+  <string name="pref_camera_facerc_entry_off">Off</string>
+  <string name="pref_camera_facerc_entry_on">On</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_sharpness_entry_level0">Level 0</string>
+  <string name="pref_camera_sharpness_entry_level1">Level 1</string>
+  <string name="pref_camera_sharpness_entry_level2">Level 2 (default)</string>
+  <string name="pref_camera_sharpness_entry_level3">Level 3</string>
+  <string name="pref_camera_sharpness_entry_level4">Level 4</string>
+  <string name="pref_camera_sharpness_entry_level5">Level 5</string>
+  <string name="pref_camera_sharpness_entry_level6">Level 6</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_contrast_entry_level0">Level 0</string>
+  <string name="pref_camera_contrast_entry_level1">Level 1</string>
+  <string name="pref_camera_contrast_entry_level2">Level 2</string>
+  <string name="pref_camera_contrast_entry_level3">Level 3</string>
+  <string name="pref_camera_contrast_entry_level4">Level 4</string>
+  <string name="pref_camera_contrast_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_contrast_entry_level6">Level 6</string>
+  <string name="pref_camera_contrast_entry_level7">Level 7</string>
+  <string name="pref_camera_contrast_entry_level8">Level 8</string>
+  <string name="pref_camera_contrast_entry_level9">Level 9</string>
+  <string name="pref_camera_contrast_entry_level10">Level 10</string>
   <!-- Settings screen, Multiple levels entries -->
+  <string name="pref_camera_saturation_entry_level0">Level 0</string>
+  <string name="pref_camera_saturation_entry_level1">Level 1</string>
+  <string name="pref_camera_saturation_entry_level2">Level 2</string>
+  <string name="pref_camera_saturation_entry_level3">Level 3</string>
+  <string name="pref_camera_saturation_entry_level4">Level 4</string>
+  <string name="pref_camera_saturation_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_saturation_entry_level6">Level 6</string>
+  <string name="pref_camera_saturation_entry_level7">Level 7</string>
+  <string name="pref_camera_saturation_entry_level8">Level 8</string>
+  <string name="pref_camera_saturation_entry_level9">Level 9</string>
+  <string name="pref_camera_saturation_entry_level10">Level 10</string>
   <!-- Default sharpness setting. Do not translate. -->
   <!-- Settings screen, Select sharpness title -->
+  <string name="pref_camera_sharpness_title">Sharpness</string>
   <!-- Default contrast setting. Do not translate. -->
   <!-- Settings screen, Select contrast title -->
+  <string name="pref_camera_contrast_title">Contrast</string>
   <!-- Default saturation setting. Do not translate. -->
   <!-- Settings screen, Select saturation title -->
+  <string name="pref_camera_saturation_title">Saturation</string>
   <!-- Default picture quality setting. See pref_camera_jpegquality_entryvalues for possible values -->
   <!-- Default Picture format setting. Do not translate. -->
   <!-- Settings screen, Select Picture format title -->
+  <string name="pref_camera_picture_format_title">Picture format</string>
   <!-- Settings screen, picture format dialog radio button choices -->
   <!-- Picture format entry values. Do not translate. -->
   <!-- Settings screen, Picture quality title -->
+  <string name="pref_camera_jpegquality_title">Picture quality</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Low</string>
+  <string name="pref_camera_jpegquality_entry_1">Standard</string>
+  <string name="pref_camera_jpegquality_entry_2">High</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">Enable</string>
+  <string name="pref_camera_histogram_entry_disable">Disable</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
+  <string name="pref_camera_scenedetect_title">Auto scene detection</string>
   <!-- Settings menu, auto scene detection choices -->
+  <string name="pref_camera_scenedetect_entry_off">Off</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">On</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Invalid video-size for time-lapse recording.</string>
   <!-- longshot value -->
+  <string name="pref_camera_longshot_title">Continuous shot</string>
+  <string name="msg_cancel_longshot_for_limited_memory">Running out of memory, cancelling continuous shot</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
+  <string name="flash_aebracket_message">Flash is not supported in AE bracketing mode</string>
   <!-- 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">Enable</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Disable</string>
   <!-- toast message for storage location switch -->
+  <string name="on_switch_save_path_to_sdcard">Internal storage space is not enough, switched storage location to SD card</string>
   <!-- Settings screen, Selectable HDR mode title -->
+  <string name="pref_camera_hdr_mode_title">HDR mode</string>
   <!-- Settings screen, Selectable HDR mode radio button choices -->
+  <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
+  <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
   <!-- Settings screen, Selectable HDR need 1x frame default value -->
   <!-- Settings screen, Selectable HDR need 1x frame title -->
+  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
   <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
   <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
+  <string name="pref_camera_video_rotation_title">Video rotation</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">VIDEO ROTATION</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
+  <string name="pref_camera_video_rotation_entry_0">0 degrees</string>
+  <string name="pref_camera_video_rotation_entry_90">90 degrees</string>
+  <string name="pref_camera_video_rotation_entry_180">180 degrees</string>
+  <string name="pref_camera_video_rotation_entry_270">270 degrees</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+  <string name="map_activity_not_found_err">There is no maps app installed to show the location</string>
   <!-- Continuous shot enable message -->
+  <string name="longshot_enable_message">Advanced features are not supported in continuous shot mode</string>
   <!-- Advanced features enable message -->
+  <string name="advance_feature_enable_msg">Continuous shot is not supported when advanced features are enabled</string>
   <!-- The alas of CameraActivity for gesture operation -->
+  <string name="camera_gesture_title">Launch camera</string>
+  <string name="pref_camera_tsmakeup_title">Beautification</string>
+  <string name="pref_camera_tsmakeup_entry_on">On</string>
+  <string name="pref_camera_tsmakeup_entry_off">Off</string>
+  <string name="pref_camera_tsmakeup_entry_low">Low</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Medium</string>
+  <string name="pref_camera_tsmakeup_entry_high">High</string>
+  <string name="pref_camera_tsmakeup_custom">Custom</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Whiten</string>
+  <string name="pref_camera_tsmakeup_level_clean">Soften</string>
+  <string name="text_tsmakeup_alert_title">Warning</string>
+  <string name="text_tsmakeup_alert_msg">Face detection must be enabled in order to use the beautification feature. Do you want to continue?</string>
+  <string name="text_tsmakeup_alert_continue">Continue</string>
+  <string name="text_tsmakeup_alert_quit">Cancel</string>
+  <string name="text_tsmakeup_beautify_toast">Beautify</string>
+  <string name="all_in_focus">All in focus</string>
+  <string name="refocus_toast">To re-focus last photo, tap here</string>
+  <string name="refocus_prompt_message">With UbiFocus, your camera will take 5 pictures, each time that you press the shutter button. The 5 pictures will be combined into 1 picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string>
+  <string name="camera_thermal_shutdown">Phone overheated, closing camera.</string>
+  <string name="camera_server_died">Media server died, closing camera.</string>
+  <string name="camera_unknown_error">Unknown error, closing camera.</string>
+  <string name="mute_button_desc">Mute button</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
+  <string name="help_menu_scene_mode_1">Select a</string>
+  <string name="help_menu_scene_mode_2">Scene mode</string>
+  <string name="help_menu_scene_mode_3">for better pictures</string>
+  <string name="help_menu_color_filter_1">Apply colour</string>
+  <string name="help_menu_color_filter_2">filters</string>
+  <string name="help_menu_color_filter_3">to</string>
+  <string name="help_menu_color_filter_4">improve pictures</string>
+  <string name="help_menu_beautify_1">Enhance portraits</string>
+  <string name="help_menu_beautify_2">with the</string>
+  <string name="help_menu_beautify_3">Beautify feature</string>
+  <string name="help_menu_switcher_1">Switch</string>
+  <string name="help_menu_switcher_2">between</string>
+  <string name="help_menu_switcher_3">camera, video, and panorama</string>
+  <string name="pref_camera2_camera2_title">Camera2 mode</string>
+  <string name="pref_camera2_camera2_entry_enable">Enable</string>
+  <string name="pref_camera2_camera2_entry_disable">Disable</string>
+  <string name="pref_camera2_mono_only_title">Mono only</string>
+  <string name="pref_camera2_mono_preview_title">Mono preview</string>
+  <string name="pref_camera2_mono_preview_entry_on">On</string>
+  <string name="pref_camera2_mono_preview_entry_off">Off</string>
+  <string name="pref_camera2_clearsight_entry_on">On</string>
+  <string name="pref_camera2_clearsight_entry_off">Off</string>
+  <string name="clearsight_capture_success">ClearSight capture successful</string>
+  <string name="clearsight_capture_fail">ClearSight capture failed</string>
+  <string name="pref_camera2_mpo_title">MPO format</string>
+  <string name="pref_camera2_mpo_entry_on">On</string>
+  <string name="pref_camera2_mpo_entry_off">Off</string>
+  <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_noise_reduction_title">Noise reduction</string>
+  <string name="pref_camera2_noise_reduction_entry_off">Off</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">Fast</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">High quality</string>
+  <string name="pref_camera2_videosnap_title">Auto snapshot size</string>
+  <string name="pref_camera2_videosnap_entry_enable">Enable</string>
+  <string name="pref_camera2_videosnap_entry_disable">Disable</string>
+  <string name="pref_camera2_trackingfocus_title">Tracking focus</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Best picture</string>
+  <string name="bestpicture_done">DONE</string>
+  <string name="bestpicture_at_least_one_picture">At least one picture has to be chosen.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">On</string>
+  <string name="pref_camera2_shutter_sound_entry_off">Off</string>
+  <string name="pref_camera2_shutter_sound_title">Shutter sound</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e25adc394..03a4e8d91 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -16,85 +16,181 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <string name="app_name">Camera</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+  <string name="video_camera_label">Camcorder</string>
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <string name="set_image">Set picture as</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <string name="delete">Delete</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <plurals name="delete_selection">
+    <item quantity="one">Delete selected item?</item>
+    <item quantity="other">Delete selected items?</item>
+  </plurals>
+  <string name="share">Share</string>
+  <string name="share_panorama">Share panorama</string>
+  <string name="share_as_photo">Share as photo</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <string name="deleted">Deleted</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <string name="undo">UNDO</string>
+  <string name="details">Details</string>
+  <string name="close">Close</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating timestamp of photo or video -->
+  <string name="show_on_map">Show on map</string>
+  <string name="rotate_left">Rotate left</string>
+  <string name="rotate_right">Rotate right</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
+  <string name="edit">Edit</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <string name="crop_action">Crop</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <string name="trim_action">Trim</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <string name="set_as">Set as</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
+  <string name="video_err">Can\'t play video.</string>
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
+  <string name="crop_saved">
+        Cropped image saved to <xliff:g id="folder_name">%s</xliff:g>.</string>
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <string name="title">Title</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <string name="description">Description</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="time">Time</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <string name="location">Location</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
+  <string name="path">Path</string>
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <string name="width">Width</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <string name="height">Height</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <string name="orientation">Orientation</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <string name="duration">Duration</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
+  <string name="mimetype">MIME type</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
+  <string name="file_size">File size</string>
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
+  <string name="maker">Maker</string>
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
+  <string name="model">Model</string>
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
+  <string name="flash">Flash</string>
   <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
+  <string name="aperture">Aperture</string>
   <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
+  <string name="focal_length">Focal Length</string>
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
+  <string name="white_balance">White balance</string>
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="exposure_time">Exposure time</string>
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
+  <string name="unit_mm">mm</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
+  <string name="manual">Manual</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
+  <string name="auto">Auto</string>
   <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
+  <string name="flash_on">Flash fired</string>
   <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
+  <string name="flash_off">No flash</string>
   <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
+  <string name="unknown">Unknown</string>
   <!-- Toast message shown after we try to make a local album available offline
          [CHAR LIMIT=150] -->
+  <string name="try_to_set_local_album_available_offline">
+        This item is stored locally and available offline.</string>
   <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
+  <string name="please_wait">Please wait</string>
   <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
+  <string name="rendering_photo_sphere">Rendering photo sphere</string>
   <!-- title for the dialog showing the error of camera hardware -->
+  <string name="camera_error_title">Camera error</string>
   <!-- message for the dialog showing the error of camera hardware -->
+  <string name="cannot_connect_camera">Can\'t connect to the camera.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
+  <string name="camera_disabled">Camera has been disabled because of security policies.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">The app does not have critical permissions needed to run. Please check your permissions settings.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Dismiss</string>
   <!-- alert to the user to wait for some operation to complete -->
+  <string name="wait">Please wait\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
+  <string name="no_storage" product="default">Insert an SD card before using the camera.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
+  <string name="preparing_sd" product="default">Preparing SD card\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <string name="access_sd_fail" product="default">Couldn\'t access SD card.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+  <string name="time_lapse_title">Time lapse recording</string>
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+  <string name="capturing">Capturing</string>
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <string name="pref_camera_id_title">Choose camera</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">Back</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_front">Front</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">GPS location</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">LOCATION</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
+  <string name="pref_camera_timer_title">Countdown timer</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">1 second</item>
+    <item quantity="other">%d seconds</item>
+  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
+  <string name="pref_camera_timer_sound_title">Beep during countdown</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Storage</string>
+  <string name="pref_camera_savepath_entry_0">Phone</string>
+  <string name="pref_camera_savepath_entry_1">SD Card</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <string name="setting_off">Off</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
+  <string name="setting_on">On</string>
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
   <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
+  <string name="pref_video_quality_title">Video quality</string>
   <!-- The default quality value is NULL -->
   <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
@@ -107,180 +203,354 @@
   <!-- Video quality setting entry. Videos will be recorded in 2K quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
+  <string name="pref_video_time_lapse_frame_interval_title">Time lapse</string>
   <!-- Settings screen, Camera setting category title -->
+  <string name="pref_camera_settings_category">Camera settings</string>
   <!-- Settings screen, Camcorder setting category title -->
+  <string name="pref_camcorder_settings_category">Camcorder settings</string>
   <!-- Settings screen, Picture size title -->
+  <string name="pref_camera_picturesize_title">Picture size</string>
   <!-- Settings screen, Focus mode title -->
+  <string name="pref_camera_focusmode_title">Focus mode</string>
   <!-- Settings screen, Focus mode dialog radio button choices -->
+  <string name="pref_camera_focusmode_entry_auto">Auto</string>
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_infinity">Infinity</string>
   <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_macro">Macro</string>
   <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_focusmode_label_auto">AUTO</string>
+  <string name="pref_camera_focusmode_label_infinity">INFINITY</string>
+  <string name="pref_camera_focusmode_label_macro">MACRO</string>
   <!-- Default flash mode setting.-->
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
+  <string name="pref_camera_flashmode_title">Flash</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_auto">Auto</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_on">On</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_off">Off</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label_auto">FLASH AUTO</string>
+  <string name="pref_camera_flashmode_label_on">FLASH ON</string>
+  <string name="pref_camera_flashmode_label_off">FLASH OFF</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
+  <string name="pref_camera_whitebalance_title">White balance</string>
   <!-- Menu, white balance label -->
+  <string name="pref_camera_whitebalance_label">WHITE BALANCE</string>
   <!-- Settings screen, White balance dialog radio button choices -->
+  <string name="pref_camera_whitebalance_entry_auto">Auto</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">Incandescent</string>
+  <string name="pref_camera_whitebalance_entry_daylight">Daylight</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescent</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">Cloudy</string>
   <!-- Menu, White balance labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_whitebalance_label_auto">AUTO</string>
+  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENT</string>
+  <string name="pref_camera_whitebalance_label_daylight">DAYLIGHT</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENT</string>
+  <string name="pref_camera_whitebalance_label_cloudy">CLOUDY</string>
   <!-- Default scene mode setting. -->
   <!-- Settings screen, Select Scene mode -->
+  <string name="pref_camera_scenemode_title">Scene mode</string>
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_auto">Auto</string>
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_action">Action</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_night">Night</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_sunset">Sunset</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_party">Party</string>
   <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_auto">NONE</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_action">ACTION</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_night">NIGHT</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_sunset">SUNSET</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_party">PARTY</string>
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_off">TIMER OFF</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_one">1 SECOND</string>
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_three">3 SECONDS</string>
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 SECONDS</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_fifteen">15 SECONDS</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">Not selectable in scene mode.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">HDR will disable continuous shot.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Advanced capture will disable continuous shot.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">4k video quality will disable image stabilisation.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">High quality noise reduction will disable CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">High quality noise reduction will disable TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore will disable TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore will disable noise reduction.</string>
   <!-- Exposure settings in preference -->
+  <string name="pref_exposure_title">Exposure</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <string name="pref_exposure_label">EXPOSURE</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
+  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_back">FRONT CAMERA</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_front">BACK CAMERA</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <string name="spaceIsLow_content" product="default">Your SD card is running out of space. Change the quality setting or delete some images or other files.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
+  <string name="video_reach_size_limit">Size limit reached.</string>
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <string name="pano_too_fast_prompt">Too fast</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <string name="pano_dialog_prepare_preview">Preparing panorama</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
+  <string name="pano_dialog_panorama_failed">Couldn\'t save panorama.</string>
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <string name="pano_dialog_title">Panorama</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <string name="pano_capture_indication">Capturing panorama</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <string name="pano_dialog_waiting_previous">Waiting for previous panorama</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <string name="pano_review_saving_indication_str">Saving\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
+  <string name="pano_review_rendering">Rendering panorama</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <string name="tap_to_focus">Touch to focus.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
+  <string name="pref_video_effect_title">Effects</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
+  <string name="effect_none">None</string>
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_squeeze">Squeeze</string>
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_eyes">Big eyes</string>
   <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_mouth">Big mouth</string>
   <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_mouth">Small mouth</string>
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_nose">Big nose</string>
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_eyes">Small eyes</string>
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_space">In space</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_sunset">Sunset</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_gallery">Your video</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <string name="video_snapshot_hint">Touch to take photo while recording.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
+  <string name="video_recording_started">Video recording has started.</string>
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <string name="video_recording_stopped">Video recording has stopped.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+  <string name="clear_effects">Clear effects</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+  <string name="effect_silly_faces">SILLY FACES</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">BACKGROUND</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_shutter_button">Shutter</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_menu_button">Menu button</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_mode_picker">Camera, video or panorama selector</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_check_box">%1$s tick box</string>
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_camera">Switch to photo</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_video">Switch to video</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_panorama">Switch to panorama</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_photo_sphere">Switch to Photo Sphere</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_gcam">Switch to high quality</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_cancel">Review cancel</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_ok">Review done</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_retake">Review retake</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_on">ON</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_off">OFF</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_off">Off</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1000">1 second</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2000">2 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2500">2.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3000">3 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_4000">4 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5000">5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_6000">6 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_15000">15 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_24000">24 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">0.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minute</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 hours</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_seconds">seconds</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_minutes">minutes</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_hours">hours</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_interval_set">Done</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <string name="set_time_interval">Set Time Interval</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
+  <string name="set_time_interval_help">Time lapse feature is off. Turn it on to set time interval.</string>
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <string name="set_duration">Set duration in seconds</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <string name="count_down_title_text">Counting down to take a photo</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
+  <string name="remember_location_title">Remember photo locations?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
+  <string name="remember_location_prompt">Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_no">No, thanks</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_yes">Yes</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
+  <string name="camera_menu_more_label">MORE OPTIONS</string>
   <!-- settings label [CHAR LIMIT=50] -->
+  <string name="camera_menu_settings_label">SETTINGS</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
+  <string name="create_tiny_planet">Create Tiny Planet</string>
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
+  <string name="saving_tiny_planet">Saving Tiny Planet&#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_zoom">Zoom</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_rotate">Rotate</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <string name="crop_save">Save</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <string name="cannot_load_image">Cannot load the image!</string>
   <!-- Label for album filmstrip button -->
+  <string name="switch_photo_filmstrip">Filmstrip view</string>
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <string name="setting_wallpaper">Setting wallpaper</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d left</string>
+  <string name="makeup_video_size_limit">Makeup works only under VGA size in video recording.</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index eca479b30..1bd9bfe3f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -319,13 +319,13 @@
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
   <string name="video_quality_4k_disable_SeeMore">SeeMore אינו יכול לפעול במהלך הפעלת וידאו ברזולוציית 4k.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
-  <string name="disable_CDS_during_HighQualityNoiseReduction">הפחתת רעש באיכות גבוהה תבטל את CDS.</string>
+  <string name="disable_CDS_during_HighQualityNoiseReduction">הפחתת רעש באיכות גבוהה תבטל את ה-CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
-  <string name="disable_TNR_during_HighQualityNoiseReduction">הפחתת רעש באיכות גבוהה תבטל את TNR.</string>
+  <string name="disable_TNR_during_HighQualityNoiseReduction">הפחתת רעש באיכות גבוהה תבטל את ה-TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
-  <string name="disable_CDS_during_SeeMore">SeeMore יבטל את CDS.</string>
+  <string name="disable_CDS_during_SeeMore">SeeMore יבטל את ה-CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
-  <string name="disable_TNR_during_SeeMore">SeeMore יבטל את TNR.</string>
+  <string name="disable_TNR_during_SeeMore">SeeMore יבטל את ה-TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
   <string name="disable_NR_during_SeeMore">SeeMore יבטל את הפחתת הרעשים.</string>
   <!-- Exposure settings in preference -->
diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml
index feb442563..a1056e9e1 100644
--- a/res/values-ko/qcomstrings.xml
+++ b/res/values-ko/qcomstrings.xml
@@ -101,8 +101,8 @@
   <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>
+  <string name="hdr_enable_message">HDR이 켜져 있을 때에는 자동 모드만 사용할 수 있습니다.</string>
+  <string name="scene_enable_message">HDR은 자동을 제외한 장면 모드를 지원하지 않습니다.</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">끄기</string>
   <string name="pref_camera_video_hdr_entry_on">켜짐</string>
@@ -181,7 +181,7 @@
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">자동 노출 브래킷</string>
   <string name="pref_camera_ae_bracket_hdr_title">자동 노출 브래킷</string>
   <string name="pref_camera_ae_bracket_hdr_entry_on">켜짐</string>
-  <string name="err_app_unsupport_ae_bracket_code">자동 노출(AE) 브라케팅은 아직 지원하지 않습니다</string>
+  <string name="err_app_unsupport_ae_bracket_code">자동 노출(AE) 브라케팅은 아직 지원하지 않습니다.</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
   <string name="snapshot_lower_than_video">비디오 스냅샷 해상도가 영상의 해상도보다 낮아 해상도를 영상에 맞춥니다. 해상도를 현재 영상 해상도와 같거나 높게 선택해주세요.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
diff --git a/res/values-pl/qcomstrings.xml b/res/values-pl/qcomstrings.xml
index ca4f47f97..964c23fa4 100644
--- a/res/values-pl/qcomstrings.xml
+++ b/res/values-pl/qcomstrings.xml
@@ -52,6 +52,7 @@
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <string name="pref_camera_skinToneEnhancement_title">Poprawa koloru skóry</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Włącz</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Brak opóźnienia migawki</string>
@@ -340,8 +341,11 @@
   <string name="pref_camera_tsmakeup_entry_off">Wyłączona</string>
   <string name="all_in_focus">Wszystko wyostrzone</string>
   <string name="refocus_toast">Dotknij tutaj, aby zmienić ostrość ostatniego zdjęcia</string>
+  <string name="camera_server_died">Serwer mediów padł, wyłączanie aparatu.</string>
   <!-- Help menu strings -->
   <string name="help_menu_ok">OK</string>
+  <string name="help_menu_color_filter_1">Zastosuj kolor</string>
+  <string name="help_menu_beautify_2">z</string>
   <string name="pref_camera2_mono_preview_entry_off">Wyłączona</string>
   <string name="pref_camera2_clearsight_entry_off">Wyłączona</string>
   <string name="pref_camera2_mpo_entry_off">Wyłączona</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4fc9fac87..4388e8fa4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -183,6 +183,7 @@
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Sygnał odliczania</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Pamięć</string>
   <string name="pref_camera_savepath_entry_0">Telefon</string>
   <string name="pref_camera_savepath_entry_1">Karta SD</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml
index 5e84e4a82..91e933c65 100644
--- a/res/values-pt-rBR/qcomstrings.xml
+++ b/res/values-pt-rBR/qcomstrings.xml
@@ -183,8 +183,11 @@
   <string name="pref_camera_ae_bracket_hdr_entry_on">Ativado</string>
   <string name="err_app_unsupport_ae_bracket_code">Escalonamento AE ainda não é suportado</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">O tamanho da foto instantânea é menor que o tamanho do vídeo. O tamanho da foto instantânea é limitada ao tamanho do vídeo. Escolha uma resolução maior ou igual ao tamanho de vídeo atual.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Não é possível alterar o tamanho da imagem no modo de baixo consumo, portanto será tirada uma foto instantânea com o mesmo tamanho do vídeo. Escolha o modo de energia normal para alterar o tamanho da imagem.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Apenas fotos instantâneas do tamanho do vídeo são suportadas nesta resolução.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Câmera lenta</string>
diff --git a/res/values-sq-rAL/camera2arrays.xml b/res/values-sq-rAL/camera2arrays.xml
index c5b0b7a8f..23214f6c9 100644
--- a/res/values-sq-rAL/camera2arrays.xml
+++ b/res/values-sq-rAL/camera2arrays.xml
@@ -28,6 +28,23 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Aktiv</item>
+    <item>Inaktiv</item>
+  </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Mono</item>
+    <item>Frontale</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>Aktiv</item>
+    <item>Inaktiv</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Aktiv</item>
+    <item>Inaktiv</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-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index ebca1dc44..39576aa5e 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -18,17 +18,39 @@
 <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">E gjerë</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 megapiksel</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_baby">Bebe</string>
+  <string name="pref_camera_scenemode_entry_beach">Plazh</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">Ndjesi e lartë</string>
+  <string name="pref_camera_scenemode_entry_landscape">Peizazh</string>
+  <string name="pref_camera_scenemode_entry_portrait">Portret</string>
+  <string name="pref_camera_scenemode_entry_snow">Borë</string>
+  <string name="pref_camera_scenemode_entry_sports">Sporte</string>
+  <string name="pref_camera_scenemode_entry_steadyphoto">Foto stabël</string>
   <!-- Settings screen, focus mode -->
+  <string name="pref_camera_focusmode_entry_continuous">E vazhdueshme</string>
+  <string name="pref_camera_focusmode_entry_mw_continuous">E vazhdueshme (MW)</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Dallo fytyrën</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Fytyra prioritet</string>
+  <string name="pref_camera_focusmode_entry_fixed">E fiksuar</string>
+  <string name="pref_camera_focusmode_entry_normal">Normale</string>
   <!-- Color effects -->
   <!-- Red eye flash mode title -->
   <!-- Power shutter -->
   <!-- Max brightness -->
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_entry_0">0s</string>
+  <string name="pref_camera_focustime_entry_3">3s</string>
+  <string name="pref_camera_focustime_entry_5">5s</string>
+  <string name="pref_camera_focustime_entry_10">10s</string>
   <!-- Shutter speed -->
+  <string name="pref_camera_shutter_speed_title">Shpejtësia e shkrepjes</string>
+  <string name="auto_hdr_enabled">HDR automatik i aktivizuar</string>
   <!-- Advanced options -->
 </resources>
diff --git a/res/values-sq-rAL/qcomstrings.xml b/res/values-sq-rAL/qcomstrings.xml
index eb31e645f..797333418 100644
--- a/res/values-sq-rAL/qcomstrings.xml
+++ b/res/values-sq-rAL/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">Profili i energjisë</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Energji e ulët</string>
+  <string name="pref_camera_powermode_entry_np">Energji normale</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
@@ -44,6 +47,8 @@
   <!-- Default Skin Tone Enhancement setting. Do not translate. -->
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Aktivizo</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Çaktivizo</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <!-- Default selectable zone af setting. Do not translate. -->
@@ -54,20 +59,42 @@
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Manual exposure control entry values -->
+  <string name="pref_camera_manual_exp_entry_off">Inaktiv</string>
   <!-- Manual white balance entry values -->
+  <string name="pref_camera_manual_wb_entry_off">Inaktiv</string>
   <!-- Manual Focus entry values -->
+  <string name="pref_camera_manual_focus_entry_off">Inaktiv</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title" translatable="true">Shkrepje e menjëhershme</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">AEC agresiv</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">AEC e shpejtë</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Çaktivizo</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
+  <string name="pref_camera_zsl_entry_off">Inaktiv</string>
+  <string name="pref_camera_zsl_entry_on">Aktiv</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR u aktivizua. Vetëm profili i peizazhit Auto është i suportuar</string>
+  <string name="scene_enable_message">HDR nuk është i suportuar në ndonjë profil skene përveç atij Auto</string>
   <!-- Settings screen, Video HDR location dialog choices -->
+  <string name="pref_camera_video_hdr_entry_off">Inaktiv</string>
+  <string name="pref_camera_video_hdr_entry_on">Aktiv</string>
   <!-- Settings screen, CDS location dialog choices -->
+  <string name="pref_camera_cds_entry_off">Inaktiv</string>
+  <string name="pref_camera_cds_entry_on">Aktiv</string>
   <!-- Settings screen, video CDS location dialog choices -->
+  <string name="pref_camera_video_cds_entry_off">Inaktiv</string>
+  <string name="pref_camera_video_cds_entry_on">Aktiv</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Çaktivizo</string>
+  <string name="pref_camera_tnr_entry_enable">Aktivizo</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Çaktivizo</string>
+  <string name="pref_camera_video_tnr_entry_enable">Aktivizo</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>
   <!-- Settings menu, setting title text for cds mode-->
   <!-- Settings menu, setting title text for video cds mode-->
   <!-- Default cds mode setting-->
@@ -78,56 +105,114 @@
   <!-- Default video tnr mode setting-->
   <!-- Default face  detection setting. -->
   <!-- Settings screen, Select Face Detection -->
+  <string name="pref_camera_facedetection_title">Dallimi i fytyrës</string>
   <!-- Settings menu, Face Detection choices -->
+  <string name="pref_camera_facedetection_entry_off">Inaktiv</string>
+  <string name="pref_camera_facedetection_entry_on">E aktivizuar</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <!-- Settings menu, Selfie Flash choices -->
+  <string name="pref_selfie_flash_entry_off">Inaktiv</string>
+  <string name="pref_selfie_flash_entry_on">E aktivizuar</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Aktivizo</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Çaktivizo</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Pasqyra selfie</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Aktivizo</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Çaktivizo</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Tingulli i shkrepjes</string>
+  <string name="pref_camera_shuttersound_entry_enable">E aktivizuar</string>
+  <string name="pref_camera_shuttersound_entry_disable">E çaktivizuar</string>
   <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HSR mode -->
+  <string name="error_app_unsupported_hsr">Profili i shpejtësisë së lartë nuk është i suportuar për madhësinë e zgjedhur të videos. Zgjidhni një madhësi videoje më të vogël</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Profili i videos nuk është i suportuar</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Aktiv</string>
+  <string name="err_app_unsupport_ae_bracket_code">Grupimi AE është akoma i pasuportuar</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Madhësia e videos së çastit është më e vogel se madhësia e videos. Zgjidhni një rezolucion më të lartë ose të barabartë me madhësinë e videos aktuale.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Ndryshimi i madhësisë së fotos nuk është i suportuar në profilin Energji e Ulët. Zgjidhni profilin Energji Normale për të lejuar ndryshimin e madhësisë së fotos.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Vetëm video e çastit me madhësi videoje është e suportuar për këtë rezolucion.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <!-- Settings screen, hfr radio button choices -->
+  <string name="pref_camera_hfr_entry_off">Inaktiv</string>
+  <string name="pref_camera_hfr_entry_hsr_60">Shpejtësi e lartë 60 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_90">Shpejtësi e lartë 90 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_120">Shpejtësi e lartë 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Shpejtësi e lartë 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">Reduktimi i zhurmave</string>
   <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_noise_reduction_entry_off">Inaktiv</string>
+  <string name="pref_camera_noise_reduction_entry_fast">I shpejtë</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Me cilësi të lartë</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">Inaktiv</string>
+  <string name="pref_camera_see_more_entry_on">Aktiv</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
+  <string name="pref_camera_denoise_title">Reduktimi i zhurmave</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
+  <string name="pref_camera_denoise_entry_off">Inaktiv</string>
+  <string name="pref_camera_denoise_entry_on">Aktiv</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
+  <string name="pref_camera_iso_title">ISO</string>
   <!-- Settings screen, ISO dialog radio button choices -->
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
   <!-- ISO entry values. Do not translate. -->
   <!-- Settings screen, Anti Banding title -->
+  <string name="pref_camera_antibanding_title">Antibanding</string>
   <!-- Default Anti Banding setting. -->
   <!-- Settings screen, Anti Banding entries -->
+  <string name="pref_camera_antibanding_entry_0">Inaktiv</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz (Evropë)</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz (SHBA)</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Aktiv</string>
+  <string name="pref_camera_filter_mode_entry_off">Inaktiv</string>
   <!-- Settings screen, Select Color effect title -->
+  <string name="pref_camera_coloreffect_title">Efekti i ngjyrave</string>
+  <string name="pref_camera_filter_mode_title">Efekti i ngjyrave</string>
   <!-- Settings screen, Color effect dialog radio button choices -->
+  <string name="pref_camera_coloreffect_entry_none">Asnjë</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negativ</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
+  <string name="pref_camera_touchafaec_entry_off">Inaktiv</string>
+  <string name="pref_camera_touchafaec_entry_on">Aktiv</string>
   <!-- Select IS title -->
   <!-- DIS choices -->
+  <string name="pref_camera_dis_entry_off">Inaktiv</string>
+  <string name="pref_camera_dis_entry_on">Aktiv</string>
   <!-- Select Face Recognition title -->
   <!-- Face Recognition choices -->
+  <string name="pref_camera_facerc_entry_off">Inaktiv</string>
+  <string name="pref_camera_facerc_entry_on">Aktiv</string>
   <!-- Settings screen, Multiple levels entries -->
   <!-- Settings screen, Multiple levels entries -->
   <!-- Settings screen, Multiple levels entries -->
@@ -135,28 +220,45 @@
   <!-- Settings screen, Select sharpness title -->
   <!-- Default contrast setting. Do not translate. -->
   <!-- Settings screen, Select contrast title -->
+  <string name="pref_camera_contrast_title">Kontrasti</string>
   <!-- Default saturation setting. Do not translate. -->
   <!-- Settings screen, Select saturation title -->
+  <string name="pref_camera_saturation_title">Saturimi</string>
   <!-- Default picture quality setting. See pref_camera_jpegquality_entryvalues for possible values -->
   <!-- Default Picture format setting. Do not translate. -->
   <!-- Settings screen, Select Picture format title -->
+  <string name="pref_camera_picture_format_title">Formati i fotos</string>
   <!-- Settings screen, picture format dialog radio button choices -->
   <!-- Picture format entry values. Do not translate. -->
   <!-- Settings screen, Picture quality title -->
+  <string name="pref_camera_jpegquality_title">Cilësia e fotos</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">E ulët</string>
+  <string name="pref_camera_jpegquality_entry_1">Standart</string>
+  <string name="pref_camera_jpegquality_entry_2">E lartë</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">Aktivizo</string>
+  <string name="pref_camera_histogram_entry_disable">Çaktivizo</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
+  <string name="pref_camera_scenedetect_title">Përcaktimi automatik i peizazhit</string>
   <!-- Settings menu, auto scene detection choices -->
+  <string name="pref_camera_scenedetect_entry_off">Inaktiv</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Aktiv</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Madhësi videoje e pavlefshme për regjistrim \'time-lapse\'.</string>
   <!-- longshot value -->
+  <string name="msg_cancel_longshot_for_limited_memory">Memoria po mbaron. Për këtë arsye profili i fotove të vazhdueshme do të çaktivizohet</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
   <!-- Settings screen, setting title text for Auto HDR-->
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Aktivizo</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Çaktivizo</string>
   <!-- toast message for storage location switch -->
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
@@ -167,11 +269,80 @@
   <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
+  <string name="pref_camera_video_rotation_title">Rrotullimi i videos</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">RROTULLIMI I VIDEOS</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
+  <string name="pref_camera_video_rotation_entry_0">0 gradë</string>
+  <string name="pref_camera_video_rotation_entry_90">90 gradë</string>
+  <string name="pref_camera_video_rotation_entry_180">180 gradë</string>
+  <string name="pref_camera_video_rotation_entry_270">270 gradë</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
   <!-- Continuous shot enable message -->
   <!-- Advanced features enable message -->
   <!-- The alas of CameraActivity for gesture operation -->
+  <string name="camera_gesture_title">Hap kamerën</string>
+  <string name="pref_camera_tsmakeup_title">Zbukurimi</string>
+  <string name="pref_camera_tsmakeup_entry_on">Aktiv</string>
+  <string name="pref_camera_tsmakeup_entry_off">Inaktiv</string>
+  <string name="pref_camera_tsmakeup_entry_low">I ulët</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Mesatar</string>
+  <string name="pref_camera_tsmakeup_entry_high">I lartë</string>
+  <string name="pref_camera_tsmakeup_custom">I personalizuar</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Zbardh</string>
+  <string name="pref_camera_tsmakeup_level_clean">Zbut</string>
+  <string name="text_tsmakeup_alert_title">Kujdes</string>
+  <string name="text_tsmakeup_alert_msg">Dallimi i fytyrës duhet të jetë aktivizuar nëse do të përdorësh funksionin e zbukurimit. Dëshiron të vazhdosh?</string>
+  <string name="text_tsmakeup_alert_continue">Vazhdo</string>
+  <string name="text_tsmakeup_alert_quit">Anullo</string>
+  <string name="text_tsmakeup_beautify_toast">Zbukuro</string>
+  <string name="refocus_prompt_message">Me UbiFocus, kamera do të bëjë 5 foto sa herë të shtypni butonin e shkrepjes. Këto 5 foto do të bashkohen në 1 foto të vetme ku çdo gjë do jetë në fokus. Ju mund të rifokusoni pasi të jetë bërë fotoja.</string>
+  <string name="camera_thermal_shutdown">Telefoni është i tejnxehur. Kamera do mbyllet.</string>
+  <string name="camera_server_died">Serveri i medias u fik. Kamera do mbyllet.</string>
+  <string name="camera_unknown_error">Gabim i panjohur, kamera po mbyllet.</string>
+  <string name="mute_button_desc">Butoni për të hequr zërin</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
+  <string name="help_menu_scene_mode_1">Zgjidh një</string>
+  <string name="help_menu_scene_mode_2">profil Peizazhi</string>
+  <string name="help_menu_scene_mode_3">për foto më të mira</string>
+  <string name="help_menu_color_filter_1">Apliko filtra</string>
+  <string name="help_menu_color_filter_2">ngjyrash</string>
+  <string name="help_menu_color_filter_3">për të</string>
+  <string name="help_menu_color_filter_4">përmirësuar fotot</string>
+  <string name="help_menu_beautify_1">Përmirëso portretet</string>
+  <string name="help_menu_beautify_2">me</string>
+  <string name="help_menu_beautify_3">funksionin Zbukuro</string>
+  <string name="help_menu_switcher_1">Zgjidh</string>
+  <string name="help_menu_switcher_2">midis</string>
+  <string name="help_menu_switcher_3">kamerës, videos dhe panoramës</string>
+  <string name="pref_camera2_camera2_title">Profili Camera2</string>
+  <string name="pref_camera2_camera2_entry_enable">Aktivizo</string>
+  <string name="pref_camera2_camera2_entry_disable">Çaktivizo</string>
+  <string name="pref_camera2_mono_only_title">Vetëm mono</string>
+  <string name="pref_camera2_mono_preview_title">Shikim paraprak Monokromatik</string>
+  <string name="pref_camera2_mono_preview_entry_on">Aktiv</string>
+  <string name="pref_camera2_mono_preview_entry_off">Inaktiv</string>
+  <string name="pref_camera2_clearsight_entry_on">Aktiv</string>
+  <string name="pref_camera2_clearsight_entry_off">Inaktiv</string>
+  <string name="clearsight_capture_success">Kapja ClearSight u krye me sukses</string>
+  <string name="clearsight_capture_fail">Kapja ClearSight dështoi</string>
+  <string name="pref_camera2_mpo_title">Formati MPO</string>
+  <string name="pref_camera2_mpo_entry_on">Aktiv</string>
+  <string name="pref_camera2_mpo_entry_off">Inaktiv</string>
+  <string name="pref_camera2_makeup_title">Makijazhi</string>
+  <string name="pref_camera2_noise_reduction_title">Reduktimi i zhurmave</string>
+  <string name="pref_camera2_noise_reduction_entry_off">Inaktiv</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">I shpejtë</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Me cilësi të lartë</string>
+  <string name="pref_camera2_videosnap_title">Madhësia automatike e fotos së çastit</string>
+  <string name="pref_camera2_videosnap_entry_enable">Aktivizo</string>
+  <string name="pref_camera2_videosnap_entry_disable">Çaktivizo</string>
+  <string name="pref_camera2_trackingfocus_title">Ndjekja e fokusit</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Fotoja më e mirë</string>
+  <string name="bestpicture_done">U KRYE</string>
+  <string name="bestpicture_at_least_one_picture">Duhet zgjedhur të paktën një foto.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Aktiv</string>
+  <string name="pref_camera2_shutter_sound_entry_off">Inaktiv</string>
+  <string name="pref_camera2_shutter_sound_title">Tingulli i shkrepjes</string>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index e25adc394..92bd15011 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -16,39 +16,81 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <string name="app_name">Kamera</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <string name="set_image">Cakto foton si</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <string name="delete">Fshi</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <plurals name="delete_selection">
+    <item quantity="one">Dëshiron ta fshish elementin e zgjedhur?</item>
+    <item quantity="other">Dëshiron t\'i fshish elementët e zgjedhur?</item>
+  </plurals>
+  <string name="share">Ndaj</string>
+  <string name="share_panorama">Ndaj panoramën</string>
+  <string name="share_as_photo">Ndaje si foto</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <string name="deleted">U fshi</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <string name="details">Detajet</string>
+  <string name="close">Mbyll</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d e zgjedhur</item>
+    <item quantity="other">%1$d të zgjedhura</item>
+  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d e zgjedhur</item>
+    <item quantity="other">%1$d të zgjedhura</item>
+  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d e zgjedhur</item>
+    <item quantity="other">%1$d të zgjedhura</item>
+  </plurals>
   <!-- String indicating timestamp of photo or video -->
+  <string name="show_on_map">Trego në hartë</string>
+  <string name="rotate_left">Rrotullo majtas</string>
+  <string name="rotate_right">Rrotullo djathtas</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
+  <string name="edit">Redakto</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <string name="crop_action">Prite</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <string name="trim_action">Shkurto</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <string name="set_as">Cakto si</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <string name="title">Titulli</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <string name="description">Përshkrimi</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="time">Ora</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <string name="location">Vendndodhja</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <string name="width">Gjerësia</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <string name="height">Lartësia</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <string name="orientation">Orientimi</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <string name="duration">Kohëzgjatja</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
@@ -59,6 +101,7 @@
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
@@ -75,22 +118,34 @@
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Largo</string>
   <!-- alert to the user to wait for some operation to complete -->
   <!-- alert to the user that an SD card must be installed before using the camera -->
+  <string name="no_storage" product="default">Fut një kartë SD përpara se të përdorësh kamerën.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
+  <string name="preparing_sd" product="default">Duke përgatitur kartën SD\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <string name="access_sd_fail" product="default">Karta SD nuk mund të aksesohet.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <string name="pref_camera_id_title">Zgjidh kamerën</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">E pasme</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">Vendndodhja GPS</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">VENDNDODHJA</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Hapësira ruajtëse</string>
+  <string name="pref_camera_savepath_entry_0">Në telefon</string>
+  <string name="pref_camera_savepath_entry_1">Në kartën SD</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <string name="setting_off">Inaktiv</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
@@ -119,9 +174,15 @@
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_auto">Automatik</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_on">Aktiv</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_off">Inaktiv</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label_auto">BLICI AUTOMATIK</string>
+  <string name="pref_camera_flashmode_label_on">BLICI AKTIV</string>
+  <string name="pref_camera_flashmode_label_off">BLICI INAKTIV</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
@@ -132,15 +193,25 @@
   <!-- Settings screen, Select Scene mode -->
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ AKTIV</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ INAKTIV</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR AKTIV</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR INAKTIV</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_action">Veprimi</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_night">Natë</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_sunset">Perëndim dielli</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_party">Festë</string>
   <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
@@ -148,44 +219,71 @@
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_off">KOHËMATESI INAKTIV</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_three">3 SEKONDA</string>
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 SEKONDA</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_fifteen">15 SEKONDA</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">HDR do të çaktivizojë profilin e shkrepjeve të vazhdueshme.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Funksioni \"Kapje fotoje e përparuar\" do të çaktivizojë profilin e shkrepjeve të vazhdueshme.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">Cilësia 4k e videos do të çaktivizojë stabilizimin e imazhit.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore nuk mund të aktivizohet gjatë një videoje 4k.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">Redukimi me cilësi të lartë i zhurmave në sfond do të çaktivizojë CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">Redukimi me cilësi të lartë i zhurmave në sfond do të çaktivizojë TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore do të çaktivizojë CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore do të çaktivizojë TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore do të çaktivizojë reduktimin e zhurmave.</string>
   <!-- Exposure settings in preference -->
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <string name="pref_exposure_label">EKSPOZIMI</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
+  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_back">KAMERA PARËSORE</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_front">KAMERA E PASME</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <string name="spaceIsLow_content" product="default">Karta SD është pothuajse e mbushur plot. Ndrysho parametrat e cilësisë ose fshi disa imazhe apo disa skedarë të tjerë.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <string name="pano_too_fast_prompt">Shumë shpejt</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <string name="pano_dialog_prepare_preview">Duke përgatitur panoramën</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <string name="pano_dialog_title">Panoramë</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <string name="pano_capture_indication">Duke kapur panoramën</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <string name="pano_dialog_waiting_previous">Duke pritur për panoramën e mëparshme</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <string name="pano_review_saving_indication_str">Duke ruajtur\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <string name="tap_to_focus">Prek për të fokusuar.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
+  <string name="pref_video_effect_title">Efektet</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
@@ -194,30 +292,45 @@
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_space">Në kozmos</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_sunset">Perëndim dielli</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_gallery">Videoja juaj</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <string name="video_snapshot_hint">Prek për të bërë foto gjatë regjistrimit.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <string name="video_recording_stopped">Regjistrimi i videos është ndaluar.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">SFONDI</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
   <!-- The menu button. [CHAR LIMIT = NONE] -->
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_mode_picker">Zgjedhësi i kamerës, videos, ose panoramës</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_camera">Kthe në foto</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_video">Kthe në video</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_panorama">Kthe në panoramë</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_photo_sphere">Kthe në Photo Sphere</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_gcam">Kthe në cilësi të lartë</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_on">AKTIV</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_off">INAKTIV</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_off">Inaktiv</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
@@ -228,47 +341,86 @@ CHAR LIMIT = NONE] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 sekonda</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 sekonda</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_15000">15 sekonda</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_24000">24 sekonda</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">0.5 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minutë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 orë</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_seconds">sekonda</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_minutes">minuta</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_hours">orë</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_interval_set">U krye</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <string name="set_time_interval">Cakto Intervalin Kohor</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <string name="set_duration">Cakto kohëzgjatjen në sekonda</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <string name="count_down_title_text">Duke numëruar mbrapsht për të shkrepur foton</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_no">Jo faleminderit</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_yes">Po</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
   <!-- settings label [CHAR LIMIT=50] -->
@@ -276,11 +428,18 @@ CHAR LIMIT = NONE] -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_zoom">Zmadho</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_rotate">Rrotullo</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <string name="crop_save">Ruaj</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <string name="cannot_load_image">Imazhi nuk mund të ngarkohet!</string>
   <!-- Label for album filmstrip button -->
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <string name="setting_wallpaper">Duke vendosur sfondin</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d të mbetura</string>
+  <string name="makeup_video_size_limit">Funksioni Makijazhi punon vetëm kur regjistrimi i videos bëhet me rezolucion VGA.</string>
 </resources>
diff --git a/res/values-sr/qcomstrings.xml b/res/values-sr/qcomstrings.xml
index 77dffacae..3a2336f98 100644
--- a/res/values-sr/qcomstrings.xml
+++ b/res/values-sr/qcomstrings.xml
@@ -344,7 +344,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Искључено</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Укљ</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Неважећа видео-величина за time-lapsе снимање.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Непрекидан снимак</string>
   <string name="msg_cancel_longshot_for_limited_memory">Понестаје меморије, искључујем непрекидно окидање</string>
@@ -353,6 +355,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Аутоматски HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Омогући</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Onemogući</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Простор унутрашњег складишта није довољан, пребачена локација складишта на SD картицу</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -370,6 +374,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Ротација видеа</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">РОТАЦИЈА ВИДЕА</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 степени</string>
   <string name="pref_camera_video_rotation_entry_90">90 степени</string>
@@ -384,6 +389,7 @@
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Покрени камеру</string>
   <string name="pref_camera_tsmakeup_title">Улепшавање</string>
+  <string name="pref_camera_tsmakeup_entry_on">Укљ</string>
   <string name="pref_camera_tsmakeup_entry_off">Искључено</string>
   <string name="pref_camera_tsmakeup_entry_low">Ниско</string>
   <string name="pref_camera_tsmakeup_entry_mid">Средње</string>
@@ -398,6 +404,9 @@
   <string name="all_in_focus">Све у фокусу</string>
   <string name="refocus_toast">Да поново фокусираш фото, додирни овде</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">ОК</string>
+  <string name="help_menu_scene_mode_1">Изабери а</string>
+  <string name="help_menu_scene_mode_2">Режим сцене</string>
   <string name="help_menu_scene_mode_3">за боље слике</string>
   <string name="help_menu_color_filter_1">Примена боје</string>
   <string name="help_menu_color_filter_2">филтери</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index da3c32a50..0ac20338d 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -46,6 +46,7 @@
   <string name="pref_camera_scenemode_entry_fireworks">Fyrverkerier</string>
   <string name="pref_camera_scenemode_entry_flowers">Blommor</string>
   <string name="pref_camera_scenemode_entry_handheldtwilight">Handhållen skymning</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">Hög känslighet</string>
   <string name="pref_camera_scenemode_entry_indoor">Inomhus</string>
   <string name="pref_camera_scenemode_entry_landscape">Landskap</string>
   <string name="pref_camera_scenemode_entry_mix_illuminant">Blandat ljus</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7d6743dda..64afa5582 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -179,6 +179,7 @@ Den beskurna bilden har sparats i <xliff:g id="folder_name">%s</xliff:g>.</strin
   <string name="pref_camera_timer_sound_title">Ljudsignal under nedräkningen</string>
   <!-- Entry of camera save path -->
   <string name="pref_camera_savepath_title">Lagring</string>
+  <string name="pref_camera_savepath_entry_0">Mobil</string>
   <string name="pref_camera_savepath_entry_1">SD-kort</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">Av</string>
-- 
cgit v1.2.3