From 0424766f3ac6cc3bc3ea7993dbe9a5f2b066de5a Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Wed, 11 Jan 2017 15:43:34 +0100
Subject: Snap: Fix untranslatable strings

* Just writing a comment is not enough, set the attribute
* Match the tags with CM13 strings as well

Change-Id: Id40abad0c9d8dc321e0a43b0af2a1f0ab6f84abc
---
 res/values/qcomstrings.xml | 545 +++++++++++++++++++++++----------------------
 1 file changed, 273 insertions(+), 272 deletions(-)

diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index edb85576e..0dcde5979 100644
--- 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 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.
@@ -36,14 +37,14 @@
     <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>
 
@@ -53,18 +54,18 @@
     <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>
 
     <!-- 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>
@@ -79,8 +80,8 @@
     <string name="pref_camera_audioencoder_title">Audio Encoder</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 video duration setting. A numerical value.-->
     <string name="pref_camera_video_duration_default" translatable="false">10</string>
 
@@ -95,15 +96,15 @@
     <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_default" translatable="false">on</string>
 
          <!-- Default selectable zone af setting. Do not translate. -->
-     <string name="pref_camera_selectablezoneaf_default">auto</string>
+     <string name="pref_camera_selectablezoneaf_default" translatable="false">auto</string>
 
      <!-- Settings screen, Selectable zone af title -->
      <string name="pref_camera_selectablezoneaf_title"> Selectable Zone Auto Focus</string>
@@ -115,46 +116,46 @@
      <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_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">none</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">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_ubifocus" translatable="false">Ubi Focus</string>
+     <string name="pref_camera_advanced_feature_entry_refocus" translatable="false">Refocus</string>
+     <string name="pref_camera_advanced_feature_entry_chromaflash" translatable="false">Chroma Flash</string>
+     <string name="pref_camera_advanced_feature_entry_optizoom" translatable="false">Opti Zoom</string>
+     <string name="pref_camera_advanced_feature_entry_FSSR" translatable="false">FSSR</string>
+     <string name="pref_camera_advanced_feature_entry_trueportrait" translatable="false">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>
+     <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">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>
+     <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>
@@ -163,11 +164,11 @@
      <string name="pref_camera_manual_exp_entry_user_setting">User setting</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_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_off" translatable="false">off</string>
 
      <!-- Manual white balance entry values -->
      <string name="pref_camera_manual_wb_title">Manual White balance</string>
@@ -175,10 +176,10 @@
      <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>
+     <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>
@@ -186,10 +187,10 @@
      <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_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>
@@ -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 -->
     <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>
@@ -384,7 +385,7 @@
     <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>
+     <string name="pref_camera_hfr_default" translatable="false">off</string>
 
      <!-- Settings screen, Select hfr title -->
      <string name="pref_camera_hfr_title">Video High FrameRate</string>
@@ -401,18 +402,18 @@
      <string name="pref_camera_hfr_entry_hsr_240">HSR 240</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_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_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_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>
 
      <!-- Default noise reduction setting. Do not translate. -->
-     <string name="pref_camera_noise_reduction_default">off</string>
+     <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>
@@ -423,12 +424,12 @@
      <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>
+     <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">off</string>
+     <string name="pref_camera_see_more_default" translatable="false">off</string>
 
      <!-- Settings screen, Select See More title -->
      <string name="pref_camera_see_more_title">See More</string>
@@ -438,8 +439,8 @@
      <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>
+     <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">Wavelet Denoise Mode</string>
@@ -450,7 +451,7 @@
     <string name="pref_camera_denoise_entry_on">On</string>
 
      <!-- Default iso setting. Do not translate. -->
-     <string name="pref_camera_iso_default">auto</string>
+     <string name="pref_camera_iso_default" translatable="false">auto</string>
 
      <!-- Settings screen, Select Iso title -->
      <string name="pref_camera_iso_title">ISO</string>
@@ -465,19 +466,19 @@
      <string name="pref_camera_iso_entry_iso1600">ISO1600</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_iso100">ISO100</string>
-     <string name="pref_camera_iso_value_iso200">ISO200</string>
-     <string name="pref_camera_iso_value_iso400">ISO400</string>
-     <string name="pref_camera_iso_value_iso800">ISO800</string>
-     <string name="pref_camera_iso_value_iso1600">ISO1600</string>
+     <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_iso100" translatable="false">ISO100</string>
+     <string name="pref_camera_iso_value_iso200" translatable="false">ISO200</string>
+     <string name="pref_camera_iso_value_iso400" translatable="false">ISO400</string>
+     <string name="pref_camera_iso_value_iso800" translatable="false">ISO800</string>
+     <string name="pref_camera_iso_value_iso1600" translatable="false">ISO1600</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>
+     <string name="pref_camera_antibanding_default" translatable="false">auto</string>
 
      <!-- Settings screen, Anti Banding entries -->
      <string name="pref_camera_antibanding_entry_0">Off</string>
