From c8bffeccda8211021049a7cf1093bdede589a37f Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sun, 4 Feb 2018 19:53:26 +0200
Subject: Snap: Port all string improvements from lineage-16.0

* This is a mess

Change-Id: I91b46d2e54c78f55b31fa8b45156d74ca05e8027
---
 res/values/camera2arrays.xml |   16 +-
 res/values/qcomstrings.xml   | 1477 +++++++++++++++++++++---------------------
 res/values/strings.xml       |   36 +-
 3 files changed, 764 insertions(+), 765 deletions(-)

(limited to 'res')

diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 066c34c31..669546a9d 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -39,8 +39,8 @@
     </string-array>
 
     <string-array name="pref_camera2_mono_only_entries" translatable="true">
-        <item>On</item>
-        <item>Off</item>
+        <item>@string/pref_camera2_mono_only_entry_on</item>
+        <item>@string/pref_camera2_mono_only_entry_off</item>
     </string-array>
 
     <string-array name="pref_camera2_mono_only_entryvalues" translatable="false">
@@ -49,9 +49,9 @@
     </string-array>
 
     <string-array name="pref_camera2_initial_camera_entries" translatable="true">
-        <item>Bayer</item>
-        <item>Mono</item>
-        <item>Front</item>
+        <item>@string/pref_camera2_initial_camera_entry_bayer</item>
+        <item>@string/pref_camera2_initial_camera_entry_mono</item>
+        <item>@string/pref_camera2_initial_camera_entry_front</item>
     </string-array>
 
     <string-array name="pref_camera2_initial_camera_entryvalues" translatable="false">
@@ -89,8 +89,8 @@
     </string-array>
 
     <string-array name="pref_camera2_trackingfocus_entries" translatable="true">
-        <item>On</item>
-        <item>Off</item>
+        <item>@string/pref_camera2_trackingfocus_entry_on</item>
+        <item>@string/pref_camera2_trackingfocus_entry_off</item>
     </string-array>
 
     <string-array name="pref_camera2_trackingfocus_entryvalues" translatable="false">
@@ -1000,7 +1000,7 @@ for time lapse recording -->
     </string-array>
 
     <string-array name="pref_camera2_videoencoderprofile_entry" translatable="false">
-        <item>Off</item>
+        <item>@string/setting_off_value</item>
         <item>HLG</item>
         <item>HDR10</item>
     </string-array>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index b1cbe321e..8ab733f4f 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -4,6 +4,7 @@
     Not a Contribution.
 
     Copyright (C) 2007 The Android Open Source Project
+    Copyright (C) 2017-2018 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -29,173 +30,173 @@
     <string name="pref_video_quality_entry_qcif" translatable="false">QCIF</string>
 
     <!-- Settings screen, Power Mode title -->
-    <string name="pref_camera_powermode_title">Power Mode</string>
+    <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>
+    <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 -->
-    <string name="pref_camera_powermode_value_lp">Low_Power</string>
-    <string name="pref_camera_powermode_value_np">Normal_Power</string>
+    <string name="pref_camera_powermode_value_lp" translatable="false">Low_Power</string>
+    <string name="pref_camera_powermode_value_np" translatable="false">Normal_Power</string>
 
     <!-- Default Power mode.. -->
     <string name="pref_camera_powermode_default" translatable="false">Normal_Power</string>
 
     <!-- Default auto exposure setting. Do not translate. -->
-    <string name="pref_camera_autoexposure_default">frame-average</string>
+    <string name="pref_camera_autoexposure_default" translatable="false">frame-average</string>
     <!-- Settings screen, Select auto exposure title -->
-    <string name="pref_camera_autoexposure_title">Select Auto Exposure Mode</string>
+    <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">Center Weighted</string>
-    <string name="pref_camera_autoexposure_entry_spotmetering">Spot Metering</string>
+    <string name="pref_camera_autoexposure_entry_frameaverage">Frame average</string>
+    <string name="pref_camera_autoexposure_entry_centerweighted">Center weighted</string>
+    <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
 
     <!-- Auto exposure entry values. Do not translate. -->
-    <string name="pref_camera_autoexposure_value_frameaverage">frame-average</string>
-    <string name="pref_camera_autoexposure_value_centerweighted">center-weighted</string>
-    <string name="pref_camera_autoexposure_value_spotmetering">spot-metering</string>
+    <string name="pref_camera_autoexposure_value_frameaverage" translatable="false">frame-average</string>
+    <string name="pref_camera_autoexposure_value_centerweighted" translatable="false">center-weighted</string>
+    <string name="pref_camera_autoexposure_value_spotmetering" translatable="false">spot-metering</string>
 
     <!-- Settings screen, Video encoder title -->
-    <string name="pref_camera_videoencoder_title">Video Encoder</string>
+    <string name="pref_camera_videoencoder_title">Video codec</string>
 
     <!-- Settings screen, Video encoder dialog radio button choices -->
-    <string name="pref_camera_videoencoder_entry_0">MPEG4</string>
-    <string name="pref_camera_videoencoder_entry_1">H263</string>
-    <string name="pref_camera_videoencoder_entry_2">H264</string>
-    <string name="pref_camera_videoencoder_entry_3">H265</string>
+    <string name="pref_camera_videoencoder_entry_0" translatable="false">MPEG4</string>
+    <string name="pref_camera_videoencoder_entry_1" translatable="false">H263</string>
+    <string name="pref_camera_videoencoder_entry_2" translatable="false">H264</string>
+    <string name="pref_camera_videoencoder_entry_3" translatable="false">H265</string>
 
     <!-- Default video encoder setting. A numerical value. -->
     <string name="pref_camera_videoencoder_default" translatable="false">h264</string>
 
     <!-- Settings screen, Video encoder dialog title -->
-    <string name="pref_camera_videoencoder_dialogtitle">Video Encoder</string>
+    <string name="pref_camera_videoencoder_dialogtitle">Video codec</string>
 
     <!-- Default audio encoder setting. A numerical value. -->
     <string name="pref_camera_audioencoder_default" translatable="false">aac</string>
 
     <!-- Settings screen, Audio encoder title -->
-    <string name="pref_camera_audioencoder_title">Audio Encoder</string>
+    <string name="pref_camera_audioencoder_title">Audio codec</string>
 
     <!-- Settings screen, Audio encoder dialog radio button choices -->
-    <string name="pref_camera_audioencoder_entry_0">AMRNB</string>
-    <string name="pref_camera_audioencoder_entry_1">AAC</string>
+    <string name="pref_camera_audioencoder_entry_0" translatable="false">AMRNB</string>
+    <string name="pref_camera_audioencoder_entry_1" translatable="false">AAC</string>
 
     <!-- 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>
+    <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. -->
-    <string name="pref_camera_skinToneEnhancement_value_enable">enable</string>
-    <string name="pref_camera_skinToneEnhancement_value_disable">disable</string>
+    <string name="pref_camera_skinToneEnhancement_value_enable" translatable="false">enable</string>
+    <string name="pref_camera_skinToneEnhancement_value_disable" translatable="false">disable</string>
     <!-- Settings screen, setting title text for ZSL-->
-    <string name="pref_camera_zsl_title">ZSL</string>
+    <string name="pref_camera_zsl_title">Zero shutter lag</string>
 
     <string name="pref_camera_zsl_default" translatable="false">on</string>
 
-         <!-- Default selectable zone af setting. Do not translate. -->
-     <string name="pref_camera_selectablezoneaf_default">auto</string>
-
-     <!-- Settings screen, Selectable zone af title -->
-     <string name="pref_camera_selectablezoneaf_title"> Selectable Zone Auto Focus</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">Center Weighted</string>
-     <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame Average</string>
-
-     <!-- Auto exposure entry values. Do not translate. -->
-     <string name="pref_camera_selectablezoneaf_value_auto">auto</string>
-     <string name="pref_camera_selectablezoneaf_value_spotmetering">spot-metering</string>
-     <string name="pref_camera_selectablezoneaf_value_centerweighted">center-weighted</string>
-     <string name="pref_camera_selectablezoneaf_value_frameaverage">frame-average</string>
-
-     <string name="pref_camera_advanced_feature_default">none</string>
-
-     <!-- 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_ubifocus">Ubi Focus</string>
-     <string name="pref_camera_advanced_feature_entry_refocus">Refocus</string>
-     <string name="pref_camera_advanced_feature_entry_chromaflash">Chroma Flash</string>
-     <string name="pref_camera_advanced_feature_entry_optizoom">Opti Zoom</string>
-     <string name="pref_camera_advanced_feature_entry_FSSR">FSSR</string>
-     <string name="pref_camera_advanced_feature_entry_trueportrait">True Portrait</string>
-     <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Multi-touch Focus</string>
-     <string name="pref_camera_advanced_feature_entry_stillmore">Still More</string>
-
-     <!-- Auto exposure entry values. Do not translate. -->
-     <string name="pref_camera_advanced_feature_value_none">none</string>
-     <string name="pref_camera_advanced_feature_value_ubifocus_on">af-bracket-on</string>
-     <string name="pref_camera_advanced_feature_value_refocus_on">re-focus-on</string>
-     <string name="pref_camera_advanced_feature_value_chromaflash_on">chroma-flash-on</string>
-     <string name="pref_camera_advanced_feature_value_optizoom_on">opti-zoom-on</string>
-     <string name="pref_camera_advanced_feature_value_FSSR_on">FSSR-on</string>
-     <string name="pref_camera_advanced_feature_value_trueportrait_on">true-portrait-on</string>
-     <string name="pref_camera_advanced_feature_value_multi_touch_focus_on">multi-touch-focus-on</string>
-     <string name="pref_camera_advanced_feature_value_stillmore_on">still-more-on</string>
-
-     <string name="pref_camera_advanced_feature_value_ubifocus_off">af-bracket-off</string>
-     <string name="pref_camera_advanced_feature_value_refocus_off">re-focus-off</string>
-     <string name="pref_camera_advanced_feature_value_chromaflash_off">chroma-flash-off</string>
-     <string name="pref_camera_advanced_feature_value_optizoom_off">opti-zoom-off</string>
-     <string name="pref_camera_advanced_feature_value_FSSR_off">FSSR-off</string>
-     <string name="pref_camera_advanced_feature_value_trueportrait_off">true-portrait-off</string>
-     <string name="pref_camera_advanced_feature_value_multi_touch_focus_off">multi-touch-focus-off</string>
-     <string name="pref_camera_advanced_feature_value_stillmore_off">still-more-off</string>
-
-     <!-- 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>
+    <!-- Default selectable zone af setting. Do not translate. -->
+    <string name="pref_camera_selectablezoneaf_default" translatable="false">auto</string>
+
+    <!-- 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">Center weighted</string>
+    <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame average</string>
+
+    <!-- Auto exposure entry values. Do not translate. -->
+    <string name="pref_camera_selectablezoneaf_value_auto" translatable="false">auto</string>
+    <string name="pref_camera_selectablezoneaf_value_spotmetering" translatable="false">spot-metering</string>
+    <string name="pref_camera_selectablezoneaf_value_centerweighted" translatable="false">center-weighted</string>
+    <string name="pref_camera_selectablezoneaf_value_frameaverage" translatable="false">frame-average</string>
+
+    <string name="pref_camera_advanced_feature_default" translatable="false">none</string>
+
+    <!-- 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_ubifocus" translatable="false">UbiFocus</string>
+    <string name="pref_camera_advanced_feature_entry_refocus" translatable="false">ReFocus</string>
+    <string name="pref_camera_advanced_feature_entry_chromaflash" translatable="false">ChromaFlash</string>
+    <string name="pref_camera_advanced_feature_entry_optizoom" translatable="false">OptiZoom</string>
+    <string name="pref_camera_advanced_feature_entry_FSSR" translatable="false">FSSR</string>
+    <string name="pref_camera_advanced_feature_entry_trueportrait" translatable="false">TruPortrait</string>
+    <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Multi-touch Focus</string>
+    <string name="pref_camera_advanced_feature_entry_stillmore" translatable="false">Still More</string>
+
+    <!-- Auto exposure entry values. Do not translate. -->
+    <string name="pref_camera_advanced_feature_value_none" translatable="false">none</string>
+    <string name="pref_camera_advanced_feature_value_ubifocus_on" translatable="false">af-bracket-on</string>
+    <string name="pref_camera_advanced_feature_value_refocus_on" translatable="false">re-focus-on</string>
+    <string name="pref_camera_advanced_feature_value_chromaflash_on" translatable="false">chroma-flash-on</string>
+    <string name="pref_camera_advanced_feature_value_optizoom_on" translatable="false">opti-zoom-on</string>
+    <string name="pref_camera_advanced_feature_value_FSSR_on" translatable="false">FSSR-on</string>
+    <string name="pref_camera_advanced_feature_value_trueportrait_on" translatable="false">true-portrait-on</string>
+    <string name="pref_camera_advanced_feature_value_multi_touch_focus_on" translatable="false">multi-touch-focus-on</string>
+    <string name="pref_camera_advanced_feature_value_stillmore_on" translatable="false">still-more-on</string>
+
+    <string name="pref_camera_advanced_feature_value_ubifocus_off" translatable="false">af-bracket-off</string>
+    <string name="pref_camera_advanced_feature_value_refocus_off" translatable="false">re-focus-off</string>
+    <string name="pref_camera_advanced_feature_value_chromaflash_off" translatable="false">chroma-flash-off</string>
+    <string name="pref_camera_advanced_feature_value_optizoom_off" translatable="false">opti-zoom-off</string>
+    <string name="pref_camera_advanced_feature_value_FSSR_off" translatable="false">FSSR-off</string>
+    <string name="pref_camera_advanced_feature_value_trueportrait_off" translatable="false">true-portrait-off</string>
+    <string name="pref_camera_advanced_feature_value_multi_touch_focus_off" translatable="false">multi-touch-focus-off</string>
+    <string name="pref_camera_advanced_feature_value_stillmore_off" translatable="false">still-more-off</string>
+
+    <!-- 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_gains_priority">Gains priority</string>
-     <string name="pref_camera_manual_exp_entry_off">Off</string>
-
-     <string name="pref_camera_manual_exp_default">off</string>
-     <string name="pref_camera_manual_exp_value_ISO_priority">iso-priority</string>
-     <string name="pref_camera_manual_exp_value_exptime_priority">exp-time-priority</string>
-     <string name="pref_camera_manual_exp_value_user_setting">user-setting</string>
-    <string name="pref_camera_manual_exp_value_gains_priority">gains-priority</string>
-     <string name="pref_camera_manual_exp_value_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">Color temperature</string>
-     <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
-     <string name="pref_camera_manual_wb_entry_off">Off</string>
-
-     <string name="pref_camera_manual_wb_default">off</string>
-     <string name="pref_camera_manual_wb_value_color_temperature">color-temperature</string>
-     <string name="pref_camera_manual_wb_value_rbgb_gains">rbgb-gains</string>
-     <string name="pref_camera_manual_wb_value_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>
-
-     <string name="pref_camera_manual_focus_default">off</string>
-     <string name="pref_camera_manual_focus_value_scale_mode">scale-mode</string>
-     <string name="pref_camera_manual_focus_value_diopter_mode">diopter-mode</string>
-     <string name="pref_camera_manual_focus_value_off">off</string>
+    <string name="pref_camera_manual_exp_entry_off">Off</string>
+
+    <string name="pref_camera_manual_exp_default" translatable="false">off</string>
+    <string name="pref_camera_manual_exp_value_ISO_priority" translatable="false">iso-priority</string>
+    <string name="pref_camera_manual_exp_value_exptime_priority" translatable="false">exp-time-priority</string>
+    <string name="pref_camera_manual_exp_value_user_setting" translatable="false">user-setting</string>
+    <string name="pref_camera_manual_exp_value_gains_priority" translatable="false">gains-priority</string>
+    <string name="pref_camera_manual_exp_value_off" translatable="false">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">Color temperature</string>
+    <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
+    <string name="pref_camera_manual_wb_entry_off">Off</string>
+
+    <string name="pref_camera_manual_wb_default" translatable="false">off</string>
+    <string name="pref_camera_manual_wb_value_color_temperature" translatable="false">color-temperature</string>
+    <string name="pref_camera_manual_wb_value_rbgb_gains" translatable="false">rbgb-gains</string>
+    <string name="pref_camera_manual_wb_value_off" translatable="false">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>
+
+    <string name="pref_camera_manual_focus_default" translatable="false">off</string>
+    <string name="pref_camera_manual_focus_value_scale_mode" translatable="false">scale-mode</string>
+    <string name="pref_camera_manual_focus_value_diopter_mode" translatable="false">diopter-mode</string>
+    <string name="pref_camera_manual_focus_value_off" translatable="false">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>
+    <string name="pref_camera_instant_capture_title">Instant capture</string>
+    <string name="pref_camera_instant_capture_entry_aggressive_aec">Aggressive AEC</string>
+    <string name="pref_camera_instant_capture_entry_fast_aec">Fast AEC</string>
+    <string name="pref_camera_instant_capture_entry_disable">Disable</string>
 
     <!-- Instant Capture entry values -->
     <string name="pref_camera_instant_capture_default" translatable="false">0</string>
@@ -207,8 +208,8 @@
     <string name="pref_camera_zsl_entry_off">Off</string>
     <string name="pref_camera_zsl_entry_on">On</string>
 
-    <string name="pref_camera_zsl_value_off">off</string>
-    <string name="pref_camera_zsl_value_on">on</string>
+    <string name="pref_camera_zsl_value_off" translatable="false">off</string>
+    <string name="pref_camera_zsl_value_on" translatable="false">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>
@@ -218,42 +219,42 @@
     <string name="pref_camera_video_hdr_entry_off">Off</string>
     <string name="pref_camera_video_hdr_entry_on">On</string>
 
-    <string name="pref_camera_video_hdr_value_off">off</string>
-    <string name="pref_camera_video_hdr_value_on">on</string>
+    <string name="pref_camera_video_hdr_value_off" translatable="false">off</string>
+    <string name="pref_camera_video_hdr_value_on" translatable="false">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>
 
-    <string name="pref_camera_cds_value_off">off</string>
-    <string name="pref_camera_cds_value_on">on</string>
-    <string name="pref_camera_cds_value_auto">auto</string>
+    <string name="pref_camera_cds_value_off" translatable="false">off</string>
+    <string name="pref_camera_cds_value_on" translatable="false">on</string>
+    <string name="pref_camera_cds_value_auto" translatable="false">auto</string>
 
-     <!-- Settings screen, video CDS location dialog choices -->
+    <!-- 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>
 
-    <string name="pref_camera_video_cds_value_off">off</string>
-    <string name="pref_camera_video_cds_value_on">on</string>
-    <string name="pref_camera_video_cds_value_auto">auto</string>
+    <string name="pref_camera_video_cds_value_off" translatable="false">off</string>
+    <string name="pref_camera_video_cds_value_on" translatable="false">on</string>
+    <string name="pref_camera_video_cds_value_auto" translatable="false">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 -->
-    <string name="pref_camera_tnr_value_off">off</string>
-    <string name="pref_camera_tnr_value_on">on</string>
+    <string name="pref_camera_tnr_value_off" translatable="false">off</string>
+    <string name="pref_camera_tnr_value_on" translatable="false">on</string>
 
     <!-- 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 -->
-    <string name="pref_camera_video_tnr_value_off">off</string>
-    <string name="pref_camera_video_tnr_value_on">on</string>
+    <string name="pref_camera_video_tnr_value_off" translatable="false">off</string>
+    <string name="pref_camera_video_tnr_value_on" translatable="false">on</string>
 
     <!-- Settings screen, setting title text for Video HDR-->
     <string name="pref_camera_video_hdr_title">Video HDR</string>
@@ -272,7 +273,7 @@
     <!-- Default video cds mode setting-->
     <string name="pref_camera_video_cds_default" translatable="false">off</string>
 
-     <!-- Settings menu, setting title text for tnr mode-->
+    <!-- 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-->
@@ -288,7 +289,7 @@
     <string name="pref_camera_facedetection_default" translatable="false">off</string>
 
     <!-- Settings screen, Select Face Detection -->
-    <string name="pref_camera_facedetection_title">Face Detection</string>
+    <string name="pref_camera_facedetection_title">Face detection</string>
 
     <!-- Settings menu, Face Detection choices -->
     <string name="pref_camera_facedetection_entry_off">Off</string>
@@ -298,248 +299,237 @@
     <string name="pref_selfie_flash_default" translatable="false">off</string>
 
     <!-- Settings screen, Selfie Flash Detection -->
-    <string name="pref_selfie_flash_title">Selfie Flash</string>
+    <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. -->
-     <string name="pref_camera_redeyereduction_default" translatable="false">disable</string>
+    <!-- Default redeye reduction setting. -->
+    <string name="pref_camera_redeyereduction_default" translatable="false">disable</string>
 
-     <!-- Settings screen, Select Redeye Reduction -->
-     <string name="pref_camera_redeyereduction_title">Redeye Reduction</string>
+    <!-- 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>
+    <!-- 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_default" translatable="false">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_selfiemirror_default" translatable="false">disable</string>
+    <string name="pref_camera_selfiemirror_title">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_default" translatable="false">enable</string>
-     <string name="pref_camera_shuttersound_title" translatable="true">Shutter Sound</string>
-     <string name="pref_camera_shuttersound_entry_enable">Enable</string>
-     <string name="pref_camera_shuttersound_entry_disable">Disable</string>
+    <string name="pref_camera_shuttersound_default" translatable="false">enable</string>
+    <string name="pref_camera_shuttersound_title">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. -->
-     <string name="pref_camera_mce_default">enable</string>
+    <!-- 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 Stabilization/Time lapse/HDR.</string>
 
-     <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
-     <string name="error_app_unsupported_hfr_selection">HFR/HSR is not supported for Image Stabilization/TimeLapse/HDR</string>
+    <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
+    <string name="error_app_unsupported_hfr">Slow motion 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 resolution for HFR mode -->
-     <string name="error_app_unsupported_hfr">HFR is not supported for selected resolution</string>
+    <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
+    <string name="error_app_unsupported_dis">Stabilization 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">Unsupported video resolution for Image Stabilization</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 resolution for HSR mode -->
-     <string name="error_app_unsupported_hsr">
-         HSR is not supported for selected resolution
-     </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 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 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 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 zsl mode, change to JPEG
-    </string>
+    <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-Bracket</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_value_ae_bracket">AE-Bracket</string>
+    <string name="pref_camera_ae_bracket_hdr_value_ae_bracket" translatable="false">AE-Bracket</string>
 
-     <string name="pref_camera_ae_bracket_hdr_title">AE-Bracket</string>
+    <string name="pref_camera_ae_bracket_hdr_title">AE bracketing</string>
 
-     <string name="pref_camera_ae_bracket_hdr_default" translatable="false">Off</string>
+    <string name="pref_camera_ae_bracket_hdr_default" translatable="false">Off</string>
 
-     <string name="pref_camera_ae_bracket_hdr_entry_on">On</string>
+    <string name="pref_camera_ae_bracket_hdr_entry_on">On</string>
 
-     <string name="pref_camera_ae_bracket_hdr_entry_off">Off</string>
+    <string name="pref_camera_ae_bracket_hdr_entry_off">Off</string>
 
-     <string name="err_app_unsupport_ae_bracket_code">no ae bracket support by Apps now</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 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 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">We do not support picture
-        resolution in Low Power Mode. Video size snapshot will be taken. Please
-        select High power mode for picture size.
-    </string>
+    <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 supported for this resolution. </string>
-
-     <!-- Default hfr setting. Do not translate. -->
-     <string name="pref_camera_hfr_default">off</string>
-
-     <!-- Settings screen, Select hfr title -->
-     <string name="pref_camera_hfr_title">Video High FrameRate</string>
-
-     <!-- Settings screen, hfr radio button choices -->
-     <string name="pref_camera_hfr_entry_off">Off</string>
-     <string name="pref_camera_hfr_entry_2x">HFR 60</string>
-     <string name="pref_camera_hfr_entry_3x">HFR 90</string>
-     <string name="pref_camera_hfr_entry_4x">HFR 120</string>
-     <string name="pref_camera_hfr_entry_8x">HFR 240</string>
-     <string name="pref_camera_hfr_entry_16x">HFR 480</string>
-     <string name="pref_camera_hfr_entry_hsr_60">HSR 60</string>
-     <string name="pref_camera_hfr_entry_hsr_90">HSR 90</string>
-     <string name="pref_camera_hfr_entry_hsr_120">HSR 120</string>
-     <string name="pref_camera_hfr_entry_hsr_240">HSR 240</string>
-     <string name="pref_camera_hfr_entry_hsr_480">HSR 480</string>
-
-     <!-- HFR entry values. Do not translate. -->
-     <string name="pref_camera_hfr_value_off">off</string>
-     <string name="pref_camera_hfr_value_2x">hfr60</string>
-     <string name="pref_camera_hfr_value_3x">hfr90</string>
-     <string name="pref_camera_hfr_value_4x">hfr120</string>
-     <string name="pref_camera_hfr_value_8x">hfr240</string>
-     <string name="pref_camera_hfr_value_16x">hfr480</string>
-     <string name="pref_camera_hfr_value_hsr_60">hsr60</string>
-     <string name="pref_camera_hfr_value_hsr_90">hsr90</string>
-     <string name="pref_camera_hfr_value_hsr_120">hsr120</string>
-     <string name="pref_camera_hfr_value_hsr_240">hsr240</string>
-     <string name="pref_camera_hfr_value_hsr_480">hsr480</string>
-
-     <!-- Default noise reduction setting. Do not translate. -->
-     <string name="pref_camera_noise_reduction_default">off</string>
-
-     <!-- 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. -->
-     <string name="pref_camera_noise_reduction_value_off">off</string>
-     <string name="pref_camera_noise_reduction_value_fast">fast</string>
-     <string name="pref_camera_noise_reduction_value_high_quality">high-quality</string>
-
-     <!-- Default see more setting. Do not translate. -->
-     <string name="pref_camera_see_more_default">off</string>
-
-     <!-- Settings screen, Select See More title -->
-     <string name="pref_camera_see_more_title">See More</string>
-
-     <!-- 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. -->
-     <string name="pref_camera_see_more_value_off">off</string>
-     <string name="pref_camera_see_more_value_on">on</string>
-
-        <!-- Denoise Settings screen, setting title text -->
-    <string name="pref_camera_denoise_title">Wavelet Denoise Mode</string>
+    <string name="snapshot_qcif_and_d1">Only video size snapshot is supported for this resolution.</string>
+
+    <!-- Default hfr setting. Do not translate. -->
+    <string name="pref_camera_hfr_default" translatable="false">off</string>
+
+    <!-- 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_16x">Slow motion 480 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>
+    <string name="pref_camera_hfr_entry_hsr_480">High speed 480 FPS</string>
+
+    <!-- HFR entry values. Do not translate. -->
+    <string name="pref_camera_hfr_value_off" translatable="false">off</string>
+    <string name="pref_camera_hfr_value_2x" translatable="false">hfr60</string>
+    <string name="pref_camera_hfr_value_3x" translatable="false">hfr90</string>
+    <string name="pref_camera_hfr_value_4x" translatable="false">hfr120</string>
+    <string name="pref_camera_hfr_value_8x" translatable="false">hfr240</string>
+    <string name="pref_camera_hfr_value_16x" translatable="false">hfr480</string>
+    <string name="pref_camera_hfr_value_hsr_60" translatable="false">hsr60</string>
+    <string name="pref_camera_hfr_value_hsr_90" translatable="false">hsr90</string>
+    <string name="pref_camera_hfr_value_hsr_120" translatable="false">hsr120</string>
+    <string name="pref_camera_hfr_value_hsr_240" translatable="false">hsr240</string>
+    <string name="pref_camera_hfr_value_hsr_480" translatable="false">hsr480</string>
+
+    <!-- Default noise reduction setting. Do not translate. -->
+    <string name="pref_camera_noise_reduction_default" translatable="false">off</string>
+
+    <!-- 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. -->
+    <string name="pref_camera_noise_reduction_value_off" translatable="false">off</string>
+    <string name="pref_camera_noise_reduction_value_fast" translatable="false">fast</string>
+    <string name="pref_camera_noise_reduction_value_high_quality" translatable="false">high-quality</string>
+
+    <!-- Default see more setting. Do not translate. -->
+    <string name="pref_camera_see_more_default" translatable="false">off</string>
+
+    <!-- Settings screen, Select See More title -->
+    <string name="pref_camera_see_more_title" translatable="false">SeeMore</string>
+
+    <!-- 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. -->
+    <string name="pref_camera_see_more_value_off" translatable="false">off</string>
+    <string name="pref_camera_see_more_value_on" translatable="false">on</string>
+
+    <!-- Denoise Settings screen, setting title text -->
+    <string name="pref_camera_denoise_title">Denoise</string>
     <string name="pref_camera_denoise_default" translatable="false">denoise-on</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. -->