@@ -513,7 +514,7 @@
     <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
 
     <!-- Default Touch AF/AEC setting. Do not translate. -->
-    <string name="pref_camera_touchafaec_default">touch-on</string>
+    <string name="pref_camera_touchafaec_default" translatable="false">touch-on</string>
 
     <!-- Settings screen, Select Touch AF/AEC title -->
     <string name="pref_camera_touchafaec_title">Touch AF/AEC</string>
@@ -524,19 +525,19 @@
 
     <!-- Select IS title -->
     <string name="pref_camera_dis_title">Image Stabilization</string>
-    <string name="pref_camera_dis_default">disable</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_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_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>
@@ -578,19 +579,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>
@@ -600,156 +601,156 @@
     <string name="pref_camera_jpegquality_default" translatable="false">85</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>
 
     <!-- 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>
 
@@ -759,7 +760,7 @@
     <string name="pref_camera_jpegquality_entry_2">High</string>
 
      <!-- Default auto histogram setting. Do not translate. -->
-     <string name="pref_camera_histogram_default">disable</string>
+     <string name="pref_camera_histogram_default" translatable="false">disable</string>
 
      <!-- Settings screen, Select Histogram title -->
      <string name="pref_camera_histogram_title">Histogram</string>
@@ -769,18 +770,18 @@
      <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>
-
-    <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
-    <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
-    <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
-    <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
-    <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
-    <string name="pref_camera_picturesize_entry_960x720">960 x 720</string>
-    <string name="pref_camera_picturesize_entry_720x480">720 x 480</string>
-    <string name="pref_camera_picturesize_entry_352x288">CIF</string>
-    <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+     <string name="pref_camera_histogram_value_enable" translatable="false">enable</string>
+     <string name="pref_camera_histogram_value_disable" translatable="false">disable</string>
+
+    <string name="pref_camera_picturesize_entry_1920x1080" translatable="false">HD1080</string>
+    <string name="pref_camera_picturesize_entry_1280x768" translatable="false">WXGA</string>
+    <string name="pref_camera_picturesize_entry_1280x720" translatable="false">HD720</string>
+    <string name="pref_camera_picturesize_entry_800x600" translatable="false">SVGA</string>
+    <string name="pref_camera_picturesize_entry_800x480" translatable="false">WVGA</string>
+    <string name="pref_camera_picturesize_entry_960x720" translatable="false">960 x 720</string>
+    <string name="pref_camera_picturesize_entry_720x480" translatable="false">720 x 480</string>
+    <string name="pref_camera_picturesize_entry_352x288" translatable="false">CIF</string>
+    <string name="pref_camera_picturesize_entry_176x144" translatable="false">QCIF</string>
 
     <!-- Default auto scene detection setting. -->
     <string name="pref_camera_scenedetect_default" translatable="false">off</string>
@@ -814,13 +815,13 @@
     <!-- 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="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>
@@ -830,22 +831,22 @@
     <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>
 
     <!-- Settings screen, Selectable HDR need 1x frame default value -->
-    <string name="pref_camera_hdr_need_1x_default">@string/pref_hdr_need_1x_value_true</string>
+    <string name="pref_camera_hdr_need_1x_default" translatable="false">@string/pref_hdr_need_1x_value_true</string>
 
     <!-- Settings screen, Selectable HDR need 1x frame title -->
     <string name="pref_camera_hdr_need_1x_title">HDR need 1x frame</string>
 
     <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-    <string name="pref_camera_hdr_need_1x_entry_false">@string/setting_off</string>
-    <string name="pref_camera_hdr_need_1x_entry_true">@string/setting_on</string>
+    <string name="pref_camera_hdr_need_1x_entry_false" translatable="false">@string/setting_off</string>
+    <string name="pref_camera_hdr_need_1x_entry_true" translatable="false">@string/setting_on</string>
 
     <!-- HDR need 1x frame entry values. Do not translate. -->
-    <string name="pref_hdr_need_1x_value_false">false</string>
-    <string name="pref_hdr_need_1x_value_true">true</string>
+    <string name="pref_hdr_need_1x_value_false" translatable="false">false</string>
+    <string name="pref_hdr_need_1x_value_true" translatable="false">true</string>
 
     <!--Default video rotation setting-->
     <string name="pref_camera_video_rotation_default" translatable="false">0</string>
-- 
cgit v1.2.3