-     <string name="pref_camera_iso_default">auto</string>
-
-     <!-- 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">ISO Auto(HJR)</string>
-     <string name="pref_camera_iso_entry_iso50">ISO50</string>
-     <string name="pref_camera_iso_entry_iso100">ISO100</string>
-     <string name="pref_camera_iso_entry_iso125">ISO125</string>
-     <string name="pref_camera_iso_entry_iso150">ISO150</string>
-     <string name="pref_camera_iso_entry_iso200">ISO200</string>
-     <string name="pref_camera_iso_entry_iso250">ISO250</string>
-     <string name="pref_camera_iso_entry_iso300">ISO300</string>
-     <string name="pref_camera_iso_entry_iso320">ISO320</string>
-     <string name="pref_camera_iso_entry_iso350">ISO350</string>
-     <string name="pref_camera_iso_entry_iso400">ISO400</string>
-     <string name="pref_camera_iso_entry_iso450">ISO450</string>
-     <string name="pref_camera_iso_entry_iso500">ISO500</string>
-     <string name="pref_camera_iso_entry_iso600">ISO600</string>
-     <string name="pref_camera_iso_entry_iso640">ISO640</string>
-     <string name="pref_camera_iso_entry_iso700">ISO700</string>
-     <string name="pref_camera_iso_entry_iso800">ISO800</string>
-     <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
-     <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
-     <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
-     <string name="pref_camera_iso_entry_iso1500">ISO1500</string>
-     <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
-     <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
-     <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
-     <string name="pref_camera_iso_entry_iso2700">ISO2700</string>
-     <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
-     <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
-     <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
-
-     <!-- ISO entry values. Do not translate. -->
-     <string name="pref_camera_iso_value_auto">auto</string>
-     <string name="pref_camera_iso_value_isodeblur">ISO_HJR</string>
-     <string name="pref_camera_iso_value_iso50">ISO50</string>
-     <string name="pref_camera_iso_value_iso100">ISO100</string>
-     <string name="pref_camera_iso_value_iso125">ISO125</string>
-     <string name="pref_camera_iso_value_iso150">ISO150</string>
-     <string name="pref_camera_iso_value_iso200">ISO200</string>
-     <string name="pref_camera_iso_value_iso250">ISO250</string>
-     <string name="pref_camera_iso_value_iso300">ISO300</string>
-     <string name="pref_camera_iso_value_iso320">ISO320</string>
-     <string name="pref_camera_iso_value_iso350">ISO350</string>
-     <string name="pref_camera_iso_value_iso400">ISO400</string>
-     <string name="pref_camera_iso_value_iso450">ISO450</string>
-     <string name="pref_camera_iso_value_iso500">ISO500</string>
-     <string name="pref_camera_iso_value_iso600">ISO600</string>
-     <string name="pref_camera_iso_value_iso640">ISO640</string>
-     <string name="pref_camera_iso_value_iso700">ISO700</string>
-     <string name="pref_camera_iso_value_iso800">ISO800</string>
-     <string name="pref_camera_iso_value_iso1000">ISO1000</string>
-     <string name="pref_camera_iso_value_iso1200">ISO1200</string>
-     <string name="pref_camera_iso_value_iso1250">ISO1250</string>
-     <string name="pref_camera_iso_value_iso1500">ISO1500</string>
-     <string name="pref_camera_iso_value_iso1600">ISO1600</string>
-     <string name="pref_camera_iso_value_iso2000">ISO2000</string>
-     <string name="pref_camera_iso_value_iso2500">ISO2500</string>
-     <string name="pref_camera_iso_value_iso2700">ISO2700</string>
-     <string name="pref_camera_iso_value_iso3200">ISO3200</string>
-     <string name="pref_camera_iso_value_iso6400">ISO6400</string>
-     <string name="pref_camera_iso_value_iso12800">ISO12800</string>
-
-     <!-- Settings screen, Anti Banding title -->
-     <string name="pref_camera_antibanding_title">Anti Banding</string>
-
-     <!-- Default Anti Banding setting. -->
-     <string name="pref_camera_antibanding_default">auto</string>
-
-     <!-- Settings screen, Anti Banding entries -->
-     <string name="pref_camera_antibanding_entry_0">Auto</string>
-     <string name="pref_camera_antibanding_entry_1">50 Hz (Europe)</string>
-     <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
-
-        <!-- Default color effect setting. -->
+    <!-- Default iso setting. Do not translate. -->
+    <string name="pref_camera_iso_default" translatable="false">auto</string>
+
+    <!-- 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_iso50">ISO50</string>
+    <string name="pref_camera_iso_entry_iso100">ISO100</string>
+    <string name="pref_camera_iso_entry_iso125">ISO125</string>
+    <string name="pref_camera_iso_entry_iso150">ISO150</string>
+    <string name="pref_camera_iso_entry_iso200">ISO200</string>
+    <string name="pref_camera_iso_entry_iso250">ISO250</string>
+    <string name="pref_camera_iso_entry_iso300">ISO300</string>
+    <string name="pref_camera_iso_entry_iso320">ISO320</string>
+    <string name="pref_camera_iso_entry_iso350">ISO350</string>
+    <string name="pref_camera_iso_entry_iso400">ISO400</string>
+    <string name="pref_camera_iso_entry_iso450">ISO450</string>
+    <string name="pref_camera_iso_entry_iso500">ISO500</string>
+    <string name="pref_camera_iso_entry_iso600">ISO600</string>
+    <string name="pref_camera_iso_entry_iso640">ISO640</string>
+    <string name="pref_camera_iso_entry_iso700">ISO700</string>
+    <string name="pref_camera_iso_entry_iso800">ISO800</string>
+    <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+    <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+    <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
+    <string name="pref_camera_iso_entry_iso1500">ISO1500</string>
+    <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+    <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+    <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+    <string name="pref_camera_iso_entry_iso2700">ISO2700</string>
+    <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+    <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+    <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
+
+    <!-- ISO entry values. Do not translate. -->
+    <string name="pref_camera_iso_value_auto" translatable="false">auto</string>
+    <string name="pref_camera_iso_value_isodeblur" translatable="false">ISO_HJR</string>
+    <string name="pref_camera_iso_value_iso50" translatable="false">ISO50</string>
+    <string name="pref_camera_iso_value_iso100" translatable="false">ISO100</string>
+    <string name="pref_camera_iso_value_iso125" translatable="false">ISO125</string>
+    <string name="pref_camera_iso_value_iso150" translatable="false">ISO150</string>
+    <string name="pref_camera_iso_value_iso200" translatable="false">ISO200</string>
+    <string name="pref_camera_iso_value_iso250" translatable="false">ISO250</string>
+    <string name="pref_camera_iso_value_iso300" translatable="false">ISO300</string>
+    <string name="pref_camera_iso_value_iso320" translatable="false">ISO320</string>
+    <string name="pref_camera_iso_value_iso350" translatable="false">ISO350</string>
+    <string name="pref_camera_iso_value_iso400" translatable="false">ISO400</string>
+    <string name="pref_camera_iso_value_iso450" translatable="false">ISO450</string>
+    <string name="pref_camera_iso_value_iso500" translatable="false">ISO500</string>
+    <string name="pref_camera_iso_value_iso600" translatable="false">ISO600</string>
+    <string name="pref_camera_iso_value_iso640" translatable="false">ISO640</string>
+    <string name="pref_camera_iso_value_iso700" translatable="false">ISO700</string>
+    <string name="pref_camera_iso_value_iso800" translatable="false">ISO800</string>
+    <string name="pref_camera_iso_value_iso1000" translatable="false">ISO1000</string>
+    <string name="pref_camera_iso_value_iso1200" translatable="false">ISO1200</string>
+    <string name="pref_camera_iso_value_iso1250" translatable="false">ISO1250</string>
+    <string name="pref_camera_iso_value_iso1500" translatable="false">ISO1500</string>
+    <string name="pref_camera_iso_value_iso1600" translatable="false">ISO1600</string>
+    <string name="pref_camera_iso_value_iso2000" translatable="false">ISO2000</string>
+    <string name="pref_camera_iso_value_iso2500" translatable="false">ISO2500</string>
+    <string name="pref_camera_iso_value_iso2700" translatable="false">ISO2700</string>
+    <string name="pref_camera_iso_value_iso3200" translatable="false">ISO3200</string>
+    <string name="pref_camera_iso_value_iso6400" translatable="false">ISO6400</string>
+    <string name="pref_camera_iso_value_iso12800" translatable="false">ISO12800</string>
+
+    <!-- Settings screen, Anti Banding title -->
+    <string name="pref_camera_antibanding_title">Antibanding</string>
+
+    <!-- Default Anti Banding setting. -->
+    <string name="pref_camera_antibanding_default" translatable="false">auto</string>
+
+    <!-- Settings screen, Anti Banding entries -->
+    <string name="pref_camera_antibanding_entry_0">Auto</string>
+    <string name="pref_camera_antibanding_entry_1">50 Hz (Europe)</string>
+    <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
+
+    <!-- Default color effect setting. -->
     <string name="pref_camera_coloreffect_default" translatable="false">none</string>
     <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">Color effect Level</string>
-    <string name="pref_camera_filter_mode_title">Color effect Mode</string>
+    <string name="pref_camera_coloreffect_title">Color effect</string>
+    <string name="pref_camera_filter_mode_title">Color effect</string>
 
     <!-- Settings screen, Color effect dialog radio button choices -->
     <string name="pref_camera_coloreffect_entry_none">None</string>
@@ -560,20 +550,20 @@
     <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
 
     <!-- Select IS title -->
-    <string name="pref_camera_dis_title">Image Stabilization</string>
+    <string name="pref_camera_dis_title">Stabilization</string>
+    <string name="pref_camera_dis_default" translatable="false">disable</string>
 
     <!-- DIS choices -->
     <string name="pref_camera_dis_entry_off">Off</string>
     <string name="pref_camera_dis_entry_on">On</string>
 
-    <string name="pref_camera_dis_default">disable</string>
-    <string name="pref_camera_dis_value_disable">disable</string>
-    <string name="pref_camera_dis_value_enable">enable</string>
+    <string name="pref_camera_dis_value_disable" translatable="false">disable</string>
+    <string name="pref_camera_dis_value_enable" translatable="false">enable</string>
 
     <!-- Select Face Recognition title -->
-    <string name="pref_camera_facerc_title">Face Recognition</string>
+    <string name="pref_camera_facerc_title">Face recognition</string>
 
-    <string name="pref_camera_facerc_default">off</string>
+    <string name="pref_camera_facerc_default" translatable="false">off</string>
 
     <!-- Face Recognition choices -->
     <string name="pref_camera_facerc_entry_off">Off</string>
@@ -582,7 +572,7 @@
     <!-- 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_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>
@@ -594,7 +584,7 @@
     <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_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>
@@ -607,7 +597,7 @@
     <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_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>
@@ -615,19 +605,19 @@
     <string name="pref_camera_saturation_entry_level10">Level 10</string>
 
     <!-- Default sharpness setting. Do not translate. -->
-    <string name="pref_camera_sharpness_default">2</string>
+    <string name="pref_camera_sharpness_default" translatable="false">2</string>
 
     <!-- Settings screen, Select sharpness title -->
     <string name="pref_camera_sharpness_title">Sharpness</string>
 
     <!-- Default contrast setting. Do not translate. -->
-    <string name="pref_camera_contrast_default">5</string>
+    <string name="pref_camera_contrast_default" translatable="false">5</string>
 
     <!-- Settings screen, Select contrast title -->
     <string name="pref_camera_contrast_title">Contrast</string>
 
     <!-- Default saturation setting. Do not translate. -->
-    <string name="pref_camera_saturation_default">5</string>
+    <string name="pref_camera_saturation_default" translatable="false">5</string>
 
     <!-- Settings screen, Select saturation title -->
     <string name="pref_camera_saturation_title">Saturation</string>
@@ -637,156 +627,156 @@
     <string name="pref_camera_jpegquality_default" translatable="false">100</string>
 
     <!-- Default Picture format setting. Do not translate. -->
-    <string name="pref_camera_picture_format_default">jpeg</string>
+    <string name="pref_camera_picture_format_default" translatable="false">jpeg</string>
 
     <!-- Settings screen, Select Picture format title -->
-    <string name="pref_camera_picture_format_title">Select Picture Format</string>
+    <string name="pref_camera_picture_format_title">Picture format</string>
 
     <!-- Settings screen, picture format dialog radio button choices -->
-    <string name="pref_camera_picture_format_entry_jpeg">Jpeg</string>
-    <string name="pref_camera_picture_format_entry_raw">Raw</string>
-    <string name="pref_camera_picture_format_entry_raw_yuv_422_sp">YUV422SP</string>
-    <string name="pref_camera_picture_format_entry_raw_yuv_8bit_yuyv">YUVRaw8YUYV</string>
-    <string name="pref_camera_picture_format_entry_raw_yuv_8bit_yvyu">YUVRaw8YVYU</string>
-    <string name="pref_camera_picture_format_entry_raw_yuv_8bit_uyvy">YUVRaw8UYVY</string>
-    <string name="pref_camera_picture_format_entry_raw_yuv_8bit_vyuy">YUVRaw8VYUY</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_8gbrg">BayerQ8GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_8grbg">BayerQ8GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_8rggb">BayerQ8RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_8bggr">BayerQ8BGRR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_10gbrg">BayerQ10GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_10grbg">BayerQ10GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_10rggb">BayerQ10RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_10bggr">BayerQ10BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_12gbrg">BayerQ12GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_12grbg">BayerQ12GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_12rggb">BayerQ12RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_12bggr">BayerQ12BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_8gbrg">BayerM8GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_8grbg">BayerM8GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_8rggb">BayerM8RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_8bggr">BayerM8BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_10gbrg">BayerM10GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_10grbg">BayerM10GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_10rggb">BayerM10RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_10bggr">BayerM10BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_12gbrg">BayerM12GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_12grbg">BayerM12GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_12rggb">BayerM12RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_12bggr">BayerM12BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_8gbrg">BayerIQ8GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_8grbg">BayerIQ8GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_8rggb">BayerIQ8RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_8bggr">BayerIQ8BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_10gbrg">BayerIQ10GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_10grbg">BayerIQ10GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_10rggb">BayerIQ10RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_10bggr">BayerIQ10BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_12gbrg">BayerIQ12GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_12grbg">BayerIQ12GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_12rggb">BayerIQ12RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_12bggr">BayerIQ12BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_8gbrg">BayerIM8GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_8grbg">BayerIM8GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_8rggb">BayerIM8RGGB</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_8bggr">BayerIM8BGGR</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_10gbrg">BayerIM10GBRG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_10grbg">BayerIM10GRBG</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_10rggb">BayerIM10rggb</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_10bggr">BayerIM8bggr</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_12gbrg">BayerIM12gbrg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_12grbg">BayerIM12grbg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_12rggb">BayerIM12rggb</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_12bggr">BayerIM12bggr</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain8_8gbrg">BayerIP88gbrg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain8_8grbg">BayerIP88grbg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain8_8rggb">BayerIP88rggb</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain8_8bggr">BayerIP88bggr</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_8gbrg">BayerIP168gbrg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_8grbg">BayerIP168grbg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_8rggb">BayerIP168rggb</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_8bggr">BayerIP168bggr</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_10gbrg">BayerIP1610gbrg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_10grbg">BayerIP1610grbg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_10rggb">BayerIP1610rggb</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_10bggr">BayerIP1610bggr</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12gbrg">BayerIP1612gbrg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12grbg">BayerIP1612grbg</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12rggb">BayerIP1612rggb</string>
-    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12bggr">BayerIP1612bggr</string>
+    <string name="pref_camera_picture_format_entry_jpeg" translatable="false">JPEG</string>
+    <string name="pref_camera_picture_format_entry_raw" translatable="false">Raw</string>
+    <string name="pref_camera_picture_format_entry_raw_yuv_422_sp" translatable="false">YUV422SP</string>
+    <string name="pref_camera_picture_format_entry_raw_yuv_8bit_yuyv" translatable="false">YUVRaw8YUYV</string>
+    <string name="pref_camera_picture_format_entry_raw_yuv_8bit_yvyu" translatable="false">YUVRaw8YVYU</string>
+    <string name="pref_camera_picture_format_entry_raw_yuv_8bit_uyvy" translatable="false">YUVRaw8UYVY</string>
+    <string name="pref_camera_picture_format_entry_raw_yuv_8bit_vyuy" translatable="false">YUVRaw8VYUY</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_8gbrg" translatable="false">BayerQ8GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_8grbg" translatable="false">BayerQ8GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_8rggb" translatable="false">BayerQ8RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_8bggr" translatable="false">BayerQ8BGRR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_10gbrg" translatable="false">BayerQ10GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_10grbg" translatable="false">BayerQ10GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_10rggb" translatable="false">BayerQ10RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_10bggr" translatable="false">BayerQ10BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_12gbrg" translatable="false">BayerQ12GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_12grbg" translatable="false">BayerQ12GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_12rggb" translatable="false">BayerQ12RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_qcom_12bggr" translatable="false">BayerQ12BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_8gbrg" translatable="false">BayerM8GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_8grbg" translatable="false">BayerM8GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_8rggb" translatable="false">BayerM8RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_8bggr" translatable="false">BayerM8BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_10gbrg" translatable="false">BayerM10GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_10grbg" translatable="false">BayerM10GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_10rggb" translatable="false">BayerM10RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_10bggr" translatable="false">BayerM10BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_12gbrg" translatable="false">BayerM12GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_12grbg" translatable="false">BayerM12GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_12rggb" translatable="false">BayerM12RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_mipi_12bggr" translatable="false">BayerM12BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_8gbrg" translatable="false">BayerIQ8GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_8grbg" translatable="false">BayerIQ8GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_8rggb" translatable="false">BayerIQ8RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_8bggr" translatable="false">BayerIQ8BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_10gbrg" translatable="false">BayerIQ10GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_10grbg" translatable="false">BayerIQ10GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_10rggb" translatable="false">BayerIQ10RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_10bggr" translatable="false">BayerIQ10BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_12gbrg" translatable="false">BayerIQ12GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_12grbg" translatable="false">BayerIQ12GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_12rggb" translatable="false">BayerIQ12RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_qcom_12bggr" translatable="false">BayerIQ12BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_8gbrg" translatable="false">BayerIM8GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_8grbg" translatable="false">BayerIM8GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_8rggb" translatable="false">BayerIM8RGGB</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_8bggr" translatable="false">BayerIM8BGGR</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_10gbrg" translatable="false">BayerIM10GBRG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_10grbg" translatable="false">BayerIM10GRBG</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_10rggb" translatable="false">BayerIM10rggb</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_10bggr" translatable="false">BayerIM8bggr</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_12gbrg" translatable="false">BayerIM12gbrg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_12grbg" translatable="false">BayerIM12grbg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_12rggb" translatable="false">BayerIM12rggb</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_mipi_12bggr" translatable="false">BayerIM12bggr</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain8_8gbrg" translatable="false">BayerIP88gbrg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain8_8grbg" translatable="false">BayerIP88grbg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain8_8rggb" translatable="false">BayerIP88rggb</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain8_8bggr" translatable="false">BayerIP88bggr</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_8gbrg" translatable="false">BayerIP168gbrg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_8grbg" translatable="false">BayerIP168grbg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_8rggb" translatable="false">BayerIP168rggb</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_8bggr" translatable="false">BayerIP168bggr</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_10gbrg" translatable="false">BayerIP1610gbrg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_10grbg" translatable="false">BayerIP1610grbg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_10rggb" translatable="false">BayerIP1610rggb</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_10bggr" translatable="false">BayerIP1610bggr</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12gbrg" translatable="false">BayerIP1612gbrg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12grbg" translatable="false">BayerIP1612grbg</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12rggb" translatable="false">BayerIP1612rggb</string>
+    <string name="pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12bggr" translatable="false">BayerIP1612bggr</string>
 
     <!-- Picture format entry values. Do not translate. -->
-    <string name="pref_camera_picture_format_value_jpeg">jpeg</string>
-    <string name="pref_camera_picture_format_value_raw">raw</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_422_sp">yuv422sp</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_8bit_yuyv">yuv-raw8-yuyv</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_8bit_yvyu">yuv-raw8-yvyu</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_8bit_uyvy">yuv-raw8-uyvy</string>
-    <string name="pref_camera_picture_format_value_raw_yuv_8bit_vyuy">yuv-raw8-vyuy</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8gbrg">bayer-qcom-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8grbg">bayer-qcom-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8rggb">bayer-qcom-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8bggr">bayer-qcom-8bgrr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10gbrg">bayer-qcom-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10grbg">bayer-qcom-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10rggb">bayer-qcom-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10bggr">bayer-qcom-10bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12gbrg">bayer-qcom-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12grbg">bayer-qcom-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12rggb">bayer-qcom-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12bggr">bayer-qcom-12bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8gbrg">bayer-mipi-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8grbg">bayer-mipi-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8rggb">bayer-mipi-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8bggr">bayer-mipi-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10gbrg">bayer-mipi-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10grbg">bayer-mipi-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10rggb">bayer-mipi-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10bggr">bayer-mipi-10bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12gbrg">bayer-mipi-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12grbg">bayer-mipi-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12rggb">bayer-mipi-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12bggr">bayer-mipi-12bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8gbrg">bayer-ideal-qcom-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8grbg">bayer-ideal-qcom-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8rggb">bayer-ideal-qcom-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8bggr">bayer-ideal-qcom-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10gbrg">bayer-ideal-qcom-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10grbg">bayer-ideal-qcom-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10rggb">bayer-ideal-qcom-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10bggr">bayer-ideal-qcom-10bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12gbrg">bayer-ideal-qcom-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12grbg">bayer-ideal-qcom-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12rggb">bayer-ideal-qcom-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12bggr">bayer-ideal-qcom-12bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8gbrg">bayer-ideal-mipi-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8grbg">bayer-ideal-mipi-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8rggb">bayer-ideal-mipi-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8bggr">bayer-ideal-mipi-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10gbrg">bayer-ideal-mipi-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10grbg">bayer-ideal-mipi-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10rggb">bayer-ideal-mipi-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10bggr">bayer-ideal-mipi-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12gbrg">bayer-ideal-mipi-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12grbg">bayer-ideal-mipi-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12rggb">bayer-ideal-mipi-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12bggr">bayer-ideal-mipi-12bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8gbrg">bayer-ideal-plain8-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8grbg">bayer-ideal-plain8-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8rggb">bayer-ideal-plain8-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8bggr">bayer-ideal-plain8-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8gbrg">bayer-ideal-plain16-8gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8grbg">bayer-ideal-plain16-8grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8rggb">bayer-ideal-plain16-8rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8bggr">bayer-ideal-plain16-8bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10gbrg">bayer-ideal-plain16-10gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10grbg">bayer-ideal-plain16-10grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10rggb">bayer-ideal-plain16-10rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10bggr">bayer-ideal-plain16-10bggr</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12gbrg">bayer-ideal-plain16-12gbrg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12grbg">bayer-ideal-plain16-12grbg</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12rggb">bayer-ideal-plain16-12rggb</string>
-    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12bggr">bayer-ideal-plain16-12bggr</string>
+    <string name="pref_camera_picture_format_value_jpeg" translatable="false">jpeg</string>
+    <string name="pref_camera_picture_format_value_raw" translatable="false">raw</string>
+    <string name="pref_camera_picture_format_value_raw_yuv_422_sp" translatable="false">yuv422sp</string>
+    <string name="pref_camera_picture_format_value_raw_yuv_8bit_yuyv" translatable="false">yuv-raw8-yuyv</string>
+    <string name="pref_camera_picture_format_value_raw_yuv_8bit_yvyu" translatable="false">yuv-raw8-yvyu</string>
+    <string name="pref_camera_picture_format_value_raw_yuv_8bit_uyvy" translatable="false">yuv-raw8-uyvy</string>
+    <string name="pref_camera_picture_format_value_raw_yuv_8bit_vyuy" translatable="false">yuv-raw8-vyuy</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8gbrg" translatable="false">bayer-qcom-8gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8grbg" translatable="false">bayer-qcom-8grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8rggb" translatable="false">bayer-qcom-8rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_8bggr" translatable="false">bayer-qcom-8bgrr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10gbrg" translatable="false">bayer-qcom-10gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10grbg" translatable="false">bayer-qcom-10grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10rggb" translatable="false">bayer-qcom-10rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_10bggr" translatable="false">bayer-qcom-10bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12gbrg" translatable="false">bayer-qcom-12gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12grbg" translatable="false">bayer-qcom-12grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12rggb" translatable="false">bayer-qcom-12rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_qcom_12bggr" translatable="false">bayer-qcom-12bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8gbrg" translatable="false">bayer-mipi-8gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8grbg" translatable="false">bayer-mipi-8grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8rggb" translatable="false">bayer-mipi-8rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_8bggr" translatable="false">bayer-mipi-8bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10gbrg" translatable="false">bayer-mipi-10gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10grbg" translatable="false">bayer-mipi-10grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10rggb" translatable="false">bayer-mipi-10rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_10bggr" translatable="false">bayer-mipi-10bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12gbrg" translatable="false">bayer-mipi-12gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12grbg" translatable="false">bayer-mipi-12grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12rggb" translatable="false">bayer-mipi-12rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_mipi_12bggr" translatable="false">bayer-mipi-12bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8gbrg" translatable="false">bayer-ideal-qcom-8gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8grbg" translatable="false">bayer-ideal-qcom-8grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8rggb" translatable="false">bayer-ideal-qcom-8rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_8bggr" translatable="false">bayer-ideal-qcom-8bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10gbrg" translatable="false">bayer-ideal-qcom-10gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10grbg" translatable="false">bayer-ideal-qcom-10grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10rggb" translatable="false">bayer-ideal-qcom-10rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_10bggr" translatable="false">bayer-ideal-qcom-10bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12gbrg" translatable="false">bayer-ideal-qcom-12gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12grbg" translatable="false">bayer-ideal-qcom-12grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12rggb" translatable="false">bayer-ideal-qcom-12rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_qcom_12bggr" translatable="false">bayer-ideal-qcom-12bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8gbrg" translatable="false">bayer-ideal-mipi-8gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8grbg" translatable="false">bayer-ideal-mipi-8grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8rggb" translatable="false">bayer-ideal-mipi-8rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_8bggr" translatable="false">bayer-ideal-mipi-8bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10gbrg" translatable="false">bayer-ideal-mipi-10gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10grbg" translatable="false">bayer-ideal-mipi-10grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10rggb" translatable="false">bayer-ideal-mipi-10rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_10bggr" translatable="false">bayer-ideal-mipi-8bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12gbrg" translatable="false">bayer-ideal-mipi-12gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12grbg" translatable="false">bayer-ideal-mipi-12grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12rggb" translatable="false">bayer-ideal-mipi-12rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_mipi_12bggr" translatable="false">bayer-ideal-mipi-12bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8gbrg" translatable="false">bayer-ideal-plain8-8gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8grbg" translatable="false">bayer-ideal-plain8-8grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8rggb" translatable="false">bayer-ideal-plain8-8rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain8_8bggr" translatable="false">bayer-ideal-plain8-8bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8gbrg" translatable="false">bayer-ideal-plain16-8gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8grbg" translatable="false">bayer-ideal-plain16-8grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8rggb" translatable="false">bayer-ideal-plain16-8rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_8bggr" translatable="false">bayer-ideal-plain16-8bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10gbrg" translatable="false">bayer-ideal-plain16-10gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10grbg" translatable="false">bayer-ideal-plain16-10grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10rggb" translatable="false">bayer-ideal-plain16-10rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_10bggr" translatable="false">bayer-ideal-plain16-10bggr</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12gbrg" translatable="false">bayer-ideal-plain16-12gbrg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12grbg" translatable="false">bayer-ideal-plain16-12grbg</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12rggb" translatable="false">bayer-ideal-plain16-12rggb</string>
+    <string name="pref_camera_picture_format_value_raw_bayer_ideal_plain16_12bggr" translatable="false">bayer-ideal-plain16-12bggr</string>
     <!-- Settings screen, Picture quality title -->
     <string name="pref_camera_jpegquality_title">Picture quality</string>
 
@@ -795,25 +785,25 @@
     <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. -->
-     <string name="pref_camera_histogram_default">disable</string>
+    <!-- Default auto histogram setting. Do not translate. -->
+    <string name="pref_camera_histogram_default" translatable="false">disable</string>
 
-     <!-- Settings screen, Select Histogram title -->
-     <string name="pref_camera_histogram_title">Histogram</string>
+    <!-- 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>
+    <!-- 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. -->
-     <string name="pref_camera_histogram_value_enable">enable</string>
-     <string name="pref_camera_histogram_value_disable">disable</string>
+    <!-- Histogram entry values. Do not translate. -->
+    <string name="pref_camera_histogram_value_enable" translatable="false">enable</string>
+    <string name="pref_camera_histogram_value_disable" translatable="false">disable</string>
 
     <!-- Default auto scene detection setting. -->
     <string name="pref_camera_scenedetect_default" translatable="false">off</string>
 
     <!-- Settings screen, Select Auto Scene Detection -->
-    <string name="pref_camera_scenedetect_title">Auto Scene Detection</string>
+    <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>
@@ -827,115 +817,114 @@
 
     <!-- longshot value -->
     <string name="pref_camera_longshot_default" translatable="false">off</string>
-    <string name="pref_camera_longshot_title">Continuous Shot</string>
-    <string name="msg_cancel_longshot_for_limited_memory">run out of memory, canceling longshot</string>
+    <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-Bracket Mode</string>
+    <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>
-    <string name="pref_camera_auto_hdr_default" translatable="false">
-    disable</string>
+    <string name="pref_camera_auto_hdr_title">Auto HDR</string>
+    <string name="pref_camera_auto_hdr_default" translatable="false">disable</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>
-    <string name="pref_camera_auto_hdr_value_enable">enable</string>
-    <string name="pref_camera_auto_hdr_value_disable">disable</string>
+    <string name="pref_camera_auto_hdr_value_enable" translatable="false">enable</string>
+    <string name="pref_camera_auto_hdr_value_disable" translatable="false">disable</string>
 
     <!-- toast message for storage location switch -->
-    <string name="on_switch_save_path_to_sdcard">Internal storage space is not enough - switched save path to SD card</string>
+    <string name="on_switch_save_path_to_sdcard">Internal storage space is not enough, switched storage location to SD card</string>
 
-    <string name="pref_camera_hdr_mode_default">hdr-mode-multiframe</string>
+    <string name="pref_camera_hdr_mode_default" translatable="false">hdr-mode-multiframe</string>
 
     <!-- Settings screen, Selectable HDR mode title -->
-    <string name="pref_camera_hdr_mode_title">HDR Mode</string>
+    <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. -->
-    <string name="pref_hdr_mode_value_sensor">hdr-mode-sensor</string>
-    <string name="pref_hdr_mode_value_multi_frame">hdr-mode-multiframe</string>
+    <string name="pref_hdr_mode_value_sensor" translatable="false">hdr-mode-sensor</string>
+    <string name="pref_hdr_mode_value_multi_frame" translatable="false">hdr-mode-multiframe</string>
 
     <!--Default video rotation setting-->
     <string name="pref_camera_video_rotation_default" translatable="false">0</string>
 
     <!--Settings screen, video rotation title-->
-    <string name="pref_camera_video_rotation_title">Video Rotation</string>
+    <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</string>
-    <string name="pref_camera_video_rotation_entry_90">90</string>
-    <string name="pref_camera_video_rotation_entry_180">180</string>
-    <string name="pref_camera_video_rotation_entry_270">270</string>
+    <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 map app for show location.</string>
+    <string name="map_activity_not_found_err">There is no maps app installed to show the location</string>
 
-    <!-- Continous shot enable message -->
-    <string name="longshot_enable_message">
-            Advance features are not supported in continuous shot mode</string>
-    <!-- Advance features enable message -->
-    <string name="advance_feature_enable_msg">
-            Continuous shot is not supported when advance features are enabled</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">Mid</string>
-     <string name="pref_camera_tsmakeup_entry_high">High</string>
-     <string name="pref_camera_tsmakeup_default" translatable="false">Off</string>
-     <string name="pref_camera_tsmakeup_level_default" translatable="false">60</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">The beautification must turn on Face Detection, Continue or Quit?</string>
-     <string name="text_tsmakeup_alert_continue">Continue</string>
-     <string name="text_tsmakeup_alert_quit">Quit</string>
-    <string name="text_tsmakeup_beautify_toast" translatable="true">Beautify</string>
-
-    <string name="all_in_focus">All in Focus</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_default" translatable="false">Off</string>
+    <string name="pref_camera_tsmakeup_level_default" translatable="false">60</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_title">UbiFocus</string>
+    <string name="refocus_prompt_title" translatable="false">UbiFocus</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>
+    <string name="mute_button_desc">Mute button</string>
 
-    <string name="pref_camera2_camera2_title" translatable="true">Camera2 Mode</string>
-    <string name="pref_camera2_camera2_entry_enable" translatable="true">Enable</string>
-    <string name="pref_camera2_camera2_entry_disable" translatable="true">Disable</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_camera2_default" translatable="false">disable</string>
     <string name="pref_camera2_camera2_value_enable" translatable="false">enable</string>
     <string name="pref_camera2_camera2_value_disable" translatable="false">disable</string>
 
-    <string name="pref_camera2_mono_only_title" translatable="true">Mono Only</string>
+    <string name="pref_camera2_mono_only_title">Mono only</string>
     <string name="pref_camera2_mono_only_default" translatable="false">off</string>
+    <string name="pref_camera2_mono_only_entry_on">On</string>
+    <string name="pref_camera2_mono_only_entry_off">Off</string>
 
-    <string name="pref_camera2_mono_preview_title" translatable="true">Mono Preview</string>
-    <string name="pref_camera2_mono_preview_entry_on" translatable="true">On</string>
-    <string name="pref_camera2_mono_preview_entry_off" translatable="true">Off</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_mono_preview_default" translatable="false">off</string>
     <string name="pref_camera2_mono_preview_value_on" translatable="false">on</string>
     <string name="pref_camera2_mono_preview_value_off" translatable="false">off</string>
 
-    <string name="pref_camera2_clearsight_title" translatable="true">ClearSight</string>
+    <string name="pref_camera2_clearsight_title" translatable="false">ClearSight</string>
     <string name="pref_camera2_clearsight_default" translatable="false">on</string>
-    <string name="pref_camera2_clearsight_entry_on" translatable="true">On</string>
-    <string name="pref_camera2_clearsight_entry_off" translatable="true">Off</string>
+    <string name="pref_camera2_clearsight_entry_on">On</string>
+    <string name="pref_camera2_clearsight_entry_off">Off</string>
 
     <string name="pref_camera2_clearsight_value_on" translatable="false">on</string>
     <string name="pref_camera2_clearsight_value_off" translatable="false">off</string>
@@ -943,10 +932,10 @@
     <string name="clearsight_capture_success">ClearSight capture successful</string>
     <string name="clearsight_capture_fail">ClearSight capture failed</string>
 
-    <string name="pref_camera2_mpo_title" translatable="true">MPO Format</string>
+    <string name="pref_camera2_mpo_title">MPO format</string>
     <string name="pref_camera2_mpo_default" translatable="false">off</string>
-    <string name="pref_camera2_mpo_entry_on" translatable="true">On</string>
-    <string name="pref_camera2_mpo_entry_off" translatable="true">Off</string>
+    <string name="pref_camera2_mpo_entry_on">On</string>
+    <string name="pref_camera2_mpo_entry_off">Off</string>
 
     <string name="pref_camera2_mpo_value_on" translatable="false">on</string>
     <string name="pref_camera2_mpo_value_off" translatable="false">off</string>
@@ -956,149 +945,160 @@
     <string name="pref_camera2_coloreffect_default" translatable="false">0</string>
     <string name="pref_camera2_flashmode_value_auto" translatable="false">auto</string>
 
-    <string name="pref_camera2_makeup_title" translatable="true">Makeup</string>
+    <string name="pref_camera2_makeup_title">Makeup</string>
+    <string name="pref_camera2_makeup_entry_on">On</string>
+    <string name="pref_camera2_makeup_entry_off">Off</string>
 
     <string name="pref_camera2_noise_reduction_default" translatable="false">high-quality</string>
-    <string name="pref_camera2_noise_reduction_title" translatable="true">Noise Reduction</string>
+    <string name="pref_camera2_noise_reduction_title">Noise reduction</string>
 
-    <string name="pref_camera2_noise_reduction_entry_off" translatable="true">@string/pref_camera_noise_reduction_entry_off</string>
-    <string name="pref_camera2_noise_reduction_entry_fast" translatable="true">@string/pref_camera_noise_reduction_entry_fast</string>
-    <string name="pref_camera2_noise_reduction_entry_high_quality" translatable="true">@string/pref_camera_noise_reduction_entry_high_quality</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_noise_reduction_value_off" translatable="false">off</string>
     <string name="pref_camera2_noise_reduction_value_fast" translatable="false">fast</string>
     <string name="pref_camera2_noise_reduction_value_high_quality" translatable="false">high-quality</string>
 
     <string name="pref_camera2_videosnap_default" translatable="false">enable</string>
-    <string name="pref_camera2_videosnap_title" translatable="true">Auto Snapshot Size</string>
-
-    <string name="pref_camera2_videosnap_value_enable" translatable="true">enable</string>
-    <string name="pref_camera2_videosnap_value_disable" translatable="true">disable</string>
-
-    <string name="pref_camera2_videosnap_entry_enable" translatable="true">Enable</string>
-    <string name="pref_camera2_videosnap_entry_disable" translatable="true">Disable</string>
-    <string name="pref_camera2_trackingfocus_title" translatable="true">Tracking Focus</string>
-    <string name="pref_camera_scenemode_entry_bestpicture" translatable="true">BestPicture</string>
-    <string name="pref_camera_scenemode_entry_chromaflash" translatable="true">ChromaFlash</string>
-    <string name="pref_camera_scenemode_entry_blurbuster" translatable="true">BlurBuster</string>
-    <string name="pref_camera_scenemode_entry_sharpshooter" translatable="true">SharpPhoto</string>
-    <string name="pref_camera_scenemode_entry_trackingfocus" translatable="true">TrackingFocus</string>
-    <string name="pref_camera_scenemode_entry_panorama" translatable="true">Panorama</string>
-    <string name="pref_camera_scenemode_entry_promode" translatable="true">ProMode</string>
-    <string name="pref_camera_scenemode_entry_deepzoom" translatable="true">DeepZoom</string>
-    <string name="bestpicture_done" translatable="true">SAVE</string>
-    <string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string>
-
-    <string name="pref_camera2_shutter_sound_default" translatable="true">on</string>
-    <string name="pref_camera2_shutter_sound_value_on" translatable="true">on</string>
-    <string name="pref_camera2_shutter_sound_value_off" translatable="true">off</string>
-
-    <string name="pref_camera2_shutter_sound_entry_on" translatable="true">@string/pref_camera_shuttersound_entry_enable</string>
-    <string name="pref_camera2_shutter_sound_entry_off" translatable="true">@string/pref_camera_shuttersound_entry_disable</string>
-    <string name="pref_camera2_shutter_sound_title" translatable="true">@string/pref_camera_shuttersound_title</string>
-
-    <string name="pref_camera2_timer_entry_off" translatable="true">Off</string>
-    <string name="pref_camera2_timer_entry_2sec" translatable="true">2 seconds</string>
-    <string name="pref_camera2_timer_entry_5sec" translatable="true">5 seconds</string>
-    <string name="pref_camera2_timer_entry_10sec" translatable="true">10 seconds</string>
+    <string name="pref_camera2_videosnap_title">Auto snapshot size</string>
+
+    <string name="pref_camera2_videosnap_value_enable" translatable="false">enable</string>
+    <string name="pref_camera2_videosnap_value_disable" translatable="false">disable</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_camera2_trackingfocus_entry_on">On</string>
+    <string name="pref_camera2_trackingfocus_entry_off">Off</string>
+
+    <string name="pref_camera_scenemode_entry_bestpicture">Best picture</string>
+    <string name="pref_camera_scenemode_entry_chromaflash" translatable="false">ChromaFlash</string>
+    <string name="pref_camera_scenemode_entry_blurbuster" translatable="false">BlurBuster</string>
+    <string name="pref_camera_scenemode_entry_sharpshooter">Sharp photo</string>
+    <string name="pref_camera_scenemode_entry_trackingfocus">Tracking focus</string>
+    <string name="pref_camera_scenemode_entry_panorama">Panorama</string>
+    <string name="pref_camera_scenemode_entry_promode">Pro mode</string>
+    <string name="pref_camera_scenemode_entry_deepzoom" translatable="false">DeepZoom</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_default" translatable="false">on</string>
+    <string name="pref_camera2_shutter_sound_value_on" translatable="false">on</string>
+    <string name="pref_camera2_shutter_sound_value_off" translatable="false">off</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>
+
+    <string name="pref_camera2_timer_entry_off">Off</string>
+    <string name="pref_camera2_timer_entry_2sec">2 seconds</string>
+    <string name="pref_camera2_timer_entry_5sec">5 seconds</string>
+    <string name="pref_camera2_timer_entry_10sec">10 seconds</string>
 
     <string name="pref_camera2_timer_value_off" translatable="false">0</string>
     <string name="pref_camera2_timer_value_2sec" translatable="false">2</string>
     <string name="pref_camera2_timer_value_5sec" translatable="false">5</string>
     <string name="pref_camera2_timer_value_10sec" translatable="false">10</string>
-    <string name="pref_camera2_saveraw_default">disable</string>
-    <string name="pref_camera2_saveraw_title">Save with RAW format</string>
+    <string name="pref_camera2_saveraw_default" translatable="false">disable</string>
+    <string name="pref_camera2_saveraw_title">Save with Raw format</string>
     <string name="pref_camera2_saveraw_value_disable" translatable="false">disable</string>
     <string name="pref_camera2_saveraw_value_enable" translatable="false">enable</string>
 
-    <string name="pref_camera2_saveraw_entry_disable">disable</string>
-    <string name="pref_camera2_saveraw_entry_enable">enable</string>
-
-    <string name="panocapture_direction_is_not_determined" translatable="true">Move constantly in one direciton.</string>
-    <string name="panocapture_intro" translatable="true">Press camera button to start.</string>
-    <string name="panocapture_direction_is_changed" translatable="true">Direction is changed. Stopping now...</string>
-    <string name="makeup_ui_title" translatable="true">Please choose the strength of the beautification.</string>
-    <string name="makeup_ui_ok_button" translatable="true">OK</string>
-    <string name="makeup_seekbar_low" translatable="true">low</string>
-    <string name="makeup_seekbar_high" translatable="true">high</string>
-
-    <string name="perf_camera2_version_info" translatable="true">Version Info</string>
-    <string name="perf_camera2_preferences_category_general" translatable="true">General</string>
-    <string name="perf_camera2_preferences_category_photo" translatable="true">Still camera</string>
-    <string name="perf_camera2_preferences_category_video" translatable="true">Video camera</string>
-    <string name="perf_camera2_preferences_category_system" translatable="true">System</string>
-
-    <string name="pref_camera2_scene_mode_dual_camera_instructional_content" translatable="true">In dual camera mode, your pictures will be clearer. You can also apply background effects, by editing your dual camera pictures in the Gallery.</string>
-    <string name="pref_camera2_scene_mode_ubi_focus_instructional_content"  translatable="true">With UbiFocus, your camera will take five pictures and combine them into one picture,where everything is in focus. You can choose to re-focus, after you take the picture.</string>
-    <string name="pref_camera2_scene_mode_opti_zoom_instructional_content"  translatable="true">Use Optizoom when you want to zoom in for a clear picture.You can zoom before, or after taking the picture.</string>
-    <string name="pref_camera2_scene_mode_sports_instructional_content"  translatable="true">Sports mode helps you take better sports or action shots.\n\nImporves your photos, but has no effect on video recording.</string>
-    <string name="pref_camera2_scene_mode_hdr_instructional_content"  translatable="true">When you are in mixed lighting conditions such as low light and backlit scenes select "HDR" for best possible pictures.</string>
-    <string name="pref_camera2_scene_mode_best_photo_instructional_content"  translatable="true">Allows you to take a burst of 10 photos, and you can choose the best one(s).</string>
-    <string name="pref_camera2_scene_mode_chroma_flash_instructional_content"  translatable="true">With ChromaFlash, the lighting in your flash photos will be optimized for all of the people and objects in your pictures.This feature applies only to the back camera.</string>
-    <string name="pref_camera2_scene_mode_sharp_photo_instructional_content"  translatable="true">Sharp Phot reduces blur that is due to motion in the scene, or due to hand motion.</string>
-    <string name="pref_camera2_scene_mode_tracking_focus_instructional_content"  translatable="true">Allows you to track and focus a selected person or object while taking pictures or videos. To start, position the focus rectangle on a person or object you want to track.</string>
-    <string name="pref_camera2_scene_mode_time_lapse_instructional_content"  translatable="true">With Time Lapse, you can transform a long video recording into a few seconds of video.This effect applies to videos, but not photos.</string>
-    <string name="pref_camera2_scene_mode_panorama_instructional_content"  translatable="true">Allows you to pan left or right to take a wide landscape photo. You can alse pan up or down to take tall photos.</string>
-    <string name="pref_camera2_scene_mode_blur_buster_instructional_content"  translatable="true">BlurBuster reduces blur from shaky hands.It can be helpful when taking photos in difficult places.</string>
-    <string name="pref_camera2_scene_mode_pro_instructional_content"  translatable="true">With Pro Mode, you can manually control settings for ISO,Exposure, White Balance, and Focus. You will have easy access to all of these advanced settings</string>
-    <string name="pref_camera2_scene_mode_deepzoom_instructional_content"  translatable="true">With DeepZoom Mode, you can use the 2X or 4X to take picture, then you can get the deepzoom`s picture </string>
-    <string name="pref_camera2_scene_mode_deepportrait_instructional_content" translatable="true">With DeepPortrait, you can take selfies, with a blurred background. You can use the slider to adjust the amount of the blur</string>
+    <string name="pref_camera2_saveraw_entry_disable" translatable="false">disable</string>
+    <string name="pref_camera2_saveraw_entry_enable" translatable="false">enable</string>
+
+    <string name="panocapture_direction_is_not_determined">Move constantly towards one direction.</string>
+    <string name="panocapture_intro">Press camera button to start.</string>
+    <string name="panocapture_direction_is_changed">Direction has changed, stopping panorama capture\u2026</string>
+    <string name="makeup_ui_title">Choose the strength of the beautification.</string>
+    <string name="makeup_ui_ok_button">OK</string>
+    <string name="makeup_seekbar_low" translatable="false">low</string>
+    <string name="makeup_seekbar_high" translatable="false">high</string>
+
+    <string name="perf_camera2_version_info">Version info</string>
+    <string name="perf_camera2_preferences_category_general">General</string>
+    <string name="perf_camera2_preferences_category_photo">Still camera</string>
+    <string name="perf_camera2_preferences_category_video">Video camera</string>
+    <string name="perf_camera2_preferences_category_system">System</string>
+
+    <string name="pref_camera2_scene_mode_dual_camera_instructional_content">In dual camera mode, your pictures will be clearer. You can also apply background effects, by editing your dual camera pictures in the Gallery.</string>
+    <string name="pref_camera2_scene_mode_ubi_focus_instructional_content">With UbiFocus, your camera will take five pictures and combine them into one picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string>
+    <string name="pref_camera2_scene_mode_opti_zoom_instructional_content">Use OptiZoom when you want to zoom in for a clear picture. You can zoom before, or after taking the picture.</string>
+    <string name="pref_camera2_scene_mode_sports_instructional_content">Sports mode helps you take better sports or action shots.\n\nImproves your photos, but has no effect on video recording.</string>
+    <string name="pref_camera2_scene_mode_hdr_instructional_content">When you are in mixed lighting conditions such as low light and backlit scenes select "HDR" for best possible pictures.</string>
+    <string name="pref_camera2_scene_mode_best_photo_instructional_content">Allows you to take a burst of 10 photos, then you can choose the best one(s).</string>
+    <string name="pref_camera2_scene_mode_chroma_flash_instructional_content">With ChromaFlash, the lighting in your flash photos will be optimized for all of the people and objects in your pictures. This feature applies only to the back camera.</string>
+    <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Sharp photo reduces blur that is due to motion in the scene, or due to hand motion.</string>
+    <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Allows you to track and focus a selected person or object while taking pictures or videos. To start, position the focus rectangle on a person or object you want to track.</string>
+    <string name="pref_camera2_scene_mode_time_lapse_instructional_content">With Time lapse, you can transform a long video recording into a few seconds of video. This effect applies to videos, but not photos.</string>
+    <string name="pref_camera2_scene_mode_panorama_instructional_content">Allows you to pan left or right to take a wide landscape photo. You can also pan up or down to take tall photos.</string>
+    <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster reduces blur from shaky hands. It can be helpful when taking photos in difficult places.</string>
+    <string name="pref_camera2_scene_mode_pro_instructional_content">With Pro mode, you can manually control settings for ISO, exposure, white balance, and focus. You will have easy access to all of these advanced settings.</string>
+    <string name="pref_camera2_scene_mode_deepzoom_instructional_content">With DeepZoom mode, you can take a photo at 2x or 4x enhanced zoom.</string>
+    <string name="pref_camera2_scene_mode_deepportrait_instructional_content">With DeepPortrait mode, you can take selfies with a blurred background. You can use the slider to adjust the amount of the blur.</string>
     <string name="pref_camera2_not_show_again">Do not show again</string>
-    <string name="pref_camera2_scene_mode_instructional_ok" translatable="true">OK</string>
+    <string name="pref_camera2_scene_mode_instructional_ok">OK</string>
 
-    <string name="pref_camera2_instant_aec_title" translatable="true">Instant AEC</string>
+    <string name="pref_camera2_instant_aec_title">Instant AEC</string>
     <string name="pref_camera2_instant_aec_default" translatable="false">0</string>
-    <string name="pref_camera2_instant_aec_entry_disable" translatable="true">Disable</string>
-    <string name="pref_camera2_instant_aec_entry_aggressive" translatable="true">Aggressive AEC</string>
-    <string name="pref_camera2_instant_aec_entry_fast" translatable="true">Fast AEC</string>
+    <string name="pref_camera2_instant_aec_entry_disable">Disable</string>
+    <string name="pref_camera2_instant_aec_entry_aggressive">Aggressive AEC</string>
+    <string name="pref_camera2_instant_aec_entry_fast">Fast AEC</string>
 
-    <string name="pref_camera2_saturation_level_title" translatable="true">Saturation Level</string>
+    <string name="pref_camera2_saturation_level_title">Saturation</string>
     <string name="pref_camera2_saturation_level_default" translatable="false">5</string>
-    <string name="pref_camera2_saturation_level_entry_0" translatable="true">Level 0</string>
-    <string name="pref_camera2_saturation_level_entry_1" translatable="true">Level 1</string>
-    <string name="pref_camera2_saturation_level_entry_2" translatable="true">Level 2</string>
-    <string name="pref_camera2_saturation_level_entry_3" translatable="true">Level 3</string>
-    <string name="pref_camera2_saturation_level_entry_4" translatable="true">Level 4</string>
-    <string name="pref_camera2_saturation_level_entry_5" translatable="true">Level 5(Default)</string>
-    <string name="pref_camera2_saturation_level_entry_6" translatable="true">Level 6</string>
-    <string name="pref_camera2_saturation_level_entry_7" translatable="true">Level 7</string>
-    <string name="pref_camera2_saturation_level_entry_8" translatable="true">Level 8</string>
-    <string name="pref_camera2_saturation_level_entry_9" translatable="true">Level 9</string>
-    <string name="pref_camera2_saturation_level_entry_10" translatable="true">Level 10</string>
-
-    <string name="pref_camera2_anti_banding_level_title" translatable="true">Anti Banding Level</string>
+    <string name="pref_camera2_saturation_level_entry_0">Level 0</string>
+    <string name="pref_camera2_saturation_level_entry_1">Level 1</string>
+    <string name="pref_camera2_saturation_level_entry_2">Level 2</string>
+    <string name="pref_camera2_saturation_level_entry_3">Level 3</string>
+    <string name="pref_camera2_saturation_level_entry_4">Level 4</string>
+    <string name="pref_camera2_saturation_level_entry_5">Level 5 (default)</string>
+    <string name="pref_camera2_saturation_level_entry_6">Level 6</string>
+    <string name="pref_camera2_saturation_level_entry_7">Level 7</string>
+    <string name="pref_camera2_saturation_level_entry_8">Level 8</string>
+    <string name="pref_camera2_saturation_level_entry_9">Level 9</string>
+    <string name="pref_camera2_saturation_level_entry_10">Level 10</string>
+
+    <string name="pref_camera2_anti_banding_level_title">Antibanding</string>
     <string name="pref_camera2_anti_banding_level_default" translatable="false">3</string>
-    <string name="pref_camera2_anti_banding_level_entry_off" translatable="true">Off</string>
-    <string name="pref_camera2_anti_banding_level_entry_50hz" translatable="true">50HZ</string>
-    <string name="pref_camera2_anti_banding_level_entry_60hz" translatable="true">60HZ</string>
-    <string name="pref_camera2_anti_banding_level_entry_auto" translatable="true">Auto</string>
+    <string name="pref_camera2_anti_banding_level_entry_off">Off</string>
+    <string name="pref_camera2_anti_banding_level_entry_50hz">50 Hz (Europe)</string>
+    <string name="pref_camera2_anti_banding_level_entry_60hz">60 Hz (USA)</string>
+    <string name="pref_camera2_anti_banding_level_entry_auto">Auto</string>
+
+    <string name="pref_camera2_histogram_title">Histogram</string>
+    <string name="pref_camera2_histogram_default" translatable="false">disable</string>
+    <string name="pref_camera2_histogram_entry_enable">Enable</string>
+    <string name="pref_camera2_histogram_entry_disable">Disable</string>
 
-    <string name="pref_camera2_hdr_title" translatable="true">HDR &amp; Non-HDR</string>
+    <string name="pref_camera2_hdr_title">HDR</string>
     <string name="pref_camera2_hdr_default" translatable="false">disable</string>
-    <string name="pref_camera2_hdr_entry_enable" translatable="true">Enable</string>
-    <string name="pref_camera2_hdr_entry_disable" translatable="true">Disable</string>
+    <string name="pref_camera2_hdr_entry_enable">Enable</string>
+    <string name="pref_camera2_hdr_entry_disable">Disable</string>
 
-    <string name="pref_camera2_auto_hdr_title" translatable="true">AUTO HDR</string>
+    <string name="pref_camera2_auto_hdr_title">Auto HDR</string>
     <string name="pref_camera2_auto_hdr_default" translatable="false">disable</string>
-    <string name="pref_camera2_auto_hdr_entry_enable" translatable="true">Enable</string>
-    <string name="pref_camera2_auto_hdr_entry_disable" translatable="true">Disable</string>
+    <string name="pref_camera2_auto_hdr_entry_enable">Enable</string>
+    <string name="pref_camera2_auto_hdr_entry_disable">Disable</string>
 
     <string name="pref_camera_bokeh_mode_default" translatable="false">0</string>
-    <string name="pref_camera_bokeh_mode_title" translatable="true">Bokeh Mode</string>
-    <string name="pref_camera_bokeh_mode_entry_enable" translatable="true">Enable</string>
-    <string name="pref_camera_bokeh_mode_entry_disable" translatable="true">Disable</string>
+    <string name="pref_camera_bokeh_mode_title">Bokeh mode</string>
+    <string name="pref_camera_bokeh_mode_entry_enable">Enable</string>
+    <string name="pref_camera_bokeh_mode_entry_disable">Disable</string>
     <string name="pref_camera_bokeh_mode_entry_value_enable" translatable="false">1</string>
     <string name="pref_camera_bokeh_mode_entry_value_disable" translatable="false">0</string>
 
     <string name="pref_camera_bokeh_mpo_default" translatable="false">0</string>
-    <string name="pref_camera_bokeh_mpo_title" translatable="true">Bokeh Mode MPO</string>
-    <string name="pref_camera_bokeh_mpo_entry_enable" translatable="true">Enable</string>
-    <string name="pref_camera_bokeh_mpo_entry_disable" translatable="true">Disable</string>
+    <string name="pref_camera_bokeh_mpo_title">Bokeh mode MPO</string>
+    <string name="pref_camera_bokeh_mpo_entry_enable">Enable</string>
+    <string name="pref_camera_bokeh_mpo_entry_disable">Disable</string>
     <string name="pref_camera_bokeh_mpo_entry_value_enable" translatable="false">1</string>
     <string name="pref_camera_bokeh_mpo_entry_value_disable" translatable="false">0</string>
 
     <string name="pref_camera_bokeh_blur_degree_default" translatable="false">50</string>
-    <string name="pref_camera_bokeh_blur_degree_title" translatable="true">Bokeh Blur Value</string>
+    <string name="pref_camera_bokeh_blur_degree_title">Bokeh blur value</string>
     <!-- Default Zoom setting. -->
     <string name="pref_camera_zoom_default" translatable="false">0</string>
     <string name="pref_camera_zoom_title">Zoom</string>
@@ -1114,48 +1114,47 @@
     <string name="pref_camera_zoom_entry_8x">8x</string>
     <string name="pref_camera_zoom_entry_9x">9x</string>
     <string name="pref_camera_zoom_entry_10x">10x</string>
-    <string name="pref_camera2_bsgc_title" translatable="true">Smile/blink/gaze Detection</string>
+    <string name="pref_camera2_bsgc_title">Smile/blink/gaze detection</string>
     <string name="pref_camera2_bsgc_default" translatable="false">disable</string>
-    <string name="pref_camera2_bsgc_entry_enable" translatable="true">Enable</string>
-    <string name="pref_camera2_bsgc_entry_disable" translatable="true">Disable</string>
+    <string name="pref_camera2_bsgc_entry_enable">Enable</string>
+    <string name="pref_camera2_bsgc_entry_disable">Disable</string>
     <string name="pref_camera2_bsgc_entry_value_enable" translatable="false">enable</string>
     <string name="pref_camera2_bsgc_entry_value_disable" translatable="false">disable</string>
 
-
     <string name="pref_camera2_picturesize_default" translatable="false">3840x2160</string>
     <string name="pref_camera2_video_quality_default" translatable="false">1920x1080</string>
 
-    <string name="pref_camera2_zsl_title" translatable="true">ZSL</string>
-    <string name="pref_camera2_zsl_default" translatable="false">@string/pref_camera2_zsl_entryvalue_hal_zsl</string>
-    <string name="pref_camera2_zsl_entry_disable" translatable="true">Off</string>
-    <string name="pref_camera2_zsl_entry_app_zsl" translatable="true">APP-ZSL</string>
-    <string name="pref_camera2_zsl_entry_hal_zsl" translatable="true">HAL-ZSL</string>
+    <string name="pref_camera2_zsl_title">Zero shutter lag</string>
+    <string name="pref_camera2_zsl_default" translatable="false">@string/pref_camera2_zsl_entryvalue_app_zsl</string>
+    <string name="pref_camera2_zsl_entry_disable">Off</string>
+    <string name="pref_camera2_zsl_entry_app_zsl">Software ZSL</string>
+    <string name="pref_camera2_zsl_entry_hal_zsl">Hardware ZSL</string>
     <string name="pref_camera2_zsl_entryvalue_disable" translatable="false">disable</string>
     <string name="pref_camera2_zsl_entryvalue_app_zsl" translatable="false">app-zsl</string>
     <string name="pref_camera2_zsl_entryvalue_hal_zsl" translatable="false">hal-zsl</string>
 
-    <string name="pref_camera2_videoencoderprofile_title" translatable="true">EncoderProfile</string>
-    <string name="pref_camera2_videoencoderprofile_default">off</string>
+    <string name="pref_camera2_videoencoderprofile_title">Encoder profile</string>
+    <string name="pref_camera2_videoencoderprofile_default" translatable="false">off</string>
 
-    <string name="pref_camera2_sharpness_control_title" translatable="true">SharpnessControl</string>
-    <string name="pref_camera2_sharpness_control_default" translatable="true">2</string>
-    <string name="pref_camera2_sharpness_control_entry_level0" translatable="false">Level 0</string>
-    <string name="pref_camera2_sharpness_control_entry_level1" translatable="false">Level 1</string>
-    <string name="pref_camera2_sharpness_control_entry_level2" translatable="false">Level 2 (Default)</string>
-    <string name="pref_camera2_sharpness_control_entry_level3" translatable="false">Level 3</string>
-    <string name="pref_camera2_sharpness_control_entry_level4" translatable="false">Level 4</string>
-    <string name="pref_camera2_sharpness_control_entry_level5" translatable="false">Level 5</string>
-    <string name="pref_camera2_sharpness_control_entry_level6" translatable="false">Level 6</string>
+    <string name="pref_camera2_sharpness_control_title" translatable="false">@string/pref_camera_sharpness_title</string>
+    <string name="pref_camera2_sharpness_control_default" translatable="false">2</string>
+    <string name="pref_camera2_sharpness_control_entry_level0" translatable="false">@string/pref_camera_sharpness_entry_level0</string>
+    <string name="pref_camera2_sharpness_control_entry_level1" translatable="false">@string/pref_camera_sharpness_entry_level1</string>
+    <string name="pref_camera2_sharpness_control_entry_level2" translatable="false">@string/pref_camera_sharpness_entry_level2</string>
+    <string name="pref_camera2_sharpness_control_entry_level3" translatable="false">@string/pref_camera_sharpness_entry_level3</string>
+    <string name="pref_camera2_sharpness_control_entry_level4" translatable="false">@string/pref_camera_sharpness_entry_level4</string>
+    <string name="pref_camera2_sharpness_control_entry_level5" translatable="false">@string/pref_camera_sharpness_entry_level5</string>
+    <string name="pref_camera2_sharpness_control_entry_level6" translatable="false">@string/pref_camera_sharpness_entry_level6</string>
 
     <string name="pref_camera2_afmode_default" translatable="false">-1</string>
-    <string name="pref_camera2_afmode_title">Set CONTROL_AF_MODE</string>
-    <string name="pref_camera2_afmode_entry_disable">Disable</string>
+    <string name="pref_camera2_afmode_title" translatable="false">@string/pref_camera_focusmode_title</string>
+    <string name="pref_camera2_afmode_entry_disable">Disabled</string>
     <string name="pref_camera2_afmode_entry_off">Off</string>
-    <string name="pref_camera2_afmode_entry_auto">Auto</string>
-    <string name="pref_camera2_afmode_entry_macro">Macro</string>
-    <string name="pref_camera2_afmode_entry_continuous_video">Continuous Video</string>
-    <string name="pref_camera2_afmode_entry_continuous_picture">Continuous Picture</string>
-    <string name="pref_camera2_afmode_entry_edof">EDOF</string>
+    <string name="pref_camera2_afmode_entry_auto" translatable="false">@string/pref_camera_focusmode_entry_auto</string>
+    <string name="pref_camera2_afmode_entry_macro" translatable="false">@string/pref_camera_focusmode_entry_macro</string>
+    <string name="pref_camera2_afmode_entry_continuous_video">Continuous video</string>
+    <string name="pref_camera2_afmode_entry_continuous_picture">Continuous picture</string>
+    <string name="pref_camera2_afmode_entry_edof">Extended depth of focus</string>
     <string name="pref_camera2_afmode_value_disable" translatable="false">-1</string>
     <string name="pref_camera2_afmode_value_off" translatable="false">0</string>
     <string name="pref_camera2_afmode_value_auto" translatable="false">1</string>
@@ -1164,92 +1163,96 @@
     <string name="pref_camera2_afmode_value_continuous_picture" translatable="false">4</string>
     <string name="pref_camera2_afmode_value_edof" translatable="false">5</string>
 
-    <string name="pref_camera2_exposure_metering_title" translatable="true">ExposureMetering</string>
-    <string name="pref_camera2_exposure_metering_default" translatable="true">1</string>
-    <string name="pref_camera2_exposure_metering_entry_frame_average" translatable="false">FrameAverage</string>
-    <string name="pref_camera2_exposure_metering_entry_center_weighted" translatable="false">CenterWeighted</string>
-    <string name="pref_camera2_exposure_metering_entry_spot_meteting" translatable="false">SpotMeteting</string>
+    <string name="pref_camera2_exposure_metering_title" translatable="false">@string/pref_camera_autoexposure_title</string>
+    <string name="pref_camera2_exposure_metering_default">1</string>
+    <string name="pref_camera2_exposure_metering_entry_frame_average" translatable="false">@string/pref_camera_autoexposure_entry_frameaverage</string>
+    <string name="pref_camera2_exposure_metering_entry_center_weighted" translatable="false">@string/pref_camera_autoexposure_entry_centerweighted</string>
+    <string name="pref_camera2_exposure_metering_entry_spot_meteting" translatable="false">@string/pref_camera_autoexposure_entry_spotmetering</string>
     <string name="pref_camera2_exposure_metering_entryvalue_frame_average" translatable="false">0</string>
     <string name="pref_camera2_exposure_metering_entryvalue_center_weighted" translatable="false">1</string>
     <string name="pref_camera2_exposure_metering_entryvalue_spot_meteting" translatable="false">2</string>
 
     <string name="pref_camera2_switch_camera_default" translatable="false">-1</string>
-    <string name="pref_camera2_switch_camera_title" translatable="true">Switch camera by id</string>
+    <string name="pref_camera2_switch_camera_title">Switch camera by ID</string>
 
     <!-- QCFA Title -->
-    <string name="pref_camera2_qcfa_title" translatable="true">QCFA</string>
+    <string name="pref_camera2_qcfa_title" translatable="false">Quadra CFA</string>
     <string name="pref_camera2_qcfa_default" translatable="false">disable</string>
+
     <!-- QCFA choices -->
-    <string name="pref_camera_qcfa_value_disable">disable</string>
-    <string name="pref_camera_qcfa_value_enable">enable</string>
+    <string name="pref_camera_qcfa_value_disable" translatable="false">disable</string>
+    <string name="pref_camera_qcfa_value_enable" translatable="false">enable</string>
+
+    <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
+    <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
+    <string name="pref_camera2_initial_camera_entry_front">Front</string>
 
-    <string name="pref_camera2_eis_title" translatable="true">Video EIS</string>
+    <string name="pref_camera2_eis_title">Video EIS</string>
     <string name="pref_camera2_eis_default" translatable="false">disable</string>
-    <string name="pref_camera2_eis_entry_v2enable" translatable="false">V2</string>
-    <string name="pref_camera2_eis_entry_v3enable" translatable="false">V3</string>
-    <string name="pref_camera2_eis_entry_v3_set_when_pause" translatable="false">V3 and set when pause</string>
-    <string name="pref_camera2_eis_entry_disable" translatable="false">disable</string>
+    <string name="pref_camera2_eis_entry_v2enable">V2</string>
+    <string name="pref_camera2_eis_entry_v3enable">V3</string>
+    <string name="pref_camera2_eis_entry_v3_set_when_pause">V3 and set when pause</string>
+    <string name="pref_camera2_eis_entry_disable">Disabled</string>
     <string name="pref_camera2_eis_entry_value_v2enable" translatable="false">V2</string>
     <string name="pref_camera2_eis_entry_value_v3enable" translatable="false">V3</string>
     <string name="pref_camera2_eis_entry_value_v3_set_when_pause" translatable="false">V3SetWhenPause</string>
     <string name="pref_camera2_eis_entry_value_disable" translatable="false">disable</string>
 
-    <string name="pref_camera2_fovc_title" translatable="true">Video FOVC</string>
+    <string name="pref_camera2_fovc_title">Video FOVC</string>
     <string name="pref_camera2_fovc_default" translatable="false">false</string>
-    <string name="pref_camera2_fovc_entry_enable" translatable="false">Enable</string>
-    <string name="pref_camera2_fovc_entry_disable" translatable="false">Disable</string>
+    <string name="pref_camera2_fovc_entry_enable">Enabled</string>
+    <string name="pref_camera2_fovc_entry_disable">Disabled</string>
     <string name="pref_camera2_fovc_entry_value_enable" translatable="false">true</string>
     <string name="pref_camera2_fovc_entry_value_disable" translatable="false">false</string>
 
-    <string name="pref_camera2_video_hdr_title" translatable="true">Video HDR</string>
+    <string name="pref_camera2_video_hdr_title" translatable="false">@string/pref_camera_video_hdr_title</string>
     <string name="pref_camera2_video_hdr_default" translatable="false">0</string>
-    <string name="pref_camera2_video_hdr_entry_enable" translatable="true">enable</string>
-    <string name="pref_camera2_video_hdr_entry_disable" translatable="true">disable</string>
+    <string name="pref_camera2_video_hdr_entry_enable">Enabled</string>
+    <string name="pref_camera2_video_hdr_entry_disable">Disabled</string>
     <string name="pref_camera2_video_hdr_entry_value_enable" translatable="false">1</string>
     <string name="pref_camera2_video_hdr_entry_value_disable" translatable="false">0</string>
 
-    <string name="pref_camera2_picture_format_title">Picture Format</string>
-    <string name="pref_camera2_picture_format_default">0</string>
-    <string name="pref_camera2_picture_format_entry_0">JPEG</string>
-    <string name="pref_camera2_picture_format_entry_1">HEIF</string>
+    <string name="pref_camera2_picture_format_title">Picture format</string>
+    <string name="pref_camera2_picture_format_default" translatable="false">0</string>
+    <string name="pref_camera2_picture_format_entry_0" translatable="false">JPEG</string>
+    <string name="pref_camera2_picture_format_entry_1" translatable="false">HEIF</string>
 
     <string name="pref_camera2_deepportrait_entry_value_disable" translatable="false">off</string>
     <string name="pref_camera2_deepportrait_entry_value_enable" translatable="false">on</string>
-    <string name="pref_camera_scenemode_entry_deepportrait" translatable="false">Deepportrait</string>
+    <string name="pref_camera_scenemode_entry_deepportrait" translatable="false">DeepPortrait</string>
 
-    <string name="pref_camera2_stats_visualizer_title" translatable="true">Stats Visualizer</string>
+    <string name="pref_camera2_stats_visualizer_title">Statistics visualizer</string>
     <string name="pref_camera2_stats_visualizer_default" translatable="false"></string>
-    <string name="pref_camera2_stats_visualizer_entry_bg_stats" translatable="false">BG Stats</string>
-    <string name="pref_camera2_stats_visualizer_entry_be_stats" translatable="false">BE Stats</string>
-    <string name="pref_camera2_stats_visualizer_entry_hist_stats" translatable="false">Hist Stats</string>
-    <string name="pref_camera2_stats_visualizer_entry_awb_info" translatable="false">AWB Info</string>
+    <string name="pref_camera2_stats_visualizer_entry_bg_stats">BG statistics</string>
+    <string name="pref_camera2_stats_visualizer_entry_be_stats">BE statistics</string>
+    <string name="pref_camera2_stats_visualizer_entry_hist_stats">Hist statistics</string>
+    <string name="pref_camera2_stats_visualizer_entry_awb_info" translatable="false">AWB information</string>
     <string name="pref_camera2_stats_visualizer_entry_value_enable_bg" translatable="false">0</string>
     <string name="pref_camera2_stats_visualizer_entry_value_enable_be" translatable="false">1</string>
     <string name="pref_camera2_stats_visualizer_entry_value_enable_hist" translatable="false">2</string>
     <string name="pref_camera2_stats_visualizer_entry_value_enable_awb" translatable="false">3</string>
-    <string name="stats_visualizer_bg_label">BG GraphView</string>
-    <string name="stats_visualizer_be_label">BE GraphView</string>
+    <string name="stats_visualizer_bg_label">BG graph view</string>
+    <string name="stats_visualizer_be_label">BE graph view</string>
 
-    <string name="pref_camera2_capture_mfnr_title" translatable="true">MFNR</string>
+    <string name="pref_camera2_capture_mfnr_title">Multi-frame noise reduction</string>
     <string name="pref_camera2_capture_mfnr_default" translatable="false">0</string>
-    <string name="pref_camera2_capture_mfnr_entry_enable" translatable="true">enable</string>
-    <string name="pref_camera2_capture_mfnr_entry_disable" translatable="true">disable</string>
+    <string name="pref_camera2_capture_mfnr_entry_enable">Enabled</string>
+    <string name="pref_camera2_capture_mfnr_entry_disable">Disabled</string>
     <string name="pref_camera2_capture_mfnr_entry_value_enable" translatable="false">1</string>
     <string name="pref_camera2_capture_mfnr_entry_value_disable" translatable="false">0</string>
 
-    <string name="pref_camera2_fs2_title" translatable="true">FastShutter</string>
+    <string name="pref_camera2_fs2_title">Fast shutter</string>
     <string name="pref_camera2_fs2_default" translatable="false">0</string>
-    <string name="pref_camera2_fs2_entry_enable" translatable="true">enable</string>
-    <string name="pref_camera2_fs2_entry_disable" translatable="true">disable</string>
+    <string name="pref_camera2_fs2_entry_enable">Enabled</string>
+    <string name="pref_camera2_fs2_entry_disable">Disabled</string>
     <string name="pref_camera2_fs2_entry_value_enable" translatable="false">1</string>
     <string name="pref_camera2_fs2_entry_value_disable" translatable="false">0</string>
 
-    <string name="pref_camera2_abort_captures_title" translatable="true">Abort Captures</string>
+    <string name="pref_camera2_abort_captures_title">Abort captures</string>
     <string name="pref_camera2_abort_captures_default" translatable="false">1</string>
-    <string name="pref_camera2_abort_captures_entry_enable" translatable="true">enable</string>
-    <string name="pref_camera2_abort_captures_entry_disable" translatable="true">disable</string>
+    <string name="pref_camera2_abort_captures_entry_enable">Enabled</string>
+    <string name="pref_camera2_abort_captures_entry_disable">Disabled</string>
     <string name="pref_camera2_abort_captures_entry_value_enable" translatable="false">1</string>
     <string name="pref_camera2_abort_captures_entry_value_disable" translatable="false">0</string>
-
 </resources>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d3e1cb5a5..bcf20bf44 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -297,8 +297,6 @@
 
     <!-- Settings screen, Flash mode title -->
     <string name="pref_camera_flashmode_title">Flash</string>
-    <!-- flash label [CHAR LIMIT=50] -->
-    <string name="pref_camera_flashmode_label">FLASH</string>
 
     <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
     <string name="pref_camera_flashmode_entry_auto">Auto</string>
@@ -366,8 +364,8 @@
     <!-- 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] -->
-    <string name="pref_camera_scenemode_entry_refocus">UbiFocus</string>
-    <string name="pref_camera_scenemode_entry_optizoom">OptiZoom</string>
+    <string name="pref_camera_scenemode_entry_refocus" translatable="false">UbiFocus</string>
+    <string name="pref_camera_scenemode_entry_optizoom" translatable="false">OptiZoom</string>
 
     <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
     <string name="pref_camera_scenemode_label_auto">NONE</string>
@@ -395,23 +393,22 @@
     <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">Enable HDR will disable Continuous Shot.</string>
-
+    <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">Enable Advanced Capture will disable Continuous Shot.</string>
+    <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">Enable 4k video quality will disable Image Stabilization.</string>
+    <string name="video_quality_4k_disable_IS">4k video quality will disable image stabilization.</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>
+    <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>
+    <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>
@@ -420,7 +417,7 @@
     <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>
+    <string name="disable_NR_during_SeeMore">SeeMore will disable noise reduction.</string>
 
     <!-- Exposure settings in preference -->
     <string name="pref_exposure_title">Exposure</string>
@@ -698,7 +695,6 @@ CHAR LIMIT = NONE] -->
     <!--  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="pref_camera_video_rotation_label_0">0</string>
     <string name="pref_camera_video_rotation_label_90">90</string>
@@ -714,21 +710,21 @@ CHAR LIMIT = NONE] -->
     <string name="pref_camera2_restore_default_hint">Camera settings will be restored to default settings</string>
 
     <string name="save_best_dialog_content">%1$d of 10 images will be saved and the rest will deleted.</string>
-    <string name="save_best_dialog_title">Save select images ?</string>
+    <string name="save_best_dialog_title">Save selected images?</string>
     <string name="save_best_dialog_positive_bt">OK</string>
     <string name="save_best_dialog_native_bt">Cancel</string>
     <string name="save_best_image_toast">%1$d of 10 images saved.</string>
     <string name="dialog_do_not_show">Do not show again</string>
-    <string name="delete_best_dialog_title">Delete All ?</string>
-    <string name="delete_best_dialog_content">Are you sure to delete all 10 pictures taken?</string>
+    <string name="delete_best_dialog_title">Delete all?</string>
+    <string name="delete_best_dialog_content">Are you sure you want to delete all 10 pictures taken?</string>
     <string name="delete_best_dialog_native_bt">Cancel</string>
     <string name="delete_best_dialog_positive_bt">Delete</string>
-    <string name="delete_all_best_dialog_title">Delete All ?</string>
-    <string name="delete_all_best_dialog_content">Are you sure to delete all images?</string>
+    <string name="delete_all_best_dialog_title">Delete all?</string>
+    <string name="delete_all_best_dialog_content">Are you sure you want to delete all images?</string>
     <string name="delete_all_best_dialog_native_bt">Cancel</string>
-    <string name="delete_all_best_dialog_positive_bt">Delete All</string>
-    <string name="overflow_best_item1">Save All</string>
-    <string name="overflow_best_item2">Delete All</string>
+    <string name="delete_all_best_dialog_positive_bt">Delete all</string>
+    <string name="overflow_best_item1">Save all</string>
+    <string name="overflow_best_item2">Delete all</string>
 
     <string name="settings_title">Settings</string>
  </resources>
-- 
cgit v1.2.